diff --git a/main/ry835ai.go b/main/ry835ai.go
index 4eb72a32..bbd33a22 100644
--- a/main/ry835ai.go
+++ b/main/ry835ai.go
@@ -1102,8 +1102,8 @@ func processNMEALine(l string) (sentenceUsed bool) {
 
 			}
 		}
-		if sat < 12 {
-			tmpSituation.Satellites = uint16(sat) // GSA only reports up to 12 satellites in solution... this isn't a reliable count if higher. updateConstellation() may provide an accurate count in that case.
+		if sat < 12 || tmpSituation.Satellites < 13 { // GSA only reports up to 12 satellites in solution, so we don't want to overwrite higher counts based on updateConstellation().
+			tmpSituation.Satellites = uint16(sat)
 		}
 		//log.Printf("There are %d satellites in solution from this GSA message\n", sat) // TESTING - DEBUG
 
diff --git a/web/plates/gps-help.html b/web/plates/gps-help.html
index 110071ae..df1942c8 100644
--- a/web/plates/gps-help.html
+++ b/web/plates/gps-help.html
@@ -1,7 +1,8 @@
 <div class="section text-left help-page">
 	<p>The <strong>GPS / AHRS</strong> page provides a view on the current status of GPS data and AHRS orientation. The Satellite count is located on the <strong>Status</strong> page.</p>
-	<p>The <strong>GPS</strong> reports position with estimated accuracy, ground track, ground speed, and GPS derived altitude are displayed along with the location depicted on a world map.</p>
-	<p>The <strong>AHRS</strong> reports magnetic heading, pressure altitude, pitch and roll are displayed along with a graphical representation of movement.</p>
-	<p>The AHR graphical depiction is a 3-dimentional paper airplane which rotates about a heading with 000&deg; being off in the distance and 180&deg; being down in front. The airplane will pitch up/down and left/right based on the data from the AHRS. To aid with recognizing orientation, the <span class="paperairplane_left">left wing is blue</span> and the <span class="paperairplane_right">right wing is tan</span>.</p>
+	<p><strong>GPS</strong> shows position with estimated accuracy, ground track, ground speed, and geometric altitude. Location is displayed on a world map.</p>
+	<p><strong>Satellites</strong> shows the status of GNSS constellations, and lists all satellites that your receiver is tracking. Stratux uses Satellite Based Augmentation System (SBAS) and multi-GNSS solutions on supported receivers. GPS satellites are prefixed with "G", SBAS satellites such as WAAS or EGNOS are prefixed with "S", and Russian GLONASS satellites are prefixed with "R". A checkmark shows if each satellite is used in the current position solution. For each satellite, the elevation, azimuth, and signal strength are provided. A summary of total satellites is presented at the bottom of the table.</p>
+	<p><strong>AHRS</strong> reports heading, pressure altitude, pitch and roll, along with a graphical representation of movement. As of version v0.8, heading is derived from GPS track, and is provided in degrees true.</p>
+	<p>The AHRS graphical depiction is a 3-dimensional paper airplane. Heading of 000&deg; is depicted with the nose of the airplane into the page; 180&deg; is depicted with the nose pointing out of the page.The airplane will pitch up/down and left/right based on the data from the AHRS. To aid with recognizing orientation, the <span class="paperairplane_left">left wing is blue</span> and the <span class="paperairplane_right">right wing is tan</span>.</p>
 	<p class="text-warning">NOTE: This page is for reference only and must not be used for flight operations.</p>
 </div>
\ No newline at end of file
diff --git a/web/plates/gps.html b/web/plates/gps.html
index 3a2c371b..d1408f7a 100755
--- a/web/plates/gps.html
+++ b/web/plates/gps.html
@@ -18,7 +18,7 @@
 				<div class="row">
 					<strong class="col-xs-6 text-center">Location:</strong>
 					<strong class="col-xs-6 text-center">Track:</strong>
-                       		</div>
+                </div>
 				<div class="row">
 					<span class="col-xs-6 text-center">{{gps_lat}}, {{gps_lon}} &plusmn; {{gps_accuracy}} m <br> {{gps_alt}} &plusmn; {{gps_vert_accuracy}} ft  @ {{gps_vert_speed}} ft/min</span>
 					<span class="col-xs-6 text-center">{{gps_track}}&deg; @ {{gps_speed}} KTS</span>
@@ -58,28 +58,40 @@
 	<div class="col-sm-6">
 		<div class="panel panel-default">
 			<div class="panel-heading">
-				<span class="panel_label">GPS Satellites</span>
+				<span class="panel_label">Satellites</span>
 			</div>
 			<div class="panel-body towers-page">
 				<div class="row">
-					<span class="col-xs-2"><strong>Satellite ID</strong></span>
-					<span class="col-xs-2 text-right"><strong>NMEA Code</strong></span>
-					<span class="col-xs-2 text-right"><strong>Elevation</strong></span>
-					<span class="col-xs-2 text-right"><strong>Azimuth</strong></span>
-					<span class="col-xs-2 text-right"><strong>Signal</strong></span>
+					<span class="col-xs-3"><strong>Satellite</strong></span>
+					<!--<span class="col-xs-2 text-right"><strong>NMEA Code</strong></span>-->
+					<span class="col-xs-3 text-right"><strong>Elevation</strong></span>
+					<span class="col-xs-3 text-right"><strong>Azimuth</strong></span>
+					<span class="col-xs-3 text-right"><strong>Signal</strong></span>
 				</div>
 
 				<div class="row" ng-repeat="satellite in data_list | orderBy: 'SatelliteNMEA'">
 					<div class="separator"></div>
-					<span class="col-xs-2">{{satellite.SatelliteID}}<span ng-show="satellite.InSolution">&nbsp;&#x2705;</span></span>
-					<span class="col-xs-2 text-right">{{satellite.SatelliteNMEA}}</span>
-					<span class="col-xs-2 text-right">{{satellite.Elevation < -5 ? "---" : satellite.Elevation}}</span>
-					<span class="col-xs-2 text-right">{{satellite.Azimuth < 0 ? "---" : satellite.Azimuth}}</span>
-					<span class="col-xs-2 text-right">{{satellite.Signal < 1 ? "---" : satellite.Signal}}</span>
+					<span class="col-xs-3">{{satellite.SatelliteID}}<span ng-show="satellite.InSolution">&nbsp;&#x2705;</span></span>
+					<!--<span class="col-xs-2 text-right">{{satellite.SatelliteNMEA}}</span>-->
+					<span class="col-xs-3 text-right">{{satellite.Elevation < -5 ? "---" : satellite.Elevation}}&deg;</span>
+					<span class="col-xs-3 text-right">{{satellite.Azimuth < 0 ? "---" : satellite.Azimuth}}&deg;</span>
+					<span class="col-xs-3 text-right">{{satellite.Signal < 1 ? "---" : satellite.Signal}}<span style="font-size:50%">&nbsp;dB-Hz</span></span>
+				</div>
+			</div>
+
+			<div class="separator"></div>
+			<div class="panel-footer">
+				<div class="row">
+					<label class="col-xs-6">GPS solution:</label>
+					<span class="col-xs-6">{{SolutionText}}</span>
+				</div>
+				<div class="row">
+					<label class="col-xs-6">Summary:</label>
+					<span class="col-xs-6">{{Satellites}} in solution; {{GPS_satellites_seen}} seen; {{GPS_satellites_tracked}} tracked</span>
 				</div>
 			</div>
 		</div>
-	</div>
+	</div>	
 </div>
 
 <!--
diff --git a/web/plates/js/gps.js b/web/plates/js/gps.js
index 5ee2e0dd..37e7dd73 100755
--- a/web/plates/js/gps.js
+++ b/web/plates/js/gps.js
@@ -53,14 +53,25 @@ function GPSCtrl($rootScope, $scope, $state, $http, $interval) {
 	};
 
 
-	function loadStatus(data) {
+	function loadStatus(data) { // mySituation
 		status = angular.fromJson(data);
 		// consider using angular.extend()
 		$scope.raw_data = angular.toJson(data, true); // makes it pretty
 
-		/*	not currently used
-		$scope.gps_satellites = status.Satellites;
-		*/
+		
+		$scope.Satellites = status.Satellites;
+		$scope.GPS_satellites_tracked = status.SatellitesTracked;
+		$scope.GPS_satellites_seen = status.SatellitesSeen;
+		$scope.Quality = status.Quality;
+		
+		var solutionText = "No Fix";
+		if (status.Quality == 2) {
+			solutionText = "GPS + SBAS (WAAS / EGNOS)";
+		} else if (status.Quality == 1) {
+			solutionText = "3D GPS"
+		}
+		$scope.SolutionText = solutionText;
+		
 		$scope.gps_accuracy = status.Accuracy.toFixed(1);
                 $scope.gps_vert_accuracy = (status.AccuracyVert*3.2808).toFixed(1); // accuracy is in meters, need to display in ft