diff --git a/html/formatter.js b/html/formatter.js
index 2e3470f..9370845 100644
--- a/html/formatter.js
+++ b/html/formatter.js
@@ -29,7 +29,7 @@ function get_unit_label(quantity, systemOfMeasurement) {
 // track in degrees (0..359)
 function format_track_brief(track) {
 	if (track == null){
-		return "";
+		return "n/a";
 	}
 
 	return track.toFixed(1) + DEGREES;
diff --git a/html/planeObject.js b/html/planeObject.js
index 36fdc87..c58aedb 100644
--- a/html/planeObject.js
+++ b/html/planeObject.js
@@ -932,8 +932,11 @@ PlaneObject.prototype.updateData = function(now, last, data, init) {
 		this.vert_rate = null;
 	}
 
-	if (this.altitude == "ground" && this.true_heading != null) {
-		this.rotation = this.true_heading;
+	if (this.altitude == "ground") {
+		if (this.true_heading != null)
+			this.rotation = this.true_heading;
+		else if (this.mag_heading != null)
+			this.rotation = this.mag_heading;
 	} else if (this.track != null) {
 		this.rotation = this.track;
 	} else if (this.true_heading != null) {
diff --git a/html/script.js b/html/script.js
index 2a113c8..4b50318 100644
--- a/html/script.js
+++ b/html/script.js
@@ -1437,8 +1437,8 @@ function refreshSelected() {
 	}
 
 	$('#selected_altitude_geom').text(format_altitude_long(selected.alt_geom, selected.geom_rate, DisplayUnits));
-	$('#selected_mag_heading').text(format_track_long(selected.mag_heading));
-	$('#selected_true_heading').text(format_track_long(selected.true_heading));
+	$('#selected_mag_heading').text(format_track_brief(selected.mag_heading));
+	$('#selected_true_heading').text(format_track_brief(selected.true_heading));
 	$('#selected_ias').text(format_speed_long(selected.ias, DisplayUnits));
 	$('#selected_tas').text(format_speed_long(selected.tas, DisplayUnits));
 	if (selected.mach == null) {