diff --git a/html/index.html b/html/index.html
index 26a9305..47ea990 100644
--- a/html/index.html
+++ b/html/index.html
@@ -151,6 +151,8 @@
 								<span id="selected_vert_rate">n/a</span>
 							</div>
 						</div>
+						<div class="infoRowSpacer">
+						</div>
 						<div class="infoRowLine">
 							<div class="infoHeading infoRowFluid fourColumnSection1">
 								<span title="Direction the aircraft is traveling over the ground.">Track</span>:
@@ -159,6 +161,22 @@
 								<span id="selected_track1">n/a</span>
 							</div>
 						</div>
+						<div class="infoRowLine">
+							<div class="infoHeading infoRowFluid ">
+								<span title="Latitude and longitude coordinates of the aircraft's last known position.">Pos.:</span>
+							</div>
+							<div class="infoData infoRowFluid ">
+								<span id="selected_position">n/a</span>
+							</div>
+						</div>
+						<div class="infoRowLine">
+							<div class="infoHeading infoRowFluid ">
+								<span title="Distance of the aircraft from your ADS-B site at its last known position.">Distance</span>:
+							</div>
+							<div class="infoData infoRowFluid ">
+								<span id="selected_sitedist2">n/a</span>
+							</div>
+						</div>
 
 						
 					</div> <!-- SPATIAL -->
@@ -180,7 +198,7 @@
 						</div>
 						<div class="infoRowLine">
 							<div class="infoHeading infoRowFluid fourColumnSection1">
-								<span title="Indicated signal strength of the signal received by your ADS-B site from the aircraft.">RSSI</span>:
+								<span title="Indicated signal strength of the signal received by your ADS-B site from the aircraft.">RSSI (dBFS)</span>:
 							</div>
 							<div class="infoData infoRowFluid fourColumnSection2">
 								<span id="selected_rssi1">n/a</span>
@@ -194,6 +212,14 @@
 								<span id="selected_seen_pos">n/a</span>
 							</div>
 						</div>
+						<div class="infoRowLine">
+							<div class="infoHeading infoRowFluid fourColumnSection1">
+								<span title="The last time your ADS-B site received a message from the aircraft.">Last Seen</span>:
+							</div>
+							<div class="infoData infoRowFluid fourColumnSection2">
+								<span id="selected_seen">n/a</span>
+							</div>
+						</div>
 						<div class="infoRowLine">
 							<div class="infoHeading infoRowFluid">
 								<span title="Data source for the reported aircraft data (e.g., ADS-B, MLAT, Other Mode S)">Source</span>:
@@ -203,29 +229,6 @@
 							</div>
 						</div>
 					</div> <!-- MISC -->
-					<div class="sectionTitle">
-						<div class="section-title-content">
-							Location
-						</div>
-					</div>
-					<div class="infoBlockSection">
-						<div class="infoRowLine">
-							<div class="infoHeading infoRowFluid ">
-								<span title="Latitude and longitude coordinates of the aircraft's last known position.">Pos.:</span>
-							</div>
-							<div class="infoData infoRowFluid ">
-								<span id="selected_position">n/a</span>
-							</div>
-						</div>
-						<div class="infoRowLine">
-							<div class="infoHeading infoRowFluid ">
-								<span title="Distance of the aircraft from your ADS-B site at its last known position.">Distance</span>:
-							</div>
-							<div class="infoData infoRowFluid ">
-								<span id="selected_sitedist2">n/a</span>
-							</div>
-						</div>
-					</div> <!-- Location -->
 
 					<div class="sectionTitle">
 						<div class="section-title-content">
@@ -388,26 +391,18 @@
 
 					<div class="sectionTitle">
 						<div class="section-title-content">
-							Navigation
+							Stuff
 						</div>
 					</div>
 					<div class="infoBlockSection">
 						<div class="infoRowLine">
 							<div class="infoHeading infoRowFluid fourColumnSection1">
-								<span title="The enabled navigation modes as reported by the aircraft (i.e., auto-pilot, Traffic Collision Avoidance System, altitude hold, approach, LNAV approach, and/or VNAV approach).">Modes</span>:
+								<span title="The enabled navigation modes as reported by the aircraft (i.e., auto-pilot, Traffic Collision Avoidance System, altitude hold, approach, LNAV approach, and/or VNAV approach).">Nav. Modes</span>:
 							</div>
 							<div class="infoData infoRowFluid fourColumnSection2">
 								<span id="selected_nav_modes">n/a</span>
 							</div>
 						</div>
-					</div>
-
-					<div class="sectionTitle">
-						<div class="section-title-content">
-							Tracking Information
-						</div>
-					</div>
-					<div class="infoBlockSection">
 						<div class="infoRowLine">
 							<div class="infoHeading infoRowFluid fourColumnSection1">
 								<span title="The total number of messages received from the aircraft by your ADS-B site.">Messages</span>:
@@ -424,14 +419,6 @@
 								<span id="selected_version">n/a</span>
 							</div>
 						</div>
-						<div class="infoRowLine">
-							<div class="infoHeading infoRowFluid fourColumnSection1">
-								<span title="Indicated signal strength of the signal received by your ADS-B site from the aircraft.">RSSI</span>:
-							</div>
-							<div class="infoData infoRowFluid fourColumnSection2">
-								<span id="selected_rssi2">n/a</span>
-							</div>
-						</div>
 						<div class="infoRowLine">
 							<div class="infoHeading infoRowFluid fourColumnSection1">
 								<span title="Aircraft category code as reported by the aircraft. This indicates the type of aircraft and, for airplanes, a relative indicator of its size.">Category</span>:
@@ -440,22 +427,6 @@
 								<span id="selected_category">n/a</span>
 							</div>
 						</div>
-						<div class="infoRowLine">
-							<div class="infoHeading infoRowFluid fourColumnSection1">
-								<span title="The last time your ADS-B site received a message from the aircraft.">Last Seen</span>:
-							</div>
-							<div class="infoData infoRowFluid fourColumnSection2">
-								<span id="selected_seen">n/a</span>
-							</div>
-						</div>
-						<div class="infoRowLine">
-							<div class="infoHeading infoRowFluid fourColumnSection1">
-								<span title="A 4-digit octal code assigned to the aircraft by Air Traffic Control.">Squawk</span>:
-							</div>
-							<div class="infoData infoRowFluid fourColumnSection2">
-								<span id="selected_squawk2"></span>
-							</div>
-						</div>
 					</div>
 
 					<div class="sectionTitle">
diff --git a/html/script.js b/html/script.js
index b4b7271..4a2107d 100644
--- a/html/script.js
+++ b/html/script.js
@@ -1313,14 +1313,14 @@ function refreshSelected() {
 	//+" "+ (selected.pfFlightno ? selected.pfFlightno : "")
 	$('#airframes_post_icao').attr('value',selected.icao);
 	$('#selected_track1').text(format_track_long(selected.track));
-	$('#selected_track2').text(format_track_long(selected.track));
+	$('#selected_track2').text(format_track_brief(selected.track));
 
-	if (selected.seen && selected.seen < 1000000) {
+	if (selected.seen != null && selected.seen < 1000000) {
 		$('#selected_seen').text(selected.seen.toFixed(1) + ' s');
 	} else {
 		$('#selected_seen').text('n/a');
 	}
-	if (selected.seen_pos && selected.seen_pos < 1000000) {
+	if (selected.seen_pos != null&& selected.seen_pos < 1000000) {
 		$('#selected_seen_pos').text(selected.seen_pos.toFixed(1) + ' s');
 	} else {
 		$('#selected_seen_pos').text('n/a');
@@ -1358,8 +1358,7 @@ function refreshSelected() {
 	$('#selected_category').text(selected.category ? selected.category : "n/a");
 	$('#selected_sitedist1').text(format_distance_long(selected.sitedist, DisplayUnits));
 	$('#selected_sitedist2').text(format_distance_long(selected.sitedist, DisplayUnits));
-	$('#selected_rssi1').text(selected.rssi != null ? selected.rssi.toFixed(1) + ' dBFS' : "n/a");
-	$('#selected_rssi2').text(selected.rssi != null ? selected.rssi.toFixed(1) + ' dBFS' : "n/a");
+	$('#selected_rssi1').text(selected.rssi != null ? selected.rssi.toFixed(1) : "n/a");
 	$('#selected_message_count').text(selected.messages);
 	if (flightawareLinks) {
 		$('#selected_photo_link').html(getFlightAwarePhotoLink(selected.registration));
diff --git a/html/style.css b/html/style.css
index 00d8370..da03b14 100644
--- a/html/style.css
+++ b/html/style.css
@@ -13,7 +13,7 @@ html, body {
     position: absolute;
     left: 0pt;
     top: 0px;
-	width: 150pt;
+	width: 140pt;
 	height: 100%;
 	overflow: auto;
     z-index: 9999;
@@ -293,7 +293,6 @@ select.error, textarea.error, input.error {
 
 .infoHeading {
     font-family: "Helvetica Neue", Helvetica, Arial, sans-serif;
-    line-height: 13pt;
 	display: inline-block;
 }
 
@@ -304,8 +303,6 @@ select.error, textarea.error, input.error {
 
 .infoData {
     font-family: "Helvetica Neue", Helvetica, Arial, sans-serif;
-	font-size: 11pt;
-    line-height: 13pt;
 	display: inline-block;
 	float: right;
 	margin-right: 5pt;
@@ -534,6 +531,11 @@ select.error, textarea.error, input.error {
 	padding-bottom: 2px;
 }
 
+.infoRowSpacer {
+	padding-top: 3px;
+	padding-bottom: 3px;
+}
+
 .removePadding {
     padding: 0;
 }