diff --git a/html/index.html b/html/index.html
index d1a4411..bda94da 100644
--- a/html/index.html
+++ b/html/index.html
@@ -61,9 +61,11 @@
 
 			<div id="highlighted_infoblock">
 				<div class="highlightedTitle">
-					<span class="identLarge"><span id="highlighted_callsign">n/a</span></span>
 					<div>
-					<span class="identSmall"><span id="highlighted_icao">n/a</span></span>
+						<span class="identLarge"><span id="highlighted_callsign">n/a</span></span>
+					</div>
+					<div>
+						<span class="identMedium"> <span id="highlighted_pf_route"></span></span>
 					</div>
 				</div>
 				<div class="highlightedInfo">
@@ -295,9 +297,9 @@
 							<span style="float:right; position:relative; padding-right:160;" class="button buttonHeader" onClick="toggleFollowSelected();">
 								<span class="buttonText">Follow</span>
 							</span>
-						<div>
-						<span class="identMedium"> <span id="selected_pf_info"> </span></span>
-						</div>
+							<div>
+								<span class="identMedium"> <span id="selected_pf_info"> </span></span>
+							</div>
 						</div>
 						<div class="infoBlockTopSection">
 							<span id="selected_flightaware_link" class=""></span>
diff --git a/html/script.js b/html/script.js
index 16eff26..1751a28 100644
--- a/html/script.js
+++ b/html/script.js
@@ -1191,7 +1191,7 @@ function refreshSelected() {
 	}
 	const selected = SelectedPlane;
 
-	if (selected.flight && selected.flight.replace(/ /g, '')) {
+	if (selected.flight && selected.flight.trim()) {
 		$('#selected_callsign').text(selected.flight);
 	} else {
 		$('#selected_callsign').text('n/a');
@@ -1437,11 +1437,7 @@ function refreshHighlighted() {
 		}
 	}
 
-	if (highlighted.flight !== null && highlighted.flight !== "") {
-		$('#highlighted_callsign').text(highlighted.flight);
-	} else {
-		$('#highlighted_callsign').text('n/a');
-	}
+	$('#highlighted_callsign').text(highlighted.name);
 
 	if (highlighted.icaoType !== null) {
 		$('#highlighted_icaotype').text(highlighted.icaoType);
@@ -1463,6 +1459,8 @@ function refreshHighlighted() {
 
 	$('#highlighted_icao').text(highlighted.icao.toUpperCase());
 
+	$('#highlighted_pf_route').text((highlighted.pfRoute ? highlighted.pfRoute : ""));
+
 	$('#highlighted_rssi').text(highlighted.rssi.toFixed(1) + ' dBFS');
 
 }
@@ -2372,7 +2370,7 @@ function fetchPfData() {
 					plane.registration = ac.reg;
 				if (ac.type && ac.type != "????")
 					plane.icaoType = ac.type;
-				if (plane.icaoType != plane.icaoTypeCache) {
+				if (plane.icaoType != plane.icaoTypeCache && plane.icaoType != "ZVEH") {
 					var typeData = _aircraft_type_cache[plane.icaoType];
 					if (typeData) {
 						plane.typeDescription = typeData.desc;
diff --git a/html/style.css b/html/style.css
index 03b046c..4edb1cd 100644
--- a/html/style.css
+++ b/html/style.css
@@ -468,7 +468,7 @@ select.error, textarea.error, input.error {
 }
 
 .highlightedTitle {
-    height: 48px;
+    height: 50px;
     border-bottom: 1px solid #00A0E2;
     padding-left: 18px;
 	padding-top: 18px;
@@ -483,7 +483,7 @@ select.error, textarea.error, input.error {
 .identLarge {
     font-family: "Helvetica Neue", Helvetica, Arial, sans-serif;
     font-size: 24px;
-    line-height: 20px;
+    line-height: 24px;
     color: #002F5D;
     color: rgb(0, 47, 93);
     font-weight: lighter;
@@ -492,7 +492,7 @@ select.error, textarea.error, input.error {
 .identMedium {
     font-family: "Helvetica Neue", Helvetica, Arial, sans-serif;
     font-size: 18px;
-    line-height: 20px;
+    line-height: 22px;
     color: #002F5D;
     color: rgb(0, 47, 93);
     font-weight: lighter;