diff --git a/public_html/config.js b/public_html/config.js
index fe54a9e..73733bb 100644
--- a/public_html/config.js
+++ b/public_html/config.js
@@ -102,7 +102,7 @@ SiteCirclesDistances = new Array(100,150,200);
 ShowClocks = false;
 
 // Controls page title, righthand pane when nothing is selected
-PageName = "FlightAware dump1090";
+PageName = "PiAware Skyview";
 
 // Show country flags by ICAO addresses?
 ShowFlags = true;
diff --git a/public_html/formatter.js b/public_html/formatter.js
index 8d6dca9..d25460b 100644
--- a/public_html/formatter.js
+++ b/public_html/formatter.js
@@ -6,7 +6,7 @@ var DEGREES='\u00b0'
 var UP_TRIANGLE='\u25b2'; // U+25B2 BLACK UP-POINTING TRIANGLE
 var DOWN_TRIANGLE='\u25bc'; // U+25BC BLACK DOWN-POINTING TRIANGLE
 
-var TrackDirections = ["North","Northeast","East","Southeast","South","Southwest","West","Northwest"];
+var TrackDirections = ["North","NE","East","SE","South","SW","West","NW"];
 
 var UnitLabels = {
 	'altitude': { metric: "m", imperial: "ft", nautical: "ft"},
@@ -31,7 +31,7 @@ function format_track_brief(track) {
 		return "";
 	}
 	
-	return Math.round(track);
+	return Math.round(track) + DEGREES;
 }
 
 // track in degrees (0..359)
@@ -54,7 +54,7 @@ function format_altitude_brief(alt, vr, displayUnits) {
 		return "ground";
 	}
 
-	alt_text = Math.round(convert_altitude(alt, displayUnits)) + NBSP;
+	alt_text = Math.round(convert_altitude(alt, displayUnits)).toLocaleString() + NBSP;
 
 	// Vertical Rate Triangle
 	var verticalRateTriangle = "<span class=\"verticalRateTriangle\">";
@@ -80,7 +80,7 @@ function format_altitude_long(alt, vr, displayUnits) {
 		return "on ground";
 	}
 
-	alt_text = Math.round(convert_altitude(alt, displayUnits)) + NBSP + get_unit_label("altitude", displayUnits);
+	alt_text = Math.round(convert_altitude(alt, displayUnits)).toLocaleString() + NBSP + get_unit_label("altitude", displayUnits);
 
 	if (vr > 128) {
 		return UP_TRIANGLE + NBSP + alt_text;
@@ -142,12 +142,16 @@ function format_distance_brief(dist, displayUnits) {
 }
 
 // dist in meters
-function format_distance_long(dist, displayUnits) {
+function format_distance_long(dist, displayUnits, fixed) {
 	if (dist === null) {
 		return "n/a";
 	}
 
-	var dist_text = convert_distance(dist, displayUnits).toFixed(1) + NBSP + get_unit_label("distance", displayUnits);
+	if (typeof fixed === 'undefined') {
+		fixed = 1;
+	}
+
+	var dist_text = convert_distance(dist, displayUnits).toFixed(fixed) + NBSP + get_unit_label("distance", displayUnits);
 
 	return dist_text;
 }
diff --git a/public_html/images/alt_legend_feet.svg b/public_html/images/alt_legend_feet.svg
new file mode 100644
index 0000000..3fd6af3
--- /dev/null
+++ b/public_html/images/alt_legend_feet.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" viewBox="0 0 906.78 28.39"><defs><style>.cls-1{fill:url(#linear-gradient);}.cls-2{fill:none;stroke:#000;stroke-miterlimit:10;}</style><linearGradient id="linear-gradient" x1="77.89" y1="6.58" x2="906.28" y2="6.58" gradientUnits="userSpaceOnUse"><stop offset="0.11" stop-color="#ec5b13"/><stop offset="0.21" stop-color="#ecc814"/><stop offset="0.24" stop-color="#eac914"/><stop offset="0.25" stop-color="#e2cd14"/><stop offset="0.27" stop-color="#d4d413"/><stop offset="0.28" stop-color="#c0de13"/><stop offset="0.29" stop-color="#a8ea12"/><stop offset="0.29" stop-color="#a4ec12"/><stop offset="0.38" stop-color="#12ec5b"/><stop offset="0.59" stop-color="#12b6ec"/><stop offset="0.79" stop-color="#2513ec"/><stop offset="1" stop-color="#ec13ec"/></linearGradient></defs><title>alt_legend_feet</title><g id="Layer_2" data-name="Layer 2"><g id="REDESIGN"><rect class="cls-1" x="77.89" width="828.4" height="13.17"/><polyline class="cls-2" points="78 0 78 13.4 906.28 13.4 906.28 0"/><path d="M75.53,22.36c0-1.87.13-4.37,2.42-4.36s2.42,2.28,2.42,4.37c0,1.8-.13,4.29-2.42,4.29S75.53,24.37,75.53,22.36ZM78,25.86c1.3,0,1.37-1.71,1.37-3.5s-.07-3.57-1.37-3.58-1.37,1.7-1.37,3.57S76.66,25.86,78,25.86Z"/><path d="M870.83,18.13h1V23.7h1v.86h-1v2.05h-1V24.57h-3.07v-.95Zm-2.16,5.58h2.16V19.78h0Z"/><path d="M873.62,22.49c0-1.87.13-4.37,2.42-4.37s2.42,2.28,2.42,4.37c0,1.8-.13,4.29-2.42,4.29S873.62,24.51,873.62,22.49ZM876,26c1.3,0,1.37-1.71,1.37-3.5s-.07-3.57-1.37-3.57-1.37,1.7-1.37,3.57S874.75,26,876,26Z"/><path d="M879.81,25.35h1.1v1c0,.91-.07,1.73-1.1,2v-.56a.84.84,0,0,0,.53-.92v-.29h-.53Z"/><path d="M882.26,22.49c0-1.87.13-4.37,2.42-4.37s2.42,2.28,2.42,4.37c0,1.8-.13,4.29-2.42,4.29S882.26,24.51,882.26,22.49Zm2.42,3.5c1.29,0,1.37-1.71,1.37-3.5s-.07-3.57-1.37-3.57-1.37,1.7-1.37,3.57S883.39,26,884.68,26Z"/><path d="M888,22.49c0-1.87.13-4.37,2.42-4.37s2.42,2.28,2.42,4.37c0,1.8-.13,4.29-2.42,4.29S888,24.51,888,22.49Zm2.42,3.5c1.3,0,1.37-1.71,1.37-3.5s-.07-3.57-1.37-3.57-1.37,1.7-1.37,3.57S889.15,26,890.44,26Z"/><path d="M893.78,22.49c0-1.87.13-4.37,2.42-4.37s2.42,2.28,2.42,4.37c0,1.8-.13,4.29-2.42,4.29S893.78,24.51,893.78,22.49ZM896.2,26c1.3,0,1.37-1.71,1.37-3.5s-.07-3.57-1.37-3.57-1.37,1.7-1.37,3.57S894.91,26,896.2,26Z"/><path d="M902.29,24h-2.64v-.79h2.64V20.55h.79v2.64h2.64V24h-2.64v2.64h-.79Z"/><line class="cls-2" x1="720.95" x2="720.95" y2="14.19"/><path d="M707.27,21.83h.53c.9,0,1.29-.65,1.29-1.5s-.29-1.42-1.1-1.42c-1.12,0-1.22,1-1.22,1.66h-1.06c0-1.45.68-2.45,2.25-2.45a2,2,0,0,1,2.18,2.21,1.75,1.75,0,0,1-1.32,1.82v0a1.81,1.81,0,0,1,1.57,2c0,1.55-.78,2.63-2.41,2.63a2.26,2.26,0,0,1-2.41-2.36v-.11h1.06c0,.78.38,1.68,1.36,1.68.62,0,1.35-.31,1.35-1.75a1.42,1.42,0,0,0-1.54-1.62h-.54Z"/><path d="M711.33,22.49c0-1.87.13-4.37,2.42-4.37s2.42,2.28,2.42,4.37c0,1.8-.13,4.29-2.42,4.29S711.33,24.51,711.33,22.49Zm2.42,3.5c1.29,0,1.37-1.71,1.37-3.5s-.07-3.57-1.37-3.57-1.37,1.7-1.37,3.57S712.46,26,713.75,26Z"/><path d="M717.52,25.35h1.1v1c0,.91-.07,1.73-1.1,2v-.56a.84.84,0,0,0,.53-.92v-.29h-.53Z"/><path d="M720,22.49c0-1.87.13-4.37,2.42-4.37s2.42,2.28,2.42,4.37c0,1.8-.13,4.29-2.42,4.29S720,24.51,720,22.49Zm2.42,3.5c1.3,0,1.37-1.71,1.37-3.5s-.07-3.57-1.37-3.57S721,20.62,721,22.49,721.09,26,722.39,26Z"/><path d="M725.73,22.49c0-1.87.13-4.37,2.42-4.37s2.42,2.28,2.42,4.37c0,1.8-.13,4.29-2.42,4.29S725.73,24.51,725.73,22.49Zm2.42,3.5c1.29,0,1.37-1.71,1.37-3.5s-.07-3.57-1.37-3.57-1.37,1.7-1.37,3.57S726.86,26,728.15,26Z"/><path d="M731.49,22.49c0-1.87.13-4.37,2.42-4.37s2.42,2.28,2.42,4.37c0,1.8-.13,4.29-2.42,4.29S731.49,24.51,731.49,22.49Zm2.42,3.5c1.29,0,1.37-1.71,1.37-3.5s-.07-3.57-1.37-3.57-1.37,1.7-1.37,3.57S732.62,26,733.91,26Z"/><line class="cls-2" x1="551.12" x2="551.12" y2="14.19"/><path d="M540.53,26.62h-4.75a4.53,4.53,0,0,1,1.83-3.48l.7-.59a2.51,2.51,0,0,0,1.13-2c0-.73-.32-1.52-1.24-1.52-1.31,0-1.34,1.36-1.34,1.83h-1.06c0-1.61.67-2.7,2.41-2.7a2.11,2.11,0,0,1,2.28,2.27A3.35,3.35,0,0,1,539,23.19l-1.2,1a2.64,2.64,0,0,0-.92,1.45h3.65Z"/><path d="M541.49,22.49c0-1.87.13-4.37,2.42-4.37s2.42,2.28,2.42,4.37c0,1.8-.13,4.29-2.42,4.29S541.49,24.51,541.49,22.49Zm2.42,3.5c1.29,0,1.37-1.71,1.37-3.5s-.07-3.57-1.37-3.57-1.37,1.7-1.37,3.57S542.62,26,543.92,26Z"/><path d="M547.69,25.35h1.1v1c0,.91-.07,1.73-1.1,2v-.56a.84.84,0,0,0,.53-.92v-.29h-.53Z"/><path d="M550.13,22.49c0-1.87.13-4.37,2.42-4.37S555,20.4,555,22.49c0,1.8-.13,4.29-2.42,4.29S550.13,24.51,550.13,22.49Zm2.42,3.5c1.3,0,1.37-1.71,1.37-3.5s-.07-3.57-1.37-3.57-1.37,1.7-1.37,3.57S551.26,26,552.56,26Z"/><path d="M555.89,22.49c0-1.87.13-4.37,2.42-4.37s2.42,2.28,2.42,4.37c0,1.8-.13,4.29-2.42,4.29S555.89,24.51,555.89,22.49Zm2.42,3.5c1.29,0,1.37-1.71,1.37-3.5s-.07-3.57-1.37-3.57-1.37,1.7-1.37,3.57S557,26,558.32,26Z"/><path d="M561.65,22.49c0-1.87.13-4.37,2.42-4.37s2.42,2.28,2.42,4.37c0,1.8-.13,4.29-2.42,4.29S561.65,24.51,561.65,22.49Zm2.42,3.5c1.29,0,1.37-1.71,1.37-3.5s-.07-3.57-1.37-3.57-1.37,1.7-1.37,3.57S562.78,26,564.08,26Z"/><line class="cls-2" x1="426.53" x2="426.53" y2="14.19"/><path d="M411.35,19.48c1.07-.06,2.05-.19,2.1-1.39h.72v8.49h-1V20.2h-1.81Z"/><path d="M416.76,22.46c0-1.87.13-4.37,2.42-4.36s2.42,2.28,2.42,4.37c0,1.8-.13,4.29-2.42,4.29S416.76,24.48,416.76,22.46Zm2.42,3.5c1.3,0,1.37-1.71,1.37-3.5s-.07-3.57-1.37-3.57-1.37,1.7-1.37,3.57S417.89,26,419.18,26Z"/><path d="M423,25.32h1.1v1c0,.91-.07,1.73-1.1,2V27.8a.84.84,0,0,0,.53-.92v-.29H423Z"/><path d="M425.4,22.46c0-1.87.13-4.37,2.42-4.36s2.42,2.28,2.42,4.37c0,1.8-.13,4.29-2.42,4.29S425.4,24.48,425.4,22.46Zm2.42,3.5c1.29,0,1.37-1.71,1.37-3.5s-.07-3.57-1.37-3.57-1.37,1.7-1.37,3.57S426.53,26,427.82,26Z"/><path d="M431.16,22.47c0-1.87.13-4.37,2.42-4.37S436,20.38,436,22.47c0,1.8-.13,4.29-2.42,4.29S431.16,24.48,431.16,22.47Zm2.42,3.5c1.3,0,1.37-1.71,1.37-3.5s-.07-3.57-1.37-3.58-1.37,1.7-1.37,3.57S432.29,26,433.58,26Z"/><path d="M436.92,22.47c0-1.87.13-4.37,2.42-4.36s2.42,2.28,2.42,4.37c0,1.8-.13,4.29-2.42,4.29S436.92,24.48,436.92,22.47Zm2.42,3.5c1.3,0,1.37-1.71,1.37-3.5s-.07-3.57-1.37-3.58S438,20.6,438,22.47,438,26,439.34,26Z"/><line class="cls-2" x1="369.76" x2="369.76" y2="14.19"/><path d="M358.35,22.05a1.76,1.76,0,0,1-1.23-1.81,2.17,2.17,0,0,1,4.34,0,1.76,1.76,0,0,1-1.24,1.81,2,2,0,0,1,1.5,2.18,2.44,2.44,0,1,1-4.87,0A2,2,0,0,1,358.35,22.05Zm.93,3.9c1,0,1.38-.75,1.38-1.75s-.4-1.75-1.38-1.75-1.38.75-1.38,1.75S358.3,25.95,359.29,25.95Zm-1.11-5.69c0,.79.33,1.39,1.12,1.39s1.12-.6,1.12-1.39-.35-1.39-1.12-1.39S358.17,19.46,358.17,20.26Z"/><path d="M363.06,25.3h1.1v1c0,.91-.07,1.73-1.1,2v-.56a.84.84,0,0,0,.53-.92v-.29h-.53Z"/><path d="M365.5,22.45c0-1.87.13-4.36,2.42-4.36s2.42,2.28,2.42,4.37c0,1.8-.13,4.29-2.42,4.29S365.5,24.46,365.5,22.45Zm2.42,3.5c1.3,0,1.37-1.71,1.37-3.5s-.07-3.57-1.37-3.58-1.37,1.7-1.37,3.57S366.63,26,367.93,26Z"/><path d="M371.26,22.45c0-1.87.13-4.37,2.42-4.36s2.42,2.28,2.42,4.37c0,1.8-.13,4.29-2.42,4.29S371.26,24.46,371.26,22.45Zm2.42,3.5c1.3,0,1.37-1.71,1.37-3.5s-.07-3.57-1.37-3.57-1.37,1.7-1.37,3.57S372.39,26,373.69,26Z"/><path d="M377,22.45c0-1.87.13-4.37,2.42-4.36s2.42,2.28,2.42,4.37c0,1.8-.13,4.29-2.42,4.29S377,24.47,377,22.45Zm2.42,3.5c1.29,0,1.37-1.71,1.37-3.5s-.07-3.57-1.37-3.57-1.37,1.7-1.37,3.57S378.15,26,379.45,26Z"/><line class="cls-2" x1="311.41" x2="311.41" y2="14.19"/><path d="M302.51,20.1a1.11,1.11,0,0,0-1.12-1.25c-1.42,0-1.5,2.11-1.5,2.55v.67h0a1.85,1.85,0,0,1,1.62-.95c1.48,0,2.22,1.09,2.22,2.69s-.82,2.9-2.4,2.9c-2.35,0-2.52-2.27-2.52-4,0-1.94.12-4.63,2.58-4.63a2,2,0,0,1,2.15,2Zm-1.15,5.83c1.06,0,1.34-1.08,1.34-2s-.22-2-1.34-2S300,23.08,300,24,300.3,25.93,301.36,25.93Z"/><path d="M305.07,25.29h1.1v1c0,.91-.07,1.73-1.1,2v-.56a.84.84,0,0,0,.53-.92v-.29h-.53Z"/><path d="M307.52,22.43c0-1.87.13-4.37,2.42-4.37s2.42,2.28,2.42,4.37c0,1.8-.13,4.29-2.42,4.29S307.52,24.45,307.52,22.43Zm2.42,3.5c1.29,0,1.37-1.71,1.37-3.5s-.07-3.57-1.37-3.58-1.37,1.7-1.37,3.57S308.64,25.93,309.94,25.93Z"/><path d="M313.28,22.43c0-1.87.13-4.37,2.42-4.36s2.42,2.28,2.42,4.37c0,1.8-.13,4.29-2.42,4.29S313.28,24.45,313.28,22.43Zm2.42,3.5c1.29,0,1.37-1.71,1.37-3.5s-.07-3.57-1.37-3.58-1.37,1.7-1.37,3.57S314.4,25.94,315.7,25.94Z"/><path d="M319,22.44c0-1.87.13-4.37,2.42-4.36s2.42,2.28,2.42,4.37c0,1.8-.13,4.29-2.42,4.29S319,24.45,319,22.44Zm2.42,3.5c1.3,0,1.37-1.71,1.37-3.5s-.07-3.57-1.37-3.57-1.37,1.7-1.37,3.57S320.16,25.94,321.46,25.94Z"/><line class="cls-2" x1="253.06" x2="253.06" y2="14.19"/><path d="M242.28,18.05h1v5.58h1v.86h-1v2.05h-1V24.49h-3.07v-.95Zm-2.16,5.58h2.16V19.71h0Z"/><path d="M245.5,25.27h1.1v1c0,.91-.07,1.73-1.1,2v-.56a.84.84,0,0,0,.53-.92v-.29h-.53Z"/><path d="M247.95,22.42c0-1.87.13-4.37,2.42-4.36s2.42,2.28,2.42,4.37c0,1.8-.13,4.29-2.42,4.29S247.95,24.43,247.95,22.42Zm2.42,3.5c1.29,0,1.37-1.71,1.37-3.5s-.07-3.58-1.37-3.58S249,20.55,249,22.42,249.07,25.92,250.37,25.92Z"/><path d="M253.71,22.42c0-1.87.13-4.37,2.42-4.36s2.42,2.28,2.42,4.37c0,1.8-.13,4.29-2.42,4.29S253.71,24.43,253.71,22.42Zm2.42,3.5c1.29,0,1.37-1.71,1.37-3.5s-.07-3.57-1.37-3.57-1.37,1.7-1.37,3.57S254.83,25.92,256.13,25.92Z"/><path d="M259.47,22.42c0-1.87.13-4.37,2.42-4.36s2.42,2.28,2.42,4.37c0,1.8-.13,4.29-2.42,4.29S259.47,24.43,259.47,22.42Zm2.42,3.5c1.3,0,1.37-1.71,1.37-3.5s-.07-3.57-1.37-3.57-1.37,1.7-1.37,3.57S260.59,25.92,261.89,25.92Z"/><line class="cls-2" x1="194.7" x2="194.7" y2="14.19"/><path d="M186.12,26.53h-4.75A4.53,4.53,0,0,1,183.2,23l.7-.59a2.51,2.51,0,0,0,1.13-2c0-.73-.32-1.52-1.24-1.52-1.31,0-1.34,1.35-1.34,1.83h-1.06c0-1.61.67-2.7,2.41-2.7a2.11,2.11,0,0,1,2.28,2.27,3.35,3.35,0,0,1-1.49,2.79l-1.2,1a2.64,2.64,0,0,0-.92,1.45h3.65Z"/><path d="M187.51,25.26h1.1v1c0,.91-.07,1.73-1.1,2v-.56a.84.84,0,0,0,.53-.92v-.29h-.53Z"/><path d="M190,22.4c0-1.87.13-4.37,2.42-4.37s2.42,2.28,2.42,4.37c0,1.8-.13,4.29-2.42,4.29S190,24.42,190,22.4Zm2.42,3.5c1.29,0,1.37-1.71,1.37-3.5s-.07-3.57-1.37-3.58S191,20.53,191,22.4,191.08,25.9,192.38,25.9Z"/><path d="M195.72,22.4c0-1.87.13-4.37,2.42-4.36s2.42,2.28,2.42,4.37c0,1.8-.13,4.29-2.42,4.29S195.72,24.42,195.72,22.4Zm2.42,3.5c1.29,0,1.37-1.71,1.37-3.5s-.07-3.57-1.37-3.57-1.37,1.7-1.37,3.57S196.84,25.91,198.14,25.91Z"/><path d="M201.48,22.4c0-1.87.13-4.37,2.42-4.36s2.42,2.28,2.42,4.37c0,1.8-.13,4.29-2.42,4.29S201.48,24.42,201.48,22.4Zm2.42,3.5c1.3,0,1.37-1.71,1.37-3.5s-.07-3.57-1.37-3.57-1.37,1.7-1.37,3.57S202.61,25.91,203.9,25.91Z"/><line class="cls-2" x1="136.35" x2="136.35" y2="14.19"/><path d="M123.68,19.41c1.07-.06,2.05-.19,2.1-1.39h.72v8.49h-1V20.13h-1.81Z"/><path d="M129.52,25.24h1.1v1c0,.91-.07,1.73-1.1,2v-.56a.84.84,0,0,0,.53-.92v-.29h-.53Z"/><path d="M132,22.39c0-1.87.13-4.37,2.42-4.37s2.42,2.28,2.42,4.37c0,1.8-.13,4.29-2.42,4.29S132,24.4,132,22.39Zm2.42,3.5c1.29,0,1.37-1.71,1.37-3.5s-.07-3.57-1.37-3.58S133,20.51,133,22.39,133.09,25.89,134.39,25.89Z"/><path d="M137.73,22.39c0-1.87.13-4.36,2.42-4.36s2.42,2.28,2.42,4.37c0,1.8-.13,4.29-2.42,4.29S137.73,24.4,137.73,22.39Zm2.42,3.5c1.29,0,1.37-1.71,1.37-3.5s-.07-3.57-1.37-3.58-1.37,1.7-1.37,3.57S138.85,25.89,140.15,25.89Z"/><path d="M143.49,22.39c0-1.87.13-4.37,2.42-4.36s2.42,2.28,2.42,4.37c0,1.8-.13,4.29-2.42,4.29S143.49,24.4,143.49,22.39Zm2.42,3.5c1.3,0,1.37-1.71,1.37-3.5s-.07-3.57-1.37-3.57-1.37,1.7-1.37,3.57S144.62,25.89,145.91,25.89Z"/><line class="cls-2" x1="106.39" x2="106.39" y2="14.19"/><path d="M98.56,18.17h3.79v.94h-3L99,21.57l0,0a1.92,1.92,0,0,1,1.49-.64c1.27,0,2.13,1,2.13,2.8,0,1.58-.7,2.91-2.47,2.91a2.21,2.21,0,0,1-2.33-2.35h1.06c0,.44.17,1.56,1.29,1.56s1.39-1.34,1.39-2.21-.35-1.92-1.42-1.92a1.26,1.26,0,0,0-1.2.83l-.91,0Z"/><path d="M103.61,22.37c0-1.87.13-4.37,2.42-4.36s2.42,2.28,2.42,4.37c0,1.8-.13,4.29-2.42,4.29S103.61,24.39,103.61,22.37Zm2.42,3.5c1.29,0,1.37-1.71,1.37-3.5s-.07-3.57-1.37-3.57-1.37,1.7-1.37,3.57S104.73,25.87,106,25.87Z"/><path d="M109.37,22.37c0-1.87.13-4.37,2.42-4.36s2.42,2.28,2.42,4.37c0,1.8-.13,4.29-2.42,4.29S109.37,24.39,109.37,22.37Zm2.42,3.5c1.29,0,1.37-1.71,1.37-3.5s-.07-3.57-1.37-3.57-1.37,1.7-1.37,3.57S110.49,25.88,111.79,25.88Z"/><path d="M2.44,3.48H4.19L6.44,12H5l-.53-2.1H2L1.43,12H0ZM4.26,8.85l-1-4.22h0l-1,4.22Z"/><path d="M6.89,3.48H8.26v7.41h3.31V12H6.89Z"/><path d="M12.68,4.63h-2V3.48H16V4.63H14V12H12.67Z"/><path d="M16.77,3.48h1.37V12H16.77Z"/><path d="M20.9,4.63h-2V3.48h5.41V4.63h-2V12H20.89Z"/><path d="M26.31,3.48V9.62c0,1.08.43,1.56,1.26,1.56s1.25-.48,1.25-1.56V3.48h1.37v6c0,2-1,2.7-2.62,2.7s-2.63-.72-2.63-2.7v-6Z"/><path d="M31.49,3.48h2.43c2.69,0,3,1.75,3,4.28s-.34,4.28-3,4.28H31.49ZM32.86,11H34c1.13,0,1.59-.74,1.6-3.25S35.17,4.52,34,4.52H32.86Z"/><path d="M38.17,3.49h4.63V4.64H39.53V7H42.6V8.17H39.53V10.9h3.36v1.15H38.16Z"/><path d="M49.22,3.49a10.12,10.12,0,0,0-1.37,5.38,10.44,10.44,0,0,0,1.37,5.39h-.92a9.15,9.15,0,0,1,0-10.77Z"/><path d="M50.24,6.56h-.9v-1h.9V5c0-1.22.59-1.61,1.64-1.61a5.58,5.58,0,0,1,.71,0v1h-.36c-.48,0-.7.18-.7.61V5.6h1.06v1H51.53v5.49H50.23Z"/><path d="M54.29,9v.37c0,.86.11,2,1.08,2s1-1.05,1-1.44h1.22a2.13,2.13,0,0,1-2.27,2.33c-1.06,0-2.36-.31-2.36-3.3,0-1.69.36-3.49,2.39-3.49,1.8,0,2.28,1.08,2.28,2.88V9Zm2.08-.89V7.76c0-.82-.26-1.44-1-1.44S54.29,7.14,54.29,8v.13Z"/><path d="M59.85,9v.37c0,.86.11,2,1.08,2s1-1.06,1-1.44h1.22a2.13,2.13,0,0,1-2.27,2.33c-1.06,0-2.36-.31-2.36-3.3,0-1.69.36-3.49,2.39-3.49,1.8,0,2.28,1.08,2.28,2.88V9Zm2.08-.89V7.76c0-.82-.26-1.44-1-1.44S59.85,7.14,59.85,8v.13Z"/><path d="M63.71,5.61h.89V3.77H65.9V5.61H67v1H65.89v3.85c0,.5.14.68.59.68a2.51,2.51,0,0,0,.47,0v1a4.27,4.27,0,0,1-1,.11c-.88,0-1.31-.24-1.31-1.56v-4h-.89Z"/><path d="M67,14.27a10.12,10.12,0,0,0,1.37-5.39A10.42,10.42,0,0,0,67,3.5h.92a9.16,9.16,0,0,1,0,10.77Z"/></g></g></svg>
\ No newline at end of file
diff --git a/public_html/images/alt_legend_meters.svg b/public_html/images/alt_legend_meters.svg
new file mode 100644
index 0000000..6e23702
--- /dev/null
+++ b/public_html/images/alt_legend_meters.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" viewBox="0 0 921.22 28.39"><defs><style>.cls-1{fill:url(#linear-gradient);}.cls-2{fill:none;stroke:#000;stroke-miterlimit:10;}</style><linearGradient id="linear-gradient" x1="92.32" y1="6.58" x2="920.72" y2="6.58" gradientUnits="userSpaceOnUse"><stop offset="0.11" stop-color="#ec5b13"/><stop offset="0.21" stop-color="#ecc814"/><stop offset="0.24" stop-color="#eac914"/><stop offset="0.25" stop-color="#e2cd14"/><stop offset="0.27" stop-color="#d4d413"/><stop offset="0.28" stop-color="#c0de13"/><stop offset="0.29" stop-color="#a8ea12"/><stop offset="0.29" stop-color="#a4ec12"/><stop offset="0.38" stop-color="#12ec5b"/><stop offset="0.59" stop-color="#12b6ec"/><stop offset="0.79" stop-color="#2513ec"/><stop offset="1" stop-color="#ec13ec"/></linearGradient></defs><title>alt_Legend_meters</title><g id="Layer_2" data-name="Layer 2"><g id="REDESIGN"><rect class="cls-1" x="92.32" width="828.4" height="13.17"/><polyline class="cls-2" points="92.44 0 92.44 13.4 920.72 13.4 920.72 0"/><path d="M90,22.36c0-1.87.13-4.37,2.42-4.36s2.42,2.28,2.42,4.37c0,1.8-.13,4.29-2.42,4.29S90,24.37,90,22.36Zm2.42,3.5c1.3,0,1.37-1.71,1.37-3.5s-.07-3.57-1.37-3.58S91,20.49,91,22.36,91.1,25.86,92.39,25.86Z"/><path d="M882.64,19.52c1.07-.06,2.05-.19,2.1-1.39h.72v8.49h-1V20.24h-1.81Z"/><path d="M892.85,26.62H888.1a4.53,4.53,0,0,1,1.83-3.48l.7-.59a2.51,2.51,0,0,0,1.13-2c0-.73-.32-1.52-1.24-1.52-1.31,0-1.34,1.36-1.34,1.83h-1.06c0-1.61.67-2.7,2.41-2.7a2.11,2.11,0,0,1,2.28,2.27,3.35,3.35,0,0,1-1.49,2.79l-1.2,1a2.64,2.64,0,0,0-.92,1.45h3.65Z"/><path d="M894.25,25.35h1.1v1c0,.91-.07,1.73-1.1,2v-.56a.84.84,0,0,0,.53-.92v-.29h-.53Z"/><path d="M896.69,22.49c0-1.87.13-4.37,2.42-4.37s2.42,2.28,2.42,4.37c0,1.8-.13,4.29-2.42,4.29S896.69,24.51,896.69,22.49Zm2.42,3.5c1.29,0,1.37-1.71,1.37-3.5s-.07-3.57-1.37-3.57-1.37,1.7-1.37,3.57S897.82,26,899.12,26Z"/><path d="M902.46,22.49c0-1.87.13-4.37,2.42-4.37s2.42,2.28,2.42,4.37c0,1.8-.13,4.29-2.42,4.29S902.46,24.51,902.46,22.49Zm2.42,3.5c1.3,0,1.37-1.71,1.37-3.5s-.07-3.57-1.37-3.57-1.37,1.7-1.37,3.57S903.58,26,904.88,26Z"/><path d="M908.21,22.49c0-1.87.13-4.37,2.42-4.37s2.42,2.28,2.42,4.37c0,1.8-.13,4.29-2.42,4.29S908.21,24.51,908.21,22.49Zm2.42,3.5c1.3,0,1.37-1.71,1.37-3.5s-.07-3.57-1.37-3.57-1.37,1.7-1.37,3.57S909.34,26,910.64,26Z"/><path d="M916.72,24h-2.64v-.79h2.64V20.55h.79v2.64h2.64V24h-2.64v2.64h-.79Z"/><line class="cls-2" x1="735.39" x2="735.39" y2="14.19"/><path d="M724.09,24.75A1.12,1.12,0,0,0,725.21,26c1.42,0,1.5-2.12,1.5-2.55v-.67h0a1.85,1.85,0,0,1-1.62.95c-1.48,0-2.22-1.09-2.22-2.69s.82-2.9,2.4-2.9c2.35,0,2.52,2.28,2.52,4,0,1.94-.12,4.63-2.58,4.63a2,2,0,0,1-2.15-2Zm1.15-5.83c-1.06,0-1.34,1.07-1.34,2s.22,2,1.34,2,1.34-1.07,1.34-2S726.3,18.92,725.25,18.92Z"/><path d="M729.08,25.35h1.1v1c0,.91-.07,1.73-1.1,2v-.56a.84.84,0,0,0,.53-.92v-.29h-.53Z"/><path d="M731.52,22.49c0-1.87.13-4.37,2.42-4.37s2.42,2.28,2.42,4.37c0,1.8-.13,4.29-2.42,4.29S731.52,24.51,731.52,22.49Zm2.42,3.5c1.29,0,1.37-1.71,1.37-3.5s-.07-3.57-1.37-3.57-1.37,1.7-1.37,3.57S732.65,26,733.95,26Z"/><path d="M737.28,22.49c0-1.87.13-4.37,2.42-4.37s2.42,2.28,2.42,4.37c0,1.8-.13,4.29-2.42,4.29S737.28,24.51,737.28,22.49Zm2.42,3.5c1.29,0,1.37-1.71,1.37-3.5s-.07-3.57-1.37-3.57-1.37,1.7-1.37,3.57S738.41,26,739.71,26Z"/><path d="M743,22.49c0-1.87.13-4.37,2.42-4.37s2.42,2.28,2.42,4.37c0,1.8-.13,4.29-2.42,4.29S743,24.51,743,22.49Zm2.42,3.5c1.3,0,1.37-1.71,1.37-3.5s-.07-3.57-1.37-3.57-1.37,1.7-1.37,3.57S744.17,26,745.47,26Z"/><line class="cls-2" x1="565.55" x2="565.55" y2="14.19"/><path d="M556.68,20.17a1.11,1.11,0,0,0-1.12-1.25c-1.42,0-1.5,2.11-1.5,2.55v.67h0a1.85,1.85,0,0,1,1.62-.95c1.48,0,2.22,1.09,2.22,2.69s-.82,2.9-2.4,2.9c-2.35,0-2.52-2.27-2.52-4,0-1.94.12-4.63,2.58-4.63a2,2,0,0,1,2.15,2ZM555.53,26c1.06,0,1.34-1.08,1.34-2s-.22-2-1.34-2-1.34,1.08-1.34,2S554.48,26,555.53,26Z"/><path d="M559.24,25.35h1.1v1c0,.91-.07,1.73-1.1,2v-.56a.84.84,0,0,0,.53-.92v-.29h-.53Z"/><path d="M561.69,22.49c0-1.87.13-4.37,2.42-4.37s2.42,2.28,2.42,4.37c0,1.8-.13,4.29-2.42,4.29S561.69,24.51,561.69,22.49Zm2.42,3.5c1.29,0,1.37-1.71,1.37-3.5s-.07-3.57-1.37-3.57-1.37,1.7-1.37,3.57S562.82,26,564.11,26Z"/><path d="M567.45,22.49c0-1.87.13-4.37,2.42-4.37s2.42,2.28,2.42,4.37c0,1.8-.13,4.29-2.42,4.29S567.45,24.51,567.45,22.49Zm2.42,3.5c1.29,0,1.37-1.71,1.37-3.5s-.07-3.57-1.37-3.57-1.37,1.7-1.37,3.57S568.58,26,569.87,26Z"/><path d="M573.21,22.49c0-1.87.13-4.37,2.42-4.37s2.42,2.28,2.42,4.37c0,1.8-.13,4.29-2.42,4.29S573.21,24.51,573.21,22.49Zm2.42,3.5c1.3,0,1.37-1.71,1.37-3.5s-.07-3.57-1.37-3.57-1.37,1.7-1.37,3.57S574.34,26,575.63,26Z"/><line class="cls-2" x1="440.97" x2="440.97" y2="14.19"/><path d="M430,21.8h.53c.9,0,1.3-.65,1.3-1.5s-.29-1.42-1.1-1.42c-1.12,0-1.22,1-1.22,1.66h-1.06c0-1.45.68-2.45,2.26-2.45a2,2,0,0,1,2.18,2.21,1.75,1.75,0,0,1-1.32,1.82v0a1.82,1.82,0,0,1,1.57,2c0,1.55-.78,2.63-2.41,2.63a2.26,2.26,0,0,1-2.41-2.36v-.11h1.06c0,.78.38,1.68,1.35,1.68.62,0,1.35-.31,1.36-1.75a1.42,1.42,0,0,0-1.54-1.62H430Z"/><path d="M434.51,25.32h1.1v1c0,.91-.07,1.73-1.1,2V27.8a.84.84,0,0,0,.53-.92v-.29h-.53Z"/><path d="M437,22.46c0-1.87.13-4.37,2.42-4.36s2.42,2.28,2.42,4.37c0,1.8-.13,4.29-2.42,4.29S437,24.48,437,22.46Zm2.42,3.5c1.3,0,1.37-1.71,1.37-3.5s-.07-3.57-1.37-3.57S438,20.59,438,22.46,438.08,26,439.38,26Z"/><path d="M442.72,22.46c0-1.87.13-4.37,2.42-4.37s2.42,2.28,2.42,4.37c0,1.8-.13,4.29-2.42,4.29S442.72,24.48,442.72,22.46Zm2.42,3.5c1.3,0,1.37-1.71,1.37-3.5s-.07-3.57-1.37-3.58-1.37,1.7-1.37,3.57S443.84,26,445.14,26Z"/><path d="M448.48,22.47c0-1.87.13-4.37,2.42-4.37s2.42,2.28,2.42,4.37c0,1.8-.13,4.29-2.42,4.29S448.48,24.48,448.48,22.47ZM450.9,26c1.29,0,1.37-1.71,1.37-3.5s-.07-3.57-1.37-3.58-1.37,1.7-1.37,3.57S449.6,26,450.9,26Z"/><line class="cls-2" x1="384.19" x2="384.19" y2="14.19"/><path d="M376.1,26.57h-4.75a4.53,4.53,0,0,1,1.84-3.48l.7-.59a2.51,2.51,0,0,0,1.13-2c0-.73-.32-1.52-1.24-1.52-1.31,0-1.34,1.35-1.34,1.83h-1.06c0-1.61.67-2.7,2.41-2.7a2.11,2.11,0,0,1,2.28,2.27,3.35,3.35,0,0,1-1.49,2.79l-1.2,1a2.64,2.64,0,0,0-.92,1.45h3.65Z"/><path d="M377.49,25.3h1.1v1c0,.91-.07,1.73-1.1,2v-.56a.84.84,0,0,0,.53-.92v-.29h-.53Z"/><path d="M382.92,18.08h1v5.58h1v.86h-1v2.05h-1V24.52h-3.07v-.95Zm-2.16,5.58h2.16V19.74h0Z"/><path d="M385.7,22.45c0-1.87.13-4.37,2.42-4.36s2.42,2.28,2.42,4.37c0,1.8-.13,4.29-2.42,4.29S385.7,24.46,385.7,22.45Zm2.42,3.5c1.3,0,1.37-1.71,1.37-3.5s-.07-3.57-1.37-3.57-1.37,1.7-1.37,3.57S386.83,26,388.12,26Z"/><path d="M391.46,22.45c0-1.87.13-4.37,2.42-4.36s2.42,2.28,2.42,4.37c0,1.8-.13,4.29-2.42,4.29S391.46,24.47,391.46,22.45Zm2.42,3.5c1.29,0,1.37-1.71,1.37-3.5s-.07-3.57-1.37-3.57-1.37,1.7-1.37,3.57S392.59,26,393.88,26Z"/><line class="cls-2" x1="325.84" x2="325.84" y2="14.19"/><path d="M313.66,19.46c1.07-.06,2.05-.19,2.1-1.39h.72v8.49h-1V20.18h-1.81Z"/><path d="M319.5,25.29h1.1v1c0,.91-.07,1.73-1.1,2v-.56a.84.84,0,0,0,.53-.92v-.29h-.53Z"/><path d="M323.44,22a1.76,1.76,0,0,1-1.23-1.81,2.17,2.17,0,0,1,4.34,0A1.76,1.76,0,0,1,325.31,22a2,2,0,0,1,1.5,2.18,2.44,2.44,0,1,1-4.87,0A2,2,0,0,1,323.44,22Zm.93,3.9c1,0,1.38-.75,1.38-1.75s-.4-1.75-1.38-1.75-1.38.76-1.38,1.75S323.39,25.93,324.37,25.93Zm-1.11-5.68c0,.79.33,1.39,1.12,1.39s1.12-.6,1.12-1.39-.35-1.39-1.12-1.39S323.26,19.45,323.26,20.25Z"/><path d="M327.71,22.43c0-1.87.13-4.37,2.42-4.36s2.42,2.28,2.42,4.37c0,1.8-.13,4.29-2.42,4.29S327.71,24.45,327.71,22.43Zm2.42,3.5c1.29,0,1.37-1.71,1.37-3.5s-.07-3.57-1.37-3.58-1.37,1.7-1.37,3.57S328.84,25.94,330.13,25.94Z"/><path d="M333.47,22.44c0-1.87.13-4.37,2.42-4.36s2.42,2.28,2.42,4.37c0,1.8-.13,4.29-2.42,4.29S333.47,24.45,333.47,22.44Zm2.42,3.5c1.3,0,1.37-1.71,1.37-3.5s-.07-3.57-1.37-3.57-1.37,1.7-1.37,3.57S334.6,25.94,335.89,25.94Z"/><line class="cls-2" x1="267.49" x2="267.49" y2="14.19"/><path d="M254.09,19.44c1.07-.06,2.05-.19,2.1-1.39h.72v8.49h-1V20.16h-1.81Z"/><path d="M259.93,25.27H261v1c0,.91-.07,1.73-1.1,2v-.56a.84.84,0,0,0,.53-.92v-.29h-.53Z"/><path d="M267.18,26.54h-4.75a4.53,4.53,0,0,1,1.84-3.48l.7-.59a2.51,2.51,0,0,0,1.13-2c0-.73-.32-1.52-1.24-1.52-1.31,0-1.34,1.36-1.34,1.83h-1.06c0-1.61.67-2.7,2.41-2.7a2.11,2.11,0,0,1,2.28,2.27,3.35,3.35,0,0,1-1.49,2.79l-1.2,1a2.64,2.64,0,0,0-.92,1.45h3.65Z"/><path d="M268.14,22.42c0-1.87.13-4.37,2.42-4.36S273,20.33,273,22.42c0,1.8-.13,4.29-2.42,4.29S268.14,24.43,268.14,22.42Zm2.42,3.5c1.29,0,1.37-1.71,1.37-3.5s-.07-3.57-1.37-3.57-1.37,1.7-1.37,3.57S269.27,25.92,270.56,25.92Z"/><path d="M273.9,22.42c0-1.87.13-4.37,2.42-4.36s2.42,2.28,2.42,4.37c0,1.8-.13,4.29-2.42,4.29S273.9,24.43,273.9,22.42Zm2.42,3.5c1.3,0,1.37-1.71,1.37-3.5s-.07-3.57-1.37-3.57S275,20.55,275,22.42,275,25.92,276.32,25.92Z"/><line class="cls-2" x1="209.14" x2="209.14" y2="14.19"/><path d="M203.71,20.07a1.11,1.11,0,0,0-1.12-1.25c-1.42,0-1.5,2.11-1.5,2.55v.67h0a1.85,1.85,0,0,1,1.62-.95c1.48,0,2.22,1.09,2.22,2.69s-.82,2.9-2.4,2.9c-2.35,0-2.52-2.27-2.52-4,0-1.94.12-4.63,2.58-4.63a2,2,0,0,1,2.15,2Zm-1.15,5.83c1.06,0,1.34-1.08,1.34-2s-.22-2-1.34-2-1.34,1.08-1.34,2S201.5,25.9,202.56,25.9Z"/><path d="M205.83,22.4c0-1.87.13-4.37,2.42-4.36s2.42,2.28,2.42,4.37c0,1.8-.13,4.29-2.42,4.29S205.83,24.42,205.83,22.4Zm2.42,3.5c1.3,0,1.37-1.71,1.37-3.5s-.07-3.57-1.37-3.57-1.37,1.7-1.37,3.57S207,25.9,208.26,25.9Z"/><path d="M211.59,22.4c0-1.87.13-4.37,2.42-4.37s2.42,2.28,2.42,4.37c0,1.8-.13,4.29-2.42,4.29S211.59,24.42,211.59,22.4Zm2.42,3.5c1.3,0,1.37-1.71,1.37-3.5s-.07-3.57-1.37-3.58-1.37,1.7-1.37,3.57S212.72,25.91,214,25.91Z"/><line class="cls-2" x1="150.79" x2="150.79" y2="14.19"/><path d="M143.79,21.72h.53c.9,0,1.3-.65,1.3-1.5s-.29-1.42-1.1-1.42c-1.12,0-1.22,1-1.22,1.66h-1.06c0-1.45.68-2.45,2.26-2.45a2,2,0,0,1,2.18,2.21A1.75,1.75,0,0,1,145.35,22v0a1.82,1.82,0,0,1,1.57,2c0,1.55-.78,2.63-2.41,2.63a2.26,2.26,0,0,1-2.41-2.36v-.11h1.06c0,.78.38,1.68,1.35,1.68.62,0,1.36-.31,1.36-1.75a1.42,1.42,0,0,0-1.54-1.62h-.54Z"/><path d="M147.84,22.38c0-1.87.13-4.37,2.42-4.36s2.42,2.28,2.42,4.37c0,1.8-.13,4.29-2.42,4.29S147.84,24.4,147.84,22.38Zm2.42,3.5c1.3,0,1.37-1.71,1.37-3.5s-.07-3.57-1.37-3.57-1.37,1.7-1.37,3.57S149,25.89,150.27,25.89Z"/><path d="M153.6,22.39c0-1.87.13-4.37,2.42-4.36s2.42,2.28,2.42,4.37c0,1.8-.13,4.29-2.42,4.29S153.6,24.4,153.6,22.39Zm2.42,3.5c1.3,0,1.37-1.71,1.37-3.5s-.07-3.57-1.37-3.57-1.37,1.7-1.37,3.57S154.73,25.89,156,25.89Z"/><line class="cls-2" x1="120.82" x2="120.82" y2="14.19"/><path d="M112.63,19.4c1.07-.06,2.05-.19,2.1-1.39h.72V26.5h-1V20.12h-1.81Z"/><path d="M118.75,18.17h3.79v.94h-3l-.34,2.46,0,0a1.92,1.92,0,0,1,1.49-.63c1.27,0,2.13,1,2.13,2.79,0,1.58-.7,2.91-2.47,2.91a2.21,2.21,0,0,1-2.33-2.35h1.06c0,.44.17,1.56,1.29,1.56s1.39-1.34,1.39-2.21-.35-1.92-1.42-1.92a1.26,1.26,0,0,0-1.2.83l-.91,0Z"/><path d="M123.8,22.37c0-1.87.13-4.37,2.42-4.36s2.42,2.28,2.42,4.37c0,1.8-.13,4.29-2.42,4.29S123.8,24.39,123.8,22.37Zm2.42,3.5c1.29,0,1.37-1.71,1.37-3.5s-.07-3.57-1.37-3.57-1.37,1.7-1.37,3.57S124.93,25.88,126.22,25.88Z"/><path d="M2.44,3.47H4.19L6.44,12H5l-.53-2.1H2L1.43,12H0ZM4.26,8.85l-1-4.22h0l-1,4.22Z"/><path d="M6.89,3.47H8.26v7.41h3.31V12H6.89Z"/><path d="M12.68,4.63h-2V3.47H16V4.63H14V12H12.67Z"/><path d="M16.77,3.48h1.37V12H16.77Z"/><path d="M20.9,4.63h-2V3.48h5.41V4.63h-2V12H20.89Z"/><path d="M26.31,3.48V9.62c0,1.08.43,1.56,1.26,1.56s1.25-.48,1.25-1.56V3.48h1.37v6c0,2-1,2.7-2.62,2.7s-2.63-.72-2.63-2.7v-6Z"/><path d="M31.49,3.48h2.43c2.69,0,3,1.75,3,4.28s-.34,4.28-3,4.28H31.49ZM32.86,11H34c1.13,0,1.59-.74,1.6-3.25S35.17,4.51,34,4.51H32.86Z"/><path d="M38.17,3.48h4.63V4.64H39.53V7H42.6V8.16H39.53V10.9h3.36V12H38.16Z"/><path d="M49.22,3.49a10.13,10.13,0,0,0-1.37,5.38,10.43,10.43,0,0,0,1.37,5.39h-.92a9.15,9.15,0,0,1,0-10.77Z"/><path d="M49.9,5.6h1.22v.75h0a1.81,1.81,0,0,1,1.55-.92,1.4,1.4,0,0,1,1.5,1,1.76,1.76,0,0,1,1.63-1c.91,0,1.57.47,1.57,1.72v4.91H56.11V7.63c0-.84-.25-1.16-.78-1.16s-1,.42-1,1.26v4.33H53V7.63c0-.84-.25-1.16-.79-1.16s-1,.42-1,1.26v4.33H49.9Z"/><path d="M59.83,9v.37c0,.86.11,2,1.08,2s1-1.06,1-1.44h1.22a2.13,2.13,0,0,1-2.27,2.33c-1.06,0-2.36-.31-2.36-3.3,0-1.69.36-3.49,2.39-3.49,1.8,0,2.28,1.08,2.28,2.88V9Zm2.08-.89V7.76c0-.82-.26-1.44-1-1.44S59.83,7.14,59.83,8v.13Z"/><path d="M63.7,5.6h.89V3.77h1.29V5.6h1.06v1H65.88v3.85c0,.5.14.68.59.68a2.61,2.61,0,0,0,.47,0v1a4.32,4.32,0,0,1-1,.11c-.88,0-1.31-.24-1.31-1.56v-4H63.7Z"/><path d="M68.73,9v.37c0,.86.11,2,1.08,2s1-1.05,1-1.44h1.22a2.13,2.13,0,0,1-2.27,2.33c-1.06,0-2.36-.31-2.36-3.3,0-1.69.36-3.49,2.39-3.49,1.8,0,2.28,1.08,2.28,2.88V9Zm2.08-.89V7.76c0-.82-.26-1.44-1-1.44S68.73,7.14,68.73,8v.13Z"/><path d="M73.17,5.6h1.29v1h0A1.59,1.59,0,0,1,76,5.44a1,1,0,0,1,.31,0V6.8a2.41,2.41,0,0,0-.54-.07c-.59,0-1.29.26-1.29,1.46v3.86H73.17Z"/><path d="M79.73,7.49V7.32c0-.52-.18-1-.85-1-.52,0-.92.24-.92.84s.23.71.91.95l.83.29a1.75,1.75,0,0,1,1.4,1.86c0,1.38-1,2-2.32,2-1.63,0-2.12-.76-2.12-2V10h1.15v.2c0,.74.26,1.15,1,1.15s1.06-.36,1.06-.95a.94.94,0,0,0-.71-.95l-1.06-.37a1.72,1.72,0,0,1-1.38-1.86c0-1.21.88-1.77,2.21-1.77,1.64,0,2,1,2,1.76v.29Z"/><path d="M81.43,14.27A10.12,10.12,0,0,0,82.8,8.88,10.42,10.42,0,0,0,81.44,3.5h.92a9.16,9.16,0,0,1,0,10.77Z"/></g></g></svg>
\ No newline at end of file
diff --git a/public_html/images/box-checked.png b/public_html/images/box-checked.png
new file mode 100644
index 0000000..1a5cc83
Binary files /dev/null and b/public_html/images/box-checked.png differ
diff --git a/public_html/images/box-checked@2x.png b/public_html/images/box-checked@2x.png
new file mode 100644
index 0000000..8a75b86
Binary files /dev/null and b/public_html/images/box-checked@2x.png differ
diff --git a/public_html/images/box-checked@3x.png b/public_html/images/box-checked@3x.png
new file mode 100644
index 0000000..ae85a45
Binary files /dev/null and b/public_html/images/box-checked@3x.png differ
diff --git a/public_html/images/box-empty.png b/public_html/images/box-empty.png
new file mode 100644
index 0000000..46f6236
Binary files /dev/null and b/public_html/images/box-empty.png differ
diff --git a/public_html/images/box-empty@2x.png b/public_html/images/box-empty@2x.png
new file mode 100644
index 0000000..3990ff5
Binary files /dev/null and b/public_html/images/box-empty@2x.png differ
diff --git a/public_html/images/box-empty@3x.png b/public_html/images/box-empty@3x.png
new file mode 100644
index 0000000..7aa7e2b
Binary files /dev/null and b/public_html/images/box-empty@3x.png differ
diff --git a/public_html/images/close-settings.png b/public_html/images/close-settings.png
new file mode 100644
index 0000000..6c65377
Binary files /dev/null and b/public_html/images/close-settings.png differ
diff --git a/public_html/images/close-settings@2x.png b/public_html/images/close-settings@2x.png
new file mode 100644
index 0000000..1f45474
Binary files /dev/null and b/public_html/images/close-settings@2x.png differ
diff --git a/public_html/images/close-settings@3x.png b/public_html/images/close-settings@3x.png
new file mode 100644
index 0000000..b71c832
Binary files /dev/null and b/public_html/images/close-settings@3x.png differ
diff --git a/public_html/images/column-adjust.png b/public_html/images/column-adjust.png
new file mode 100644
index 0000000..3623751
Binary files /dev/null and b/public_html/images/column-adjust.png differ
diff --git a/public_html/images/column-adjust@2x.png b/public_html/images/column-adjust@2x.png
new file mode 100644
index 0000000..a789469
Binary files /dev/null and b/public_html/images/column-adjust@2x.png differ
diff --git a/public_html/images/column-adjust@3x.png b/public_html/images/column-adjust@3x.png
new file mode 100644
index 0000000..fafdadc
Binary files /dev/null and b/public_html/images/column-adjust@3x.png differ
diff --git a/public_html/images/fa_logo_color.png b/public_html/images/fa_logo_color.png
new file mode 100644
index 0000000..8136fbf
Binary files /dev/null and b/public_html/images/fa_logo_color.png differ
diff --git a/public_html/images/fa_logo_color@2x.png b/public_html/images/fa_logo_color@2x.png
new file mode 100644
index 0000000..76face9
Binary files /dev/null and b/public_html/images/fa_logo_color@2x.png differ
diff --git a/public_html/images/fa_logo_color@3x.png b/public_html/images/fa_logo_color@3x.png
new file mode 100644
index 0000000..2f24989
Binary files /dev/null and b/public_html/images/fa_logo_color@3x.png differ
diff --git a/public_html/images/ff-sv-logo.png b/public_html/images/ff-sv-logo.png
new file mode 100644
index 0000000..1c9a263
Binary files /dev/null and b/public_html/images/ff-sv-logo.png differ
diff --git a/public_html/images/ff-sv-logo@2x.png b/public_html/images/ff-sv-logo@2x.png
new file mode 100644
index 0000000..c1a1e76
Binary files /dev/null and b/public_html/images/ff-sv-logo@2x.png differ
diff --git a/public_html/images/ff-sv-logo@3x.png b/public_html/images/ff-sv-logo@3x.png
new file mode 100644
index 0000000..66178d9
Binary files /dev/null and b/public_html/images/ff-sv-logo@3x.png differ
diff --git a/public_html/images/map-icon.png b/public_html/images/map-icon.png
new file mode 100644
index 0000000..0d75237
Binary files /dev/null and b/public_html/images/map-icon.png differ
diff --git a/public_html/images/map-icon@2x.png b/public_html/images/map-icon@2x.png
new file mode 100644
index 0000000..ef0622b
Binary files /dev/null and b/public_html/images/map-icon@2x.png differ
diff --git a/public_html/images/map-icon@3x.png b/public_html/images/map-icon@3x.png
new file mode 100644
index 0000000..3b51d7e
Binary files /dev/null and b/public_html/images/map-icon@3x.png differ
diff --git a/public_html/images/pa-sv-logo.png b/public_html/images/pa-sv-logo.png
new file mode 100644
index 0000000..1b95e8c
Binary files /dev/null and b/public_html/images/pa-sv-logo.png differ
diff --git a/public_html/images/pa-sv-logo@2x.png b/public_html/images/pa-sv-logo@2x.png
new file mode 100644
index 0000000..a875af6
Binary files /dev/null and b/public_html/images/pa-sv-logo@2x.png differ
diff --git a/public_html/images/pa-sv-logo@3x.png b/public_html/images/pa-sv-logo@3x.png
new file mode 100644
index 0000000..125e0c7
Binary files /dev/null and b/public_html/images/pa-sv-logo@3x.png differ
diff --git a/public_html/images/settings-icon.png b/public_html/images/settings-icon.png
new file mode 100644
index 0000000..2f95e58
Binary files /dev/null and b/public_html/images/settings-icon.png differ
diff --git a/public_html/images/settings-icon@2x.png b/public_html/images/settings-icon@2x.png
new file mode 100644
index 0000000..2f90256
Binary files /dev/null and b/public_html/images/settings-icon@2x.png differ
diff --git a/public_html/images/settings-icon@3x.png b/public_html/images/settings-icon@3x.png
new file mode 100644
index 0000000..dc5a58b
Binary files /dev/null and b/public_html/images/settings-icon@3x.png differ
diff --git a/public_html/images/table-icon.png b/public_html/images/table-icon.png
new file mode 100644
index 0000000..2eed5f8
Binary files /dev/null and b/public_html/images/table-icon.png differ
diff --git a/public_html/images/table-icon@2x.png b/public_html/images/table-icon@2x.png
new file mode 100644
index 0000000..d7c7b3f
Binary files /dev/null and b/public_html/images/table-icon@2x.png differ
diff --git a/public_html/images/table-icon@3x.png b/public_html/images/table-icon@3x.png
new file mode 100644
index 0000000..495700c
Binary files /dev/null and b/public_html/images/table-icon@3x.png differ
diff --git a/public_html/images/zoom-in.png b/public_html/images/zoom-in.png
new file mode 100644
index 0000000..9ba05d7
Binary files /dev/null and b/public_html/images/zoom-in.png differ
diff --git a/public_html/images/zoom-in@2x.png b/public_html/images/zoom-in@2x.png
new file mode 100644
index 0000000..40b1a97
Binary files /dev/null and b/public_html/images/zoom-in@2x.png differ
diff --git a/public_html/images/zoom-in@3x.png b/public_html/images/zoom-in@3x.png
new file mode 100644
index 0000000..38de4f2
Binary files /dev/null and b/public_html/images/zoom-in@3x.png differ
diff --git a/public_html/images/zoom-out.png b/public_html/images/zoom-out.png
new file mode 100644
index 0000000..f64b25e
Binary files /dev/null and b/public_html/images/zoom-out.png differ
diff --git a/public_html/images/zoom-out@2x.png b/public_html/images/zoom-out@2x.png
new file mode 100644
index 0000000..684b701
Binary files /dev/null and b/public_html/images/zoom-out@2x.png differ
diff --git a/public_html/images/zoom-out@3x.png b/public_html/images/zoom-out@3x.png
new file mode 100644
index 0000000..f0d3b19
Binary files /dev/null and b/public_html/images/zoom-out@3x.png differ
diff --git a/public_html/index.html b/public_html/index.html
index 8a61ddc..1a2acbc 100644
--- a/public_html/index.html
+++ b/public_html/index.html
@@ -23,7 +23,7 @@
 		<script type="text/javascript" src="flags.js"></script>
 		<script type="text/javascript" src="layers.js"></script>
 		<script type="text/javascript" src="script.js"></script>
-		<title>FlightAware dump1090</title>
+		<title>PiAware Skyview</title>
 	</head>
 
 	<body onload="initialize()">
@@ -46,74 +46,220 @@
 			<input type="hidden" name="submit" value="submit">
 		</form>
 
+		<div id="header" class="infoHeading">
+			<div class="logoContainer">
+				<a href="http://flightaware.com/" target="_blank"><img src="images/fa_logo_color.png" alt="FlightAware" class="flightawareLogo" srcset="images/fa_logo_color.png 1x, images/fa_logo_color@2x.png 2x, images/fa_logo_color@3x.png 3x"></a>
+				<img src="images/pa-sv-logo.png" alt="PiAware SkyView" class="adsbLogo piAwareLogo" srcset="images/pa-sv-logo.png 1x, images/pa-sv-logo@2x.png 2x, images/pa-sv-logo@3x.png 3x">
+				<img src="images/ff-sv-logo.png" alt="FlightFeeder SkyView" class="adsbLogo flightfeederLogo" srcset="images/ff-sv-logo.png 1x, images/ff-sv-logo@2x.png 2x, images/ff-sv-logo@3x.png 3x" style="display: none;">
+			</div>
+			<div class="buttonContainer">
+				<div class="dateTime" id="clock_div"></div>
+				<div class="button buttonHeader" onclick="resetMap();"><span class="buttonText">Reset Map</span></div>
+				<div class="button buttonHeader" onclick="selectAllPlanes();"><span class="buttonText">Show All Tracks</span></div>
+				<div class="button buttonHeader" onclick="deselectAllPlanes();"><span class="buttonText">Hide All Tracks</span></div>
+			</div>
+			<div class="settingsContainer"><img src="images/settings-icon.png" id="settingsCog" srcset="images/settings-icon.png 1x, images/settings-icon@2x.png 2x, images/settings-icon@3x.png 3x"></div>
+		</div>
+
 		<div id="layout_container">
+			
 			<div id="selected_infoblock" class="hidden">
-				<table style="width: 100%">
-					<tr class="infoblock_heading">
-						<td colspan="2">
-							<b>
-								<span id="selected_callsign" onclick="toggleFollowSelected();" class="pointer">n/a</span>
-							</b>
-							<span id="selected_follow" onclick="toggleFollowSelected();" class="pointer">&#x21D2;</span>
-
-							<span id="selected_flag">
-								<img style="width: 20px; height=12px" src="about:blank" alt="Flag">
-							</span>
-
-							<a href="http://www.airframes.org/" onclick="document.getElementById('horrible_hack').submit.call(document.getElementById('airframes_post')); return false;">
-								<span id="selected_icao"></span>
-							</a>
-							<span id="selected_registration"></span>
+				<div class="highlightedTitle">
+					<span id="selected_flightaware_link" class="link rightLink"></span>
+					<span class="identLarge"><span id="selected_callsign">n/a</span></span>
+					<span class="identSmall"><span id="selected_icao">n/a</span></span>
+				</div>
+				<div class="highlightedInfo">
+					<div class="infoBlockTopSection">
+						<div class="infoRow removePadding">
+							<div class="infoHeading infoRowFluid">Registration: </div>
+							<div class="infoData infoRowFluid"><span id="selected_registration">n/a</span></div>
+						</div>
+						<div class="infoRow removePadding">
+							<div class="infoHeading infoRowFluid">Country of registration: </div>
+							<div class="infoData infoRowFluid"><span id="selected_country">n/a</span></div>
+						</div>
+					</div>
+					<div class="infoBlock45pxSection lightGreyBackground">
+						<div class="infoHeading infoRowFluid fourColumnSection1">
+							Aircraft Type:
+						</div>
+						<div class="infoData infoRowFluid fourColumnSection2">
 							<span id="selected_icaotype"></span>
-							<span id="selected_emergency"></span>
-							<span id="selected_flightaware_link"></span>
-						</td>
-					</tr>
+						</div>
+						<div class="infoHeading infoRowFluid fourColumnSection3">
+							Source:
+						</div>
+						<div class="infoData infoRowFluid fourColumnSection4">
+							<span id="selected_source"></span>
+						</div>
+					</div>
+					<div class="infoBlockSection">
+						<div>
+							<div class="infoHeading infoRowFluid fourColumnSection1">
+								Squawk:
+							</div>
+							<div class="infoData infoRowFluid fourColumnSection2">
+								<span id="selected_squawk"></span>
+							</div>
+							<div class="infoHeading infoRowFluid fourColumnSection3">
+								Speed:
+							</div>
+							<div class="infoData infoRowFluid fourColumnSection4">
+								<span id="selected_speed">n/a</span>
+							</div>
+						</div>
+						<div>
+							<div class="infoHeading infoRowFluid fourColumnSection1">
+								Altitude:
+							</div>
+							<div class="infoData infoRowFluid fourColumnSection2">
+								<span id="selected_altitude"></span>
+							</div>
+							<div class="infoHeading infoRowFluid fourColumnSection3">
+								Distance:
+							</div>
+							<div class="infoData infoRowFluid fourColumnSection4">
+								<span id="selected_sitedist">n/a</span>
+							</div>
+						</div>
+					</div>
+					<div class="infoBlockSection lightGreyBackground">
+						<div>
+							<div class="infoHeading infoRowFluid fourColumnSection1">
+								Heading:
+							</div>
+							<div class="infoData infoRowFluid fourColumnSection2">
+								<span id="selected_track">n/a</span>
+							</div>
+							<div class="infoHeading infoRowFluid fourColumnSection3">
+								Position:
+							</div>
+							<div class="infoData infoRowFluid fourColumnSection4">
+								<span id="selected_position">n/a</span>
+							</div>
+						</div>
+						<div>
+							<div class="infoHeading infoRowFluid fourColumnSection1">
+								Vertical Rate:
+							</div>
+							<div class="infoData infoRowFluid fourColumnSection2">
+								<span id="selected_vertical_rate">n/a</span>
+							</div>
+							<div class="infoHeading infoRowFluid fourColumnSection3">
+								Last Seen:
+							</div>
+							<div class="infoData infoRowFluid fourColumnSection4">
+								<span id="selected_seen">n/a</span>
+							</div>
+						</div>
+					</div>
+					<div class="infoBlockSection">
+						<div>
+							<div class="infoHeading infoRowFluid fourColumnSection1">
+								Messages:
+							</div>
+							<div class="infoData infoRowFluid fourColumnSection2">
+								<span id="selected_message_count">n/a</span>
+							</div>
+							<div class="infoHeading infoRowFluid fourColumnSection3">
+								RSSI:
+							</div>
+							<div class="infoData infoRowFluid fourColumnSection4">
+								<span id="selected_rssi">n/a</span>
+							</div>
+						</div>
+					</div>
+					<a href="http://www.airframes.org/" onclick="document.getElementById('horrible_hack').submit.call(document.getElementById('airframes_post')); return false;" class="link rightLink">
+						AirFrames.org
+					</a>
+					<span id="selected_photo_link" class="link"></span>
+				</div>
 
-					<tr id="infoblock_country" class="infoblock_body">
-						<td colspan="2">Country of registration: <span id="selected_country">n/a</span></td>
-					</tr>
-
-					<tr class="infoblock_body">
-						<td style="width: 55%">Altitude: <span id="selected_altitude"></span></td>
-						<td style="width: 45%">Squawk: <span id="selected_squawk"></span></td>
-					</tr>
-
-					<tr class="infoblock_body">
-						<td>Speed: <span id="selected_speed">n/a</span></td>
-						<td>RSSI: <span id="selected_rssi">n/a</span></td>
-					</tr>
-
-					<tr class="infoblock_body">
-						<td>Vertical rate: <span id="selected_vertical_rate">n/a</span></td>
-						<td>Messages: <span id="selected_message_count">n/a</span></td>
-					</tr>
-
-					<tr class="infoblock_body">
-						<td>Track: <span id="selected_track">n/a</span></td>
-						<td>Last seen: <span id="selected_seen">n/a</span></td>
-					</tr>
-
-					<tr class="infoblock_body">
-						<td colspan="2">Position: <span id="selected_position">n/a</span></td>
-					</tr>
-
-					<tr class="infoblock_body">
-						<td colspan="2">Distance from Site: <span id="selected_sitedist">n/a</span></td>
-					</tr>
-					<tr class="infoblock_body">
-						<td colspan="2"><span id="selected_photo_link"></span></td>
-					</tr>
-				</table>
 			</div> <!-- selected_infoblock -->
+
+			<div id="highlighted_infoblock">
+				<div class="highlightedTitle">
+					<span class="identLarge"><span id="highlighted_callsign">n/a</span></span>
+					<span class="identSmall"><span id="highlighted_icao">n/a</span></span>
+				</div>
+				<div class="highlightedInfo">
+					<div class="infoRow">
+						<div class="infoHeading infoRowTitle">Aircraft Type: </div>
+						<div class="infoData infoRowContent"><span id="higlighted_icaotype">n/a</span></div>
+					</div>
+					<div class="infoRow">
+						<div class="infoHeading infoRowTitle">Altitude: </div>
+						<div class="infoData infoRowContent"><span id="highlighted_altitude">n/a</span></div>
+					</div>
+					<div class="infoRow">
+						<div class="infoHeading infoRowTitle">Speed: </div>
+						<div class="infoData infoRowContent"><span id="highlighted_speed">n/a</span></div>
+					</div>
+				</div>
+			</div>
+
+			<div id="settings_infoblock">
+				<div id="settings_close" class="settingsCloseBox"></div>
+				<div class="settingsColumn">
+					<div class="settingsOptionContainer">
+						<div class="infoBlockTitleText">Overlay Toggles</div>
+					</div>
+					<div class="settingsOptionContainer">
+						<div class="settingsCheckbox" id="nexrad_checkbox"></div>
+						<div class="settingsText">NEXRAD Weather</div>
+					</div>
+					<div class="settingsOptionContainer">
+						<div class="settingsCheckbox" id="sitepos_checkbox"></div>
+						<div class="settingsText">Site Position and Range Rings</div>
+					</div>
+					<div class="settingsOptionContainer">
+						<div class="settingsCheckbox" id="actrail_checkbox"></div>
+						<div class="settingsText">Selected Aircraft Trail</div>
+					</div>
+					<div class="settingsOptionContainer">
+						<div class="settingsCheckbox" id="acpositions_checkbox"></div>
+						<div class="settingsText">Aircraft Positions</div>
+					</div>
+					<div class="settingsOptionContainer" id="altitude_chart_container">
+						<div class="settingsCheckbox" id="altitude_checkbox"></div>
+						<div class="settingsText">Altitude Chart</div>
+					</div>
+				</div>
+				<div class="settingsColumn">
+					<div class="settingsOptionContainer">
+						<div class="infoBlockTitleText">View Toggles</div>
+					</div>
+					<div class="settingsOptionContainer">
+						<div class="settingsCheckbox" id="blockedmlat_filter"></div>
+						<div class="settingsText">Show Anonymous MLAT Tracks</div>
+					</div>
+					<div class="settingsOptionContainer">
+						<div class="settingsCheckbox" id="groundvehicle_filter"></div>
+						<div class="settingsText">Show Ground Vehicles and Other Non-Aircraft Positions</div>
+					</div>
+					<div class="settingsOptionContainer">
+						<div class="settingsCheckbox" id="selectall_checkbox"></div>
+						<div class="settingsText">All Aircraft Trails</div>
+					</div>
+					<div class="settingsOptionContainer">
+						<div class="settingsCheckbox" id="grouptype_checkbox"></div>
+						<div class="settingsText">Group by Data Type</div>
+					</div>
+				</div>
+			</div>
+
 			<div id="map_container">
 				<div id="map_canvas"></div>
-                                <div id="toggle_sidebar_control" class="ol-unselectable ol-control">
-                                  <button id="toggle_sidebar_button" class="hide_sidebar" title="Toggle Sidebar"></button>
-                                </div>
-                                <div id="expand_sidebar_control" class="ol-unselectable ol-control">
-                                  <button id="expand_sidebar_button" title="Expand Sidebar"></button>
-                                </div>
+				<div id="toggle_sidebar_control" class="ol-unselectable ol-control">
+					<button id="toggle_sidebar_button" class="hide_sidebar" title="Toggle Sidebar"></button>
+				</div>
+				<div id="expand_sidebar_control" class="ol-unselectable ol-control">
+					<button id="expand_sidebar_button" title="Expand Sidebar"></button>
+				</div>
+				<div id="altitude_chart" class="ol-unselectable ol-control altitudeFeet">
+					<button id="altitude_chart_button"></button>
+				</div>
 			</div>
 			<div id="sidebar_container">
 				<div id="splitter" class="ui-resizable-handle ui-resizable-w"></div>
@@ -123,40 +269,27 @@
 						<table style="width: 100%">
 							<tr class="infoblock_heading">
 								<td>
-									<b id="infoblock_name">FlightAware dump1090</b>
-								</td>
-								<td>
-									<span id="show_map_button" class="sidebarButton pointer">Show Map</span>
+									<div class="button buttonTable" id="show_map_button"><span class="buttonText">Show Map</span></div>
 								</td>
 								<td style="text-align: right">
 									<a href="https://github.com/flightaware/dump1090" id="dump1090_version" target="_blank"></a>
 								</td>
 							</tr>
 
-							<tr>
-								<td colspan="2">
-									<div id="sudo_buttons">
-										<span class="sidebarButton pointer" onclick="resetMap();">Reset Map</span>
-										<span class="sidebarButton pointer" onclick="selectAllPlanes();">Select All</span>
-										<span class="sidebarButton pointer" onclick="deselectAllPlanes();">Select None</span>
-									</div>
-								</td>
+							<tr class="infoblock_body">
+								<td><span class="infoBlockTitleText">Total Aircraft:</span> <span id="dump1090_total_ac">n/a</span></td>
+								<td><span class="infoBlockTitleText">Messages:</span> <span id="dump1090_message_rate">n/a</span>/sec</td>
 							</tr>
 
 							<tr class="infoblock_body">
-								<td>Aircraft (total): <span id="dump1090_total_ac">n/a</span></td>
-								<td>Messages: <span id="dump1090_message_rate">n/a</span>/sec</td>
-							</tr>
-
-							<tr class="infoblock_body">
-								<td>(with positions): <span id="dump1090_total_ac_positions">n/a</span></td>
-								<td>History: <span id="dump1090_total_history">n/a</span> positions</td>
+								<td><span class="infoBlockTitleText">With Positions:</span> <span id="dump1090_total_ac_positions">n/a</span></td>
+								<td><span class="infoBlockTitleText">History:</span> <span id="dump1090_total_history">n/a</span> positions</td>
 							</tr>
 						</table>
 					</div> <!-- dump1090_infoblock -->
 
 					<div id="units_container">
-						<label for="units_selector">Units:</label>
+						<label for="units_selector"><span class="infoBlockTitleText">Units:</span></label>
 						<select name="units_selector" id="units_selector">
 							<option value="nautical">Aeronautical</option>
 							<option value="metric">Metric</option>
@@ -165,7 +298,7 @@
 					</div>
 
 					<form id="altitude_filter_form">
-						<label>Filter by altitude:</label>
+						<label><span class="infoBlockTitleText">Filter by Altitude:</span></label>
 						<input id="altitude_filter_min" name="minAltitude" type="text" class="altitudeFilterInput" maxlength="5">
 						<label for="minAltitude" class="altitudeUnit"></label>
 						<span> to </span>
@@ -189,15 +322,15 @@
 									<td id="speed" onclick="sortBySpeed();">Speed (<span class="speedUnit"></span>)</td>
 									<td id="vert_rate" onclick="sortByVerticalRate();">Vertical Rate (<span class="verticalRateUnit"></span>)</td>
 									<td id="distance" onclick="sortByDistance();">Distance (<span class="distanceUnit"></span>)</td>
-									<td id="track" onclick="sortByTrack();">Track</td>
+									<td id="track" onclick="sortByTrack();">Heading</td>
 									<td id="msgs" onclick="sortByMsgs();">Msgs</td>
 									<td id="seen" onclick="sortBySeen();">Age</td>
 									<td id="rssi" onclick="sortByRssi();">RSSI</td>
 									<td id="lat" onclick="sortByLatitude();">Latitude</td>
 									<td id="lon" onclick="sortByLongitude();">Longitude</td>
 									<td id="data_source" onclick="sortByDataSource();">Data Source</td>
-									<td id="airframes_mode_s_link">Airframes.org Link</td>
-									<td id="flightaware_mode_s_link">FlightAware Link</td>
+									<td id="airframes_mode_s_link">Airframes.org</td>
+									<td id="flightaware_mode_s_link">FlightAware</td>
 									<td id="flightaware_photo_link">Photos</td>
 								</tr>
 							</thead>
@@ -226,6 +359,16 @@
 								</tr>
 							</tbody>
 						</table>
+						<div class="legend">
+							<div class="legendBox vPosition"></div>
+							<div class="legendTitle">ADS-B</div>
+							<div class="legendBox mlat"></div>
+							<div class="legendTitle">MLAT</div>
+							<div class="legendBox other"></div>
+							<div class="legendTitle">Other</div>
+							<div class="legendBox tisb"></div>
+							<div class="legendTitle">TIS-B</div>
+						</div>
 					</div> <!-- planes_table -->
 
 				</div> <!-- sidebar_canvas -->
diff --git a/public_html/markers.js b/public_html/markers.js
index 3be6cf7..eb09c23 100755
--- a/public_html/markers.js
+++ b/public_html/markers.js
@@ -1,220 +1,212 @@
 // -*- mode: javascript; indent-tabs-mode: nil; c-basic-offset: 8 -*-
 "use strict";
 
-// From the original planeObject.js:
-var _generic_plane_svg = "M 0,0 " +
-        "M 1.9565564,41.694305 C 1.7174505,40.497708 1.6419973,38.448747 " +
-        "1.8096508,37.70494 1.8936398,37.332056 2.0796653,36.88191 2.222907,36.70461 " +
-        "2.4497603,36.423844 4.087816,35.47248 14.917931,29.331528 l 12.434577," +
-        "-7.050718 -0.04295,-7.613412 c -0.03657,-6.4844888 -0.01164,-7.7625804 " +
-        "0.168134,-8.6194061 0.276129,-1.3160905 0.762276,-2.5869575 1.347875," +
-        "-3.5235502 l 0.472298,-0.7553719 1.083746,-0.6085497 c 1.194146,-0.67053522 " +
-        "1.399524,-0.71738842 2.146113,-0.48960552 1.077005,0.3285939 2.06344," +
-        "1.41299352 2.797602,3.07543322 0.462378,1.0469993 0.978731,2.7738408 " +
-        "1.047635,3.5036272 0.02421,0.2570284 0.06357,3.78334 0.08732,7.836246 0.02375," +
-        "4.052905 0.0658,7.409251 0.09345,7.458546 0.02764,0.04929 5.600384,3.561772 " +
-        "12.38386,7.805502 l 12.333598,7.715871 0.537584,0.959688 c 0.626485,1.118378 " +
-        "0.651686,1.311286 0.459287,3.516442 -0.175469,2.011604 -0.608966,2.863924 " +
-        "-1.590344,3.127136 -0.748529,0.200763 -1.293144,0.03637 -10.184829,-3.07436 " +
-        "C 48.007733,41.72562 44.793806,40.60197 43.35084,40.098045 l -2.623567," +
-        "-0.916227 -1.981212,-0.06614 c -1.089663,-0.03638 -1.985079,-0.05089 -1.989804," +
-        "-0.03225 -0.0052,0.01863 -0.02396,2.421278 -0.04267,5.339183 -0.0395,6.147742 " +
-        "-0.143635,7.215456 -0.862956,8.845475 l -0.300457,0.680872 2.91906,1.361455 " +
-        "c 2.929379,1.366269 3.714195,1.835385 4.04589,2.41841 0.368292,0.647353 " +
-        "0.594634,2.901439 0.395779,3.941627 -0.0705,0.368571 -0.106308,0.404853 " +
-        "-0.765159,0.773916 L 41.4545,62.83158 39.259237,62.80426 c -6.030106,-0.07507 " +
-        "-16.19508,-0.495041 -16.870991,-0.697033 -0.359409,-0.107405 -0.523792," +
-        "-0.227482 -0.741884,-0.541926 -0.250591,-0.361297 -0.28386,-0.522402 -0.315075," +
-        "-1.52589 -0.06327,-2.03378 0.23288,-3.033615 1.077963,-3.639283 0.307525," +
-        "-0.2204 4.818478,-2.133627 6.017853,-2.552345 0.247872,-0.08654 0.247455," +
-        "-0.102501 -0.01855,-0.711959 -0.330395,-0.756986 -0.708622,-2.221756 -0.832676," +
-        "-3.224748 -0.05031,-0.406952 -0.133825,-3.078805 -0.185533,-5.937448 -0.0517," +
-        "-2.858644 -0.145909,-5.208974 -0.209316,-5.222958 -0.06341,-0.01399 -0.974464," +
-        "-0.0493 -2.024551,-0.07845 L 23.247235,38.61921 18.831373,39.8906 C 4.9432155," +
-        "43.88916 4.2929558,44.057819 3.4954426,43.86823 2.7487826,43.690732 2.2007966," +
-        "42.916622 1.9565564,41.694305 z";
 
-// Rescaled from "Helicopter bottom view silhouette"
-// http://www.flaticon.com/free-icon/helicopter-bottom-view-silhouette_26901
-// by Freepik (http://www.flaticon.com/authors/freepik)
-// licensed under CC BY 3.0 (https://creativecommons.org/licenses/by/3.0/)
-
-// 44x64
-var _rotorcraft_svg =
-        "M 43.89309,0.4301 c -0.60546,-0.60546 -1.62623,-0.56506 -2.2813,0.0897 L 25.82444,16.3061 C 24.95171,-1.27473 21.64491,1.24212 21.64491,1.24212 c 0,0 -3.20153,-2.80873 -4.13518,14.07519 L 2.71103,0.51862 C 2.05636,-0.13606 1.03533,-0.17646 0.43,0.42902 c -0.60546,0.6052 -0.56506,1.6261 0.0896,2.28104 l 16.81957,16.81931 c -0.0454,1.63425 -0.072,3.41089 -0.0796,5.34281 l -0.90497,0.90496 h -1.94113 v 1.94113 L 0.51882,41.61319 c -0.6548,0.65454 -0.69533,1.67531 -0.09,2.28077 0.60533,0.60546 1.62636,0.5648 2.28104,-0.0896 L 14.41335,32.10074 v 1.94073 h 3.09928 c 0,0 1.25961,6.97312 2.03417,8.65159 0.77495,1.67913 0.032,17.17487 2.09799,17.17487 0.38346,0 0.66928,-0.53374 0.88615,-1.41331 l 6.34515,-2.71897 v -1.03314 h -5.85155 c 0.34017,-4.67077 0.24161,-10.97316 0.71942,-12.00945 0.77416,-1.67847 2.03285,-8.65159 2.03285,-8.65159 h 3.09928 v -2.974 l 12.73545,12.73689 c 0.65507,0.65442 1.67584,0.69495 2.2813,0.0896 0.60546,-0.60533 0.56479,-1.62623 -0.0901,-2.28077 L 28.876,26.68527 v -0.90813 h -0.90799 l -1.94284,-1.9431 c -0.009,-1.15407 -0.0263,-2.25524 -0.0496,-3.29693 l 17.82849,-17.826 c 0.65389,-0.65494 0.69442,-1.67702 0.0891,-2.28103 z " +
-        "M 18.80421,51.60336 h -0.5165 c -0.42794,0 -0.77495,0.34754 -0.77495,0.77521 v 10.84709 c 0,0.42768 0.34701,0.77469 0.77495,0.77469 h 0.5165 c 0.42768,0 0.77469,-0.34701 0.77469,-0.77469 V 52.37857 c 0,-0.42781 -0.34701,-0.77521 -0.77469,-0.77521 z";
-
-// Modified version of "Beechcraft Bonanza V35B"
-// https://commons.wikimedia.org/wiki/File:Beechcraft_Bonanza_V35B.svg
-// by Kaboldy (https://commons.wikimedia.org/wiki/User:Kaboldy)
-// licensed under CC BY-SA 3.0 (https://creativecommons.org/licenses/by-sa/3.0/deed.en)
-
-// 64x49
-var _beechcraft_svg = 
-        "m 31.9375,0.21875 c -0.06777,0.0107988 -0.115451,0.0391469 -0.15625,0.0625 C 31.672725,0.37187346 31.571656,0.508205 31.5,0.625 c -0.03614,0.0602071 -0.06208,0.095702 -0.09375,0.15625 -0.07403,0.15902301 -0.135583,0.3268225 -0.1875,0.5 -0.04551,0.1172902 -0.09299,0.229501 -0.125,0.34375 C 31.061962,1.7428305 31.051772,1.8837099 31.03125,2 31.013723,2.1172825 31.001884,2.2232944 31,2.34375 a 0.050005,0.050005 0 0 0 0,0.03125 0.050005,0.050005 0 0 0 0,0.03125 c -0.0082,0.022808 -0.04473,0.016331 -0.0625,0.03125 -0.02369,0.019892 -0.05403,0.050775 -0.09375,0.0625 -0.07944,0.02345 -0.16785,0.042313 -0.25,0.0625 -0.142298,0.027931 -0.321549,0.011037 -0.5,0.03125 -0.178451,0.020213 -0.362341,0.079026 -0.5,0.1875 -0.232524,0.2710695 -0.269126,0.6354569 -0.375,0.9375 -0.515728,1.9222735 -0.692683,3.8981369 -0.8125,5.875 -0.0025,0.039801 -0.0291,0.08613 -0.03125,0.125 -5.12e-4,0.00925 5.69e-4,0.022042 0,0.03125 l -3.75,1.59375 -0.03125,0 -0.03125,0 L 1.03125,13.125 1,13.125 a 0.050005,0.050005 0 0 0 -0.03125,0 c -0.0142757,0.0014 -0.0171094,0.02929 -0.03125,0.03125 -0.49350918,0.06826 -0.88359986,0.49922 -0.90625,1 A 0.050005,0.050005 0 0 0 0,14.1875 c -2.5577425e-5,0.01009 -2.9111128e-4,0.02111 0,0.03125 A 0.050005,0.050005 0 0 0 0,14.25 l 0,5.0625 a 0.050005,0.050005 0 0 0 0,0.03125 0.050005,0.050005 0 0 0 0,0.03125 c 2.7397524e-4,0.0076 0.03048716,-0.0075 0.03125,0 a 0.050005,0.050005 0 0 0 0,0.03125 0.050005,0.050005 0 0 0 0.03125,0 c 0.02951574,0.118004 0.10643771,0.204628 0.21875,0.25 0.008119,0.0033 -0.008332,0.02849 0,0.03125 a 0.050005,0.050005 0 0 0 0,0.03125 c 0.007096,0.0018 0.0240449,-0.0015 0.03125,0 a 0.050005,0.050005 0 0 0 0.03125,0 L 28.4375,24.3125 c 0.07632,1.73868 0.196986,3.45307 0.375,5.1875 0.345732,3.673262 0.848433,7.32759 1.4375,10.96875 l -6.96875,1.375 -0.0625,0 a 0.050005,0.050005 0 0 0 -0.03125,0 0.050005,0.050005 0 0 0 0,0.03125 c -0.291266,0.06923 -0.590135,0.19983 -0.78125,0.4375 -0.282641,0.328422 -0.401461,0.745626 -0.46875,1.15625 -0.09612,0.640251 -0.04006,1.301405 0.03125,1.9375 0.08652,0.703658 0.205326,1.376189 0.375,2.0625 0.02,0.08426 0.07303,0.168374 0.09375,0.25 a 0.050005,0.050005 0 0 0 0,0.03125 0.050005,0.050005 0 0 0 0,0.03125 0.050005,0.050005 0 0 0 0,0.03125 0.050005,0.050005 0 0 0 0.03125,0 l 0.0625,0 4.59375,0.46875 0,0.1875 0,0.03125 a 0.050005,0.050005 0 0 0 0,0.03125 0.050005,0.050005 0 0 0 0.03125,0.03125 l 0.03125,0 3.96875,0.375 0.0625,0 a 0.050005,0.050005 0 0 0 0.03125,0 0.050005,0.050005 0 0 0 0,-0.03125 0.050005,0.050005 0 0 0 0,-0.03125 0.050005,0.050005 0 0 0 0,-0.03125 l 0.28125,-1.125 c 0.08761,0.449359 0.164528,0.858018 0.25,1.28125 0.002,0.01 -0.002,0.02127 0,0.03125 0.0054,0.0158 0.0258,0.01691 0.03125,0.03125 0.02181,0.05737 0.03806,0.120629 0.0625,0.15625 0.03055,0.04453 0.07454,0.09409 0.125,0.09375 0.05046,-3.37e-4 0.09462,-0.04919 0.125,-0.09375 0.0243,-0.03565 0.04084,-0.09925 0.0625,-0.15625 0.0054,-0.01425 0.02586,-0.01557 0.03125,-0.03125 a 0.050005,0.050005 0 0 0 0,-0.03125 l 0.25,-1.28125 0.28125,1.125 a 0.050005,0.050005 0 0 0 0,0.03125 l 0,0.03125 a 0.050005,0.050005 0 0 0 0,0.03125 0.050005,0.050005 0 0 0 0.03125,0 l 0.0625,0 3.96875,-0.375 a 0.050005,0.050005 0 0 0 0.03125,0 0.050005,0.050005 0 0 0 0.03125,-0.03125 0.050005,0.050005 0 0 0 0,-0.03125 l 0,-0.03125 0,-0.21875 4.59375,-0.4375 a 0.050005,0.050005 0 0 0 0.03125,0 0.050005,0.050005 0 0 0 0.03125,0 0.050005,0.050005 0 0 0 0.03125,0 0.050005,0.050005 0 0 0 0,-0.03125 0.050005,0.050005 0 0 0 0,-0.03125 0.050005,0.050005 0 0 0 0,-0.03125 c 0.09927,-0.372978 0.201637,-0.747919 0.28125,-1.125 0.09782,-0.502873 0.206978,-1.018007 0.25,-1.53125 8.56e-4,-0.01021 -8.2e-4,-0.02104 0,-0.03125 0.04501,-0.499379 0.03422,-1.031912 -0.03125,-1.53125 -0.06791,-0.423874 -0.1758,-0.848192 -0.46875,-1.1875 -0.191021,-0.237794 -0.489803,-0.368516 -0.78125,-0.4375 -0.01389,-0.0033 -0.01729,-0.02834 -0.03125,-0.03125 l -0.0625,0 -7,-1.375 c 0.578605,-3.59278 1.088587,-7.220459 1.4375,-10.84375 0.185606,-1.784156 0.327336,-3.55267 0.40625,-5.34375 l 28.09375,-4.5625 a 0.050005,0.050005 0 0 0 0.03125,0 c 0.01603,-0.0032 0.01585,-0.02623 0.03125,-0.03125 a 0.050005,0.050005 0 0 0 0,-0.03125 c 0.113013,-0.04503 0.18958,-0.131349 0.21875,-0.25 0.0077,-0.03145 0.06397,-0.02794 0.0625,-0.0625 a 0.050005,0.050005 0 0 0 0,-0.03125 l 0,-5.0625 0,-0.03125 c 6.4e-4,-0.02413 -0.03014,-0.03866 -0.03125,-0.0625 -0.02337,-0.501664 -0.410965,-0.931701 -0.90625,-1 -0.0096,-0.0013 -0.02158,0.001 -0.03125,0 a 0.050005,0.050005 0 0 0 0,-0.03125 0.050005,0.050005 0 0 0 -0.03125,0 l -0.03125,0 -23.53125,-1.78125 -0.03125,0 -0.03125,0 -3.78125,-1.5625 0,-0.03125 C 35.517489,8.2805897 35.403194,6.8282343 35.15625,5.375 34.999455,4.539239 34.823204,3.7020107 34.5,2.90625 34.396263,2.7291587 34.223707,2.6576159 34.03125,2.625 33.838793,2.5923841 33.615271,2.5934384 33.46875,2.5625 33.373159,2.539039 33.279419,2.5226169 33.1875,2.5 33.095581,2.4773831 33.02499,2.4607373 33,2.375 c 2e-5,-0.010496 1.57e-4,-0.020774 0,-0.03125 -0.0022,-0.1473663 -0.0087,-0.2950936 -0.03125,-0.4375 -0.02326,-0.1199278 -0.06228,-0.2252731 -0.09375,-0.34375 -0.04357,-0.1647004 -0.09116,-0.3418053 -0.15625,-0.5 -0.04566,-0.13569283 -0.124489,-0.25424267 -0.1875,-0.375 -0.04296,-0.0733644 -0.0692,-0.1478646 -0.125,-0.21875 C 32.363928,0.40814747 32.294741,0.35866921 32.25,0.3125 32.21883,0.28842774 32.193993,0.26948756 32.15625,0.25 c -0.02455,-0.0127106 -0.06329,0.007373 -0.09375,0 -0.01015,-0.002458 -0.02048,0.001121 -0.03125,0 a 0.050005,0.050005 0 0 0 0,-0.03125 c -0.01089,-8.0895e-4 -0.01977,-9.7401e-4 -0.03125,0 4.14e-4,-4.837e-5 -0.01894,5.0367e-4 -0.03125,0 -0.01231,-5.0367e-4 -0.01037,-0.0122022 -0.03125,0 z";
-
-// From https://commons.wikimedia.org/wiki/File:Silhouette_An-124.svg
-// (which puts the original SVG in the public domain)
-var _heavy_svg =
-        "m28.64874,12.035023l0,8.801421l-4.585627,3.066495c0.126825,-0.257055 0.094102,-0.531839 0.095802,-0.802796l-0.015437,-3.087446l-2.230453,-0.012673l0.019009,3.599141c0.000513,0.577993 0.076338,0.923195 0.589296,1.241956l-5.533809,3.630512c0.166511,-0.256275 0.153699,-0.551367 0.153699,-0.841892l-0.005929,-3.270195l-2.160751,-0.012672l-0.006337,3.637159c0.016349,0.5301 0.096662,1.090947 0.576623,1.419379l-11.976014,7.825597c-2.106287,1.48859 -1.705322,3.044253 -1.56512,4.587637l26.645047,-9.048544l0,13.750239l0.722364,5.062875l-8.681027,6.387208c-1.239945,1.059417 -1.080616,2.171837 -0.842757,3.256969l11.278998,-2.946479c0.130159,3.116897 1.559821,3.171571 1.780561,0.006336l11.278998,2.94648c0.23786,-1.085133 0.397189,-2.197552 -0.842756,-3.256969l-8.681026,-6.387207l0.722362,-5.062875l0,-13.750239l26.645048,9.042207c0.140203,-1.543381 0.541167,-3.092711 -1.56512,-4.581301l-11.976015,-7.825597c0.47996,-0.328434 0.553938,-0.889279 0.570286,-1.419379l0,-3.63716l-2.160751,0.012673l-0.005378,3.328244c-0.002334,0.294243 0.007077,0.545056 0.178191,0.817583l-5.565189,-3.664251c0.512962,-0.318761 0.59512,-0.663963 0.595633,-1.241956l0.019009,-3.599141l-2.230454,0.012673l-0.015793,3.100403c0.001462,0.282341 -0.019949,0.535579 0.124839,0.794638l-4.614307,-3.071294l0,-8.801421c-1.111672,-11.152869 -5.489391,-11.217579 -6.735717,-0.006336z";
-
-// From https://discussions.flightaware.com/ads-b-flight-tracking-f21/some-custom-svg-plane-icons-t37783.html
-// by Peter Lowden
-// licensed under CC BY 4.0 (https://creativecommons.org/licenses/by/4.0/)
-
-// NB: scales are not accurate, they have been tweaked for the sake
-// of usability
-var _a320 = {
-        key: "a320",
-        scale: 0.45,
-        size: [64, 64],
-        anchor: [32, 28],
-        path: "m 32,1 2,1 2,3 0,18 4,1 0,-4 3,0 0,5 17,6 0,3 -15,-2 -9,0 0,12 -2,6 7,3 0,2 -8,-1 -1,2 -1,-2 -8,1 0,-2 7,-3 -2,-6 0,-12 -9,0 -15,2 0,-3 17,-6 0,-5 3,0 0,4 4,-1 0,-18 2,-3 2,-1z"
-};
-
-var _b777 = {
-        key: "b777",
-        scale: 0.60,
-        size: [64, 64],
-        anchor: [32, 32],
-        path: "m 32,1 2,1 1,2 0,20 4,4 0,-4 3,0 0,4 -1,2 17,12 0,2 -16,-5 -7,0 0,13 -1,5 7,5 0,2 -8,-2 -1,2 -1,-2 -8,2 0,-2 7,-5 -1,-5 0,-13 -7,0 -16,5 0,-2 17,-12 -1,-2 0,-4 3,0 0,4 4,-4 0,-20 1,-2 2,-1z"
-};
-
-var _dash8 = {
-        key: "dash8",
-        scale: 0.45,
-        size: [64, 64],
-        anchor: [32, 30],
-        path: "m 32,1 3,4 0,20 4,0 0,-5 1,-1 1,1 0,5 17,2 0,3 -17,2 0,3 -1,1 -1,-1 0,-3 -4,0 0,15 -1,8 6,0 1,1 0,3 -8,0 -1,1 -1,-1 -8,0 0,-3 1,-1 6,0 -1,-8 0,-15 -4,0 0,3, -1,1 -1,-1 0,-3 -17,-2 0,-3 17,-2 0,-5 1,-1 1,1 0,5 4,0 0,-20 3,-4z"
-};
-
-var _b200 = {
-        key: "b200",
-        scale: 0.375,
-        size: [64, 64],
-        anchor: [32, 19],
-        path: "m 32,1 1,0 1,2 1,4 0,5 5,0 0,-5 -1,-1 2,-2 2,2 -1,1 0,5 17,2 0,3 -17,3 0,1 -2,0 0,-1 -5,0 0,5 -2,8 6,3 0,2 -6,-1 -1,0 -6,1 0,-2 6,-3 -2,-8 0,-5 -5,0 0,1, -2,0 0,-1 -17,-3 0,-3 17,-2 0,-5 -1,-1 2,-2 2,2 -1,1 0,5 5,0 0,-5 1,-4 1,-2 z"
-};
-
-var _g650 = {
-        key: "g650",
-        scale: 0.44,
-        size: [64, 64],
-        anchor: [32, 26],
-        path: "m 32,1 1,0 1,2 1,4 0,10 21,17 0,5 -2,-2 -16,-8 -3,0 0,3 2,0 1,1 0,5 -1,1 0,3 -2,0 0,1 7,5 0,3 -9,-3 -1,0 -9,3 0,-3 7,-5 0,-1 -2,0 0,-3 -1,-1 0,-5 1,-1 2,0 0,-3 -3,0 -16,8 -2,2 0,-5 21,-17 0,-10 1,-4 1,-2z"
-};
-
-var _c130 = {
-        key: "c130",
-        scale: 0.60,
-        size: [64, 64],
-        anchor: [32, 17],
-        path: "m 31,1 1,0 1,1 1,2 0,8 3,0 0,-3 1,-1 1,1 0,3 6,0 0,-3 1,-1 1,1 0,3 10,1 0,2 -1,1 -17,3 -5,0 0,10 -1,1 8,2 0,1 -1,1 -8,0 -1,1 -1,-1 -8,0 -1,-1 0,-1 8,-2 -1,-1 0,-10 -5,0 -17,-3 -1,-1 0,-2 10,-1 0,-3 1,-1 1,1 0,3 6,0 0,-3 1,-1 1,1 0,3 3,0 0,-8 1,-2 1,-1 z"
-};
-
-var _balloon = {
-        key: "balloon",
-        scale: 0.50,
-        size: [64, 64],
-        anchor: [32, 32],
-        path: "m 27,1 10,0 3,1 3,1 1,1 2,1 6,6 1,2 1,1 1,3 1,3 0,10 -1,3 -1,3 -1,1 -1,2 -6,6 -2,1 -1,1 -2,1 -2,1 -2,8 -1,0 2,-8 -3,1 -6,0 -3,-1 2,8 9,0 0,6 -10,0 0,-6 -2,-8 -2,-1 -2,-1 -1,-1 -2,-1 -6,-6 -1,-2 -1,-1 -1,-3 -1,-3 0,-10 1,-3 1,-3 1,-1 1,-2 6,-6 2,-1 1,-1 3,-1 3,-1 z",
-        noRotate: true,
-        markerRadius: 32
-};
-
-var _helicopter = {
-        key : "helicopter",
-        scale : 0.40,
-        size : [64, 64],
-        anchor : [22, 32],
-        path : _rotorcraft_svg
-};
-
-var _single_prop = {
-        key : "single_prop",
-        scale : 0.35,
-        size : [64, 64],
-        anchor : [32, 25],
-        path : _beechcraft_svg
-};
-
-// by Oliver Jowett <oliver@mutability.co.uk>
-// licensed under CC BY 4.0 (https://creativecommons.org/licenses/by/4.0/)
-var _a380 = {
-        key: "a380",
-        scale: 0.75,
-        size: [64, 64],
-        anchor: [32, 30],
-        path: "m 32,59 -1,-4 -4,1 -7,3 -1,0 1,-3 1,-1 7,-6 2,-2 -1,-5 0,-9 -1,-2 -2,0 -6,2 -5,2 -5,2 -9,4 0,1 0,-3 1,-2 9,-7 -1,-1 0,-4 1,-1 1,0 1,1 0,3 1,0 5,-4 0,-5 1,-1 1,0 1,1 0,3 6,-5 1,-2 0,-7 1,-5 1,-2 1,-1 1,1 1,2 1,5 0,7 1,2 6,5 0,-3 1,-1 1,0 1,1 0,5 5,4 1,0 0,-3 1,-1 1,0 1,1 0,4 -1,1 9,7 1,2 0,3 0,-1 -9,-4 -5,-2 -5,-2 -6,-2 -2,0 -1,2 0,9 -1,5 2,2 7,6 1,1 1,3 -1,0 -7,-3 -4,-1 -1,4 z"
-};
-
-var _b738 = {
-        key: "b738",
-        scale: 0.53,
-        size: [64, 64],
-        anchor: [32, 32],
-        path: "m 32,61 -1,-1 -9,2 -2,1 0,-2 9,-6 1,-1 -1,-9 0,-11 -7,0 -1,1 0,-1 -3,1 -1,1 0,-1 -3,1 -9,3 -1,1 0,-2 1,-2 17,-9 1,-1 -1,-2 0,-3 1,-1 2,0 1,1 0,3 3,-2 0,-13 1,-5 1,-3 1,-1 1,1 1,3 1,5 0,13 3,2 0,-3 1,-1 2,0 1,1 0,3 -1,2 1,1 17,9 1,2 0,2 -1,-1 -9,-3 -3,-1 0,1 -1,-1 -3,-1 0,1 -1,-1 -7,0 0,11 -1,9 1,1 9,6 0,2 -2,-1 -9,-2 -1,1 z"
-};
-
-var _b744 = {
-        key: "b744",
-        scale: 0.71,
-        size: [64, 64],
-        anchor: [32, 32],
-        path: "m 32,61.4 -0.6,-3 -8.9,2.4 0,-2.1 7.6,-6.8 -0.5,-4.2 -0.4,-4.3 0,-11.7 -2.1,0.7 -0.3,1.2 -0.2,-1 -1.8,0.6 -0.3,1 -0.2,-0.9 -3.2,1.1 -0.7,0.4 -0.3,1.1 -0.2,-0.8 -2.2,1.3 -0.3,1.2 -0.2,-0.9 -8.9,5 -2.7,2.1 -0.7,1.5 0,-1.3 0.6,-2.3 0,-1.2 8.5,-7.1 -0.5,-3.3 0.2,-1.3 1.9,0 0.2,1.3 -0.4,2 6.2,-5.7 -0.6,-3.2 0.2,-1.3 1.9,0 0.2,1.3 -0.3,2 6.2,-5.8 0,-6.5 0.3,-3.78 0.7,-4.2 0.8,-2.1 1,-1.1 1,1.1 0.8,2.1 0.7,4.2 0.3,3.78 0,6.5 6.2,5.8 -0.3,-2 0.2,-1.3 1.9,0 0.2,1.3 -0.6,3.2 6.2,5.7 -0.4,-2 0.2,-1.3 1.9,0 0.2,1.3 -0.5,3.3 8.5,7.1 0,1.2 0.6,2.3 0,1.3 -0.7,-1.5 -2.7,-2.1 -8.9,-5 -0.2,0.9 -0.3,-1.2 -2.2,-1.3 -0.2,0.8 -0.3,-1.1 -0.7,-0.4 -3.2,-1.1 -0.2,0.9 -0.3,-1 -1.8,-0.6 -0.2,1 -0.3,-1.2 -2.1,-0.7 0,11.7 -0.4,4.3 -0.5,4.2 7.6,6.8 0,2.1 -8.9,-2.4 -0.6,3 z"
-};
+// FA icons
+var shapes = {
+        'airliner': {
+                svg: '<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 25 26" width="25px" height="26px" add_stroke_selected><defs><style>.cls-1{fill:aircraft_color_fill;}.cls-2{fill:aircraft_color_stroke;}</style></defs><title>airliner_live</title><g id="Layer_2" data-name="Layer 2"><g id="Airliner"><path class="cls-1" d="M12.51,25.75c-.26,0-.74-.71-.86-1.41l-3.33.86L8,25.29l.08-1.41.11-.07c1.13-.68,2.68-1.64,3.2-2-.37-1.06-.51-3.92-.43-8.52v0L8,13.31C5.37,14.12,1.2,15.39,1,15.5a.5.5,0,0,1-.21,0,.52.52,0,0,1-.49-.45,1,1,0,0,1,.52-1l1.74-.91c1.36-.71,3.22-1.69,4.66-2.43a4,4,0,0,1,0-.52c0-.69,0-1,0-1.14l.25-.13H7.16A1.07,1.07,0,0,1,8.24,7.73,1.12,1.12,0,0,1,9.06,8a1.46,1.46,0,0,1,.26.87L9.08,9h.25c0,.14,0,.31,0,.58l1.52-.84c0-1.48,0-7.06,1.1-8.25a.74.74,0,0,1,1.13,0c1.15,1.19,1.13,6.78,1.1,8.25l1.52.84c0-.32,0-.48,0-.58l.25-.13H15.7A1.46,1.46,0,0,1,16,8a1.11,1.11,0,0,1,.82-.28,1.06,1.06,0,0,1,1.08,1.16V9c0,.19,0,.48,0,1.17a4,4,0,0,1,0,.52c1.75.9,4.4,2.29,5.67,3l.73.38a.9.9,0,0,1,.5,1,.55.55,0,0,1-.5.47h0l-.11,0c-.28-.11-4.81-1.49-7.16-2.2H14.06v0c.09,4.6-.06,7.46-.43,8.52.52.33,2.07,1.29,3.2,2l.11.07L17,25.29l-.33-.09-3.33-.86c-.12.7-.6,1.41-.86,1.41h0Z"/><path class="cls-2" d="M12.51.5C13.93.5,14,7,13.93,8.91c.3.16,1.64.91,2,1.1,0-.6,0-.85,0-1s0-.09,0-.13a1.18,1.18,0,0,1,.19-.7A.88.88,0,0,1,16.78,8h0a.82.82,0,0,1,.83.91s0,.07,0,.13,0,.44,0,1.17a3.21,3.21,0,0,1-.06.66c2.33,1.19,6.51,3.39,6.56,3.42.59.3.4,1,.11,1h-.07c-.37-.14-7.18-2.21-7.18-2.21l-3.18,0c0,.22.22,7.56-.48,8.91,0,0,2,1.26,3.39,2.08l.06.93L13.15,24a2.14,2.14,0,0,1-.64,1.47A2.14,2.14,0,0,1,11.87,24L8.26,25,8.31,24c1.38-.82,3.39-2.08,3.39-2.08-.7-1.35-.48-8.69-.48-8.91L8,13.06S1.17,15.13.86,15.27l-.11,0c-.32,0-.43-.73.14-1S5.13,12,7.46,10.85a3.21,3.21,0,0,1-.06-.66c0-.73,0-1,0-1.17s0-.09,0-.13A.82.82,0,0,1,8.24,8h0a.88.88,0,0,1,.65.21,1.18,1.18,0,0,1,.19.7s0,.07,0,.13,0,.39,0,1c.36-.19,1.71-.94,2-1.1C11.05,7,11.09.5,12.51.5m0-.5a1,1,0,0,0-.74.34c-1.16,1.2-1.2,6.3-1.18,8.28L10,8.93l-.46.25V8.91a1.68,1.68,0,0,0-.33-1.06,1.34,1.34,0,0,0-1-.36,1.31,1.31,0,0,0-1.33,1.4V9h0v0c0,.16,0,.46,0,1.14,0,.13,0,.26,0,.38l-4.5,2.35-1.74.91A1.2,1.2,0,0,0,0,15.15a.77.77,0,0,0,.73.64.74.74,0,0,0,.31-.07c.29-.12,4.35-1.35,7-2.17l2.6,0c-.1,5.54.17,7.46.38,8.2-.64.4-2,1.25-3,1.86l-.22.13,0,.26-.06.93,0,.81.7-.31,3.06-.79c.19.67.63,1.35,1,1.35s.86-.68,1-1.35l3.06.79.7.31,0-.81L17.2,24l0-.26L17,23.6c-1-.61-2.4-1.47-3-1.86.21-.74.48-2.66.38-8.2l2.6,0c2.72.83,6.81,2.07,7.07,2.18a.68.68,0,0,0,.25,0,.79.79,0,0,0,.74-.67,1.15,1.15,0,0,0-.63-1.29l-.71-.37c-1.23-.65-3.78-2-5.53-2.88,0-.12,0-.25,0-.38,0-.67,0-1,0-1.14h0V8.92a1.32,1.32,0,0,0-1.32-1.44,1.35,1.35,0,0,0-1,.36,1.67,1.67,0,0,0-.33,1V9h0v.22L15,8.93l-.57-.32c0-2,0-7.08-1.18-8.28A1,1,0,0,0,12.51,0Z"/></g></g></svg>',
+                size: [25,26]
+        },
+        'balloon': {
+                svg: '<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 9 13" width="9px" height="13px" add_stroke_selected><defs><style>.cls-1{fill:aircraft_color_fill;}.cls-2{fill:aircraft_color_stroke;}</style></defs><title>balloon_live</title><g id="Layer_2" data-name="Layer 2"><g id="Balloon"><path class="cls-1" d="M3.56,12.75a.49.49,0,0,1-.46-.34L2.63,11a.51.51,0,0,1,.07-.44l.1-.1-2-3.68a.48.48,0,0,1-.05-.17,4.39,4.39,0,0,1-.48-2A4.29,4.29,0,0,1,4.5.25,4.29,4.29,0,0,1,8.75,4.58a4.39,4.39,0,0,1-.48,2,.45.45,0,0,1-.05.17l-2,3.68a.44.44,0,0,1,.1.1.51.51,0,0,1,.07.45L5.9,12.41a.49.49,0,0,1-.46.34Zm1.6-2.43L6.1,8.59A4.22,4.22,0,0,1,5,8.88v1.44ZM4,10.32V8.88A4.22,4.22,0,0,1,2.9,8.59l.94,1.73Z"/><path class="cls-2" d="M4.5.51a4,4,0,0,1,4,4.07A4.1,4.1,0,0,1,8,6.5a.24.24,0,0,1,0,.11l-2.16,4h.07a.23.23,0,0,1,.19.1.24.24,0,0,1,0,.22l-.47,1.44a.24.24,0,0,1-.22.16H3.56a.24.24,0,0,1-.22-.16l-.47-1.44a.24.24,0,0,1,0-.22.23.23,0,0,1,.19-.1h.07L1,6.62A.24.24,0,0,1,1,6.5,4.1,4.1,0,0,1,.5,4.58,4,4,0,0,1,4.5.51m.24,10.06H5.3L6.73,8a3.93,3.93,0,0,1-2,.68v1.93m-1,0h.57V8.64a3.93,3.93,0,0,1-2-.68L3.7,10.57M4.5,0A4.55,4.55,0,0,0,0,4.58,4.65,4.65,0,0,0,.49,6.66a.72.72,0,0,0,.07.21l1.92,3.52a.76.76,0,0,0-.09.66l.47,1.44a.74.74,0,0,0,.7.51H5.44a.74.74,0,0,0,.7-.51l.47-1.44a.76.76,0,0,0-.09-.66L8.44,6.86a.72.72,0,0,0,.07-.21A4.65,4.65,0,0,0,9,4.58,4.55,4.55,0,0,0,4.5,0Zm.74,9.1L5.57,9l-.34.62V9.1Zm-1.47.55L3.43,9l.34.07v.55Z"/></g></g></svg>',
+                size: [9,13],
+                noRotate: true
+        },
+        'cessna': {
+                svg: '<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 17 13" width="17px" height="13px" add_stroke_selected><defs><style>.cls-1{fill:aircraft_color_fill;}.cls-2{fill:aircraft_color_stroke;}</style></defs><title>cessna_live</title><g id="Layer_2" data-name="Layer 2"><g id="Cessna"><path class="cls-1" d="M8.51,12.75c-.17,0-2-.27-2.56-.35A.41.41,0,0,1,5.6,12V10.87a.41.41,0,0,1,.32-.4l1.81-.37L7.36,6.64H4.75L.6,6a.41.41,0,0,1-.35-.41V4a.41.41,0,0,1,.38-.41l4.09-.28h2.6v-.4l.25,0-.24-.08c0-.21.1-.76.12-1.06A.9.9,0,0,1,8,.94L8.12.54A.41.41,0,0,1,8.5.25a.4.4,0,0,1,.39.29L9,.95a.91.91,0,0,1,.53.75c0,.33.11,1,.13,1.11v.46h2.57l4.12.28a.41.41,0,0,1,.38.41V5.63A.41.41,0,0,1,16.4,6l-4.1.59H9.64L9.26,10.1l1.81.36a.41.41,0,0,1,.32.4V12a.41.41,0,0,1-.34.41c-.56.08-2.37.35-2.55.35Z"/><path class="cls-2" d="M8.5.5a.15.15,0,0,1,.15.11l.16.52a.68.68,0,0,1,.49.58c0,.34.11,1,.13,1.12a.16.16,0,0,1,0,0v.65h2.83l4.09.28A.16.16,0,0,1,16.5,4V5.63a.16.16,0,0,1-.13.16l-4.1.59H9.41L9,10.3l2,.41a.16.16,0,0,1,.12.16V12a.16.16,0,0,1-.13.16s-2.33.35-2.51.35h0c-.17,0-2.53-.35-2.53-.35A.16.16,0,0,1,5.85,12V10.87A.16.16,0,0,1,6,10.71l2-.41L7.59,6.39H4.73L.63,5.79A.16.16,0,0,1,.5,5.63V4A.16.16,0,0,1,.64,3.8l4.09-.28H7.57V2.87a.21.21,0,0,1,0,0c0-.15.1-.79.13-1.12a.68.68,0,0,1,.49-.58L8.36.61A.16.16,0,0,1,8.5.5m0-.5a.66.66,0,0,0-.62.46l-.1.32a1.13,1.13,0,0,0-.58.9c0,.31-.1.87-.12,1.06a.92.92,0,0,0,0,.14V3H4.75L.61,3.3A.66.66,0,0,0,0,4V5.63a.66.66,0,0,0,.56.65l4.1.59H7.14l.33,3-1.59.32a.66.66,0,0,0-.53.65V12a.66.66,0,0,0,.54.65C7,12.81,8.34,13,8.51,13s1.5-.19,2.58-.35a.66.66,0,0,0,.56-.65V10.87a.66.66,0,0,0-.52-.65L9.54,9.9l.33-3h2.48l4.1-.59A.66.66,0,0,0,17,5.63V4a.66.66,0,0,0-.61-.66L12.3,3H9.93V2.74c0-.11-.09-.74-.12-1.06a1.14,1.14,0,0,0-.57-.9L9.13.46A.65.65,0,0,0,8.5,0Z"/></g></g></svg>',
+                size: [17,13]
+        },
+        'heavy_2e': {
+                svg: '<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 28 29" width="28px" height="29px" add_stroke_selected><defs><style>.cls-1{fill:aircraft_color_fill;}.cls-2{fill:aircraft_color_stroke;}</style></defs><title>heavy_2e_live</title><g id="Layer_2" data-name="Layer 2"><g id="Heavy_2_Eng" data-name="Heavy 2 Eng"><path class="cls-1" d="M9,28.35c0-.16-.17-1,.23-1.36.65-.59,2.82-2.38,3.4-2.86-.51-1.33-.59-5.15-.57-8.22L10,16,.25,19v-.34a1.78,1.78,0,0,1,.82-1.5l7.78-5.07a4.87,4.87,0,0,1-.51-3l0-.22.23,0h2.26l0,.22a8.32,8.32,0,0,1,0,1.81l1.21-.81c0-6.79.18-9.58,1.91-9.87,1.7.14,2,3,2,9.85L17.3,11a8.3,8.3,0,0,1,0-1.8l0-.22h2.51v.24a4.87,4.87,0,0,1-.51,3l7.66,5a1.77,1.77,0,0,1,.8,1.5V19L18,16l-2-.06c0,3.06-.06,6.88-.57,8.21a28.87,28.87,0,0,1,3.5,3A2,2,0,0,1,19,28.34l-.05.31L14.6,26.71c-.14,1.85-.41,1.85-.6,1.85s-.47,0-.6-1.84L9,28.66Z"/><path class="cls-2" d="M14,.5c1.43.13,1.69,3,1.69,9.73l2.06,1.39a5.43,5.43,0,0,1-.24-2.39h2s.26,2.07-.62,3c0,0,7.84,5.12,7.9,5.15a1.54,1.54,0,0,1,.68,1.28l-9.46-3-2.35-.08c0,.23.13,7.12-.62,8.54a34.46,34.46,0,0,1,3.59,3.08,1.86,1.86,0,0,1,.1,1l-4.39-2c-.07,1.16-.21,2-.38,2s-.31-.81-.38-2l-4.4,2s-.17-.84.16-1.13c.74-.67,3.54-3,3.54-3-.75-1.43-.62-8.31-.62-8.54L10,15.73l-9.46,3a1.54,1.54,0,0,1,.68-1.28c.06,0,8-5.24,8-5.24-.88-1-.62-3-.62-3h2a5.43,5.43,0,0,1-.24,2.39l1.91-1.28c0-6.74.17-9.5,1.7-9.76M14,0h-.06C12,.33,11.81,3,11.8,10l-.66.44a9.35,9.35,0,0,0,0-1.33l0-.45h-3v.49A5.4,5.4,0,0,0,8.52,12L.93,17A2.06,2.06,0,0,0,0,18.69v.68l.64-.2L10,16.23l1.77-.06c0,4.05.15,6.7.53,7.88-.73.6-2.67,2.21-3.28,2.76a1.82,1.82,0,0,0-.31,1.59l.12.6.56-.24,3.76-1.67c.14,1.43.39,1.72.82,1.72s.68-.29.82-1.73l3.75,1.67.58.25.11-.62A2.23,2.23,0,0,0,19.09,27a25.35,25.35,0,0,0-3.42-3c.37-1.19.55-3.83.52-7.87l1.77.06,9.39,2.94.64.2v-.68A2,2,0,0,0,27,17l-7.42-4.84A5.45,5.45,0,0,0,20,9.21l0-.45-.45,0H17.06l0,.45a9.35,9.35,0,0,0,0,1.33L16.18,10c0-7.21-.34-9.81-2.14-10Z"/></g></g></svg>',
+                size: [28,29]
+        },
+        'heavy_4e': {
+                svg: '<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 28 30" width="28px" height="30px" add_stroke_selected><defs><style>.cls-1{fill:aircraft_color_fill;}.cls-2{fill:aircraft_color_stroke;}</style></defs><title>heavy_4e_live</title><g id="Layer_2" data-name="Layer 2"><g id="Heavy_4_Eng" data-name="Heavy 4 Eng"><path class="cls-1" d="M14,29.62c-.23,0-.52-.16-.71-1.33L8.82,29.58V28l3.56-3.52c-.41-1.51-.4-7.57-.4-9.11L8.46,16.59,1.27,20.76l-1,1.68,0-.91c0-2.28.23-2.45.3-2.52s.59-.51,3.5-3.09A10.47,10.47,0,0,1,4,13l0-.22.23,0H6.16v.23a11.63,11.63,0,0,1,0,1.26c.74-.68,1.36-1.28,1.69-1.61a9.54,9.54,0,0,1-.16-3.15l0-.22.23-.05H9.87v.23a11.49,11.49,0,0,1,0,1.31l.87-.84c.67-.66,1.06-1,1.27-1.19,0-6.24.53-8.46,2-8.46,1.23,0,2,1.42,2,8.46.21.17.59.53,1.27,1.19l.88.85a11.45,11.45,0,0,1,0-1.32V9.19h2.18v.24a9.53,9.53,0,0,1-.15,3.18c.33.32.95.93,1.69,1.61a11.5,11.5,0,0,1,0-1.27v-.23H24V13a10.49,10.49,0,0,1-.1,3L27.4,19c.09.09.28.26.32,2.54l0,.91-1-1.68L19.5,16.57,16,15.34c0,1.53.07,7.49-.39,9.11L19.18,28v1.61l-4.46-1.29C14.52,29.46,14.23,29.62,14,29.62Z"/><path class="cls-2" d="M14,.49c1.08,0,1.75,1.61,1.75,8.34.27.14,2.06,2,2.73,2.54a9,9,0,0,1-.11-1.94h1.7a9.4,9.4,0,0,1-.19,3.25c.37.37,1.26,1.24,2.3,2.17a9.25,9.25,0,0,1-.1-1.89h1.7A10.3,10.3,0,0,1,23.66,16c1.81,1.61,3.57,3.16,3.6,3.18a11.25,11.25,0,0,1,.22,2.35l-.57-1-7.28-4.22L15.76,15s.15,8-.41,9.52l3.59,3.55v1.18L14.51,28c-.11.85-.3,1.4-.51,1.4s-.4-.55-.51-1.39L9.06,29.26V28.07l3.59-3.55c-.51-1.28-.43-9.52-.43-9.52L8.37,16.36,1.1,20.58l-.57,1a11.25,11.25,0,0,1,.22-2.35S2.53,17.61,4.35,16a10.32,10.32,0,0,1-.12-3h1.7a9.29,9.29,0,0,1-.1,1.88c1-.93,1.93-1.8,2.3-2.17a9.43,9.43,0,0,1-.19-3.24h1.7a9,9,0,0,1-.11,1.93C10.21,10.8,12,9,12.25,8.83c0-6.73.62-8.34,1.75-8.34M14,0c-1.65,0-2.23,2.17-2.24,8.59-.22.19-.57.52-1.19,1.13l-.43.42c0-.4,0-.7,0-.73l0-.46H7.45v.49a10.3,10.3,0,0,0,.12,3.11c-.27.26-.67.65-1.15,1.1,0-.38,0-.67,0-.7l0-.46H3.74v.49a11.18,11.18,0,0,0,.07,2.88L.49,18.76h0l-.06.06c-.14.13-.33.31-.38,2.69l0,1.83.94-1.56.51-.84L8.58,16.8l3.16-1.12a65.92,65.92,0,0,0,.37,8.69L8.72,27.72l-.15.14V30l.65-.28,3.87-1.11c.18.88.46,1.26.9,1.26s.73-.39.91-1.27l3.86,1.12.65.28V27.87l-.15-.14-3.38-3.35a58.1,58.1,0,0,0,.36-8.69l3.16,1.11,7.13,4.14.51.84L28,23.35l0-1.83c0-2.38-.24-2.56-.38-2.69l-.06-.06h0L24.2,15.84A11.19,11.19,0,0,0,24.27,13v-.49H21.61l0,.46s0,.32,0,.7c-.48-.45-.88-.84-1.15-1.1a10.29,10.29,0,0,0,.13-3.1V8.94H17.9l0,.46s0,.33,0,.74l-.44-.43c-.62-.61-1-.94-1.19-1.13C16.23,2.25,15.63,0,14,0Z"/></g></g></svg>',
+                size: [28,30]
+        },
+        'helicopter': {
+                svg: '<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 16 18" width="16px" height="18px" add_stroke_selected><defs><style>.cls-1{fill:aircraft_color_fill;}.cls-2{fill:aircraft_color_stroke;}</style></defs><title>helicopter_live</title><g id="Layer_2" data-name="Layer 2"><g id="Roto"><path class="cls-1" d="M8,17.75c-1.38,0-2.46-.63-2.46-1.43,0-.6.58-1.1,1.49-1.32V12.06A5.27,5.27,0,0,1,6,9.53L1.1,13.6l-.75-1L5.78,8.09c0-.25,0-.51,0-.77a12.28,12.28,0,0,1,.09-1.49L.38,1.24l.7-.89,5,4.2C6.48,3,7.17,2.1,8,2.1s1.52,1,1.91,2.57l5-4.21.75,1L10.1,6.07a12.4,12.4,0,0,1,.06,1.24c0,.22,0,.44,0,.65l5.47,4.59-.7.89L10,9.31a8.44,8.44,0,0,1-.35,1.4,3.83,3.83,0,0,1-.55,1.11L9,12v3c.91.22,1.49.72,1.49,1.32C10.46,17.12,9.38,17.75,8,17.75Z"/><path class="cls-2" d="M1.12.71,6.23,5c.33-1.57,1-2.65,1.73-2.65S9.4,3.48,9.72,5.12L14.87.82l.45.57L9.84,6a12.18,12.18,0,0,1,.08,1.35c0,.26,0,.51,0,.76l5.38,4.51-.39.5L9.82,8.84a8.75,8.75,0,0,1-.41,1.78,3.58,3.58,0,0,1-.52,1l-.18.22V15.2c.87.16,1.49.6,1.49,1.11S9.22,17.5,8,17.5,5.78,17,5.78,16.32s.62-1,1.49-1.11V12A5.26,5.26,0,0,1,6.13,9.07l-5,4.18-.45-.57L6,8.2c0-.29,0-.58,0-.89a12,12,0,0,1,.1-1.59L.73,1.21l.39-.5M1,0,.74.39.35.89,0,1.28l.38.32L5.59,5.94a12.64,12.64,0,0,0-.07,1.38c0,.21,0,.43,0,.66L.38,12.28,0,12.6.31,13l.45.57.31.39.38-.32L5.81,10a5.18,5.18,0,0,0,1,2.18V14.8c-.92.27-1.49.84-1.49,1.51C5.3,17.28,6.46,18,8,18s2.7-.72,2.7-1.68c0-.67-.57-1.24-1.49-1.51V12.07L9.29,12a4.06,4.06,0,0,0,.58-1.18,8,8,0,0,0,.28-1l4.42,3.71.38.32.31-.39.39-.5.31-.39-.38-.32L10.39,7.85c0-.17,0-.35,0-.53,0-.37,0-.75-.05-1.13l5.26-4.4L16,1.47l-.31-.39L15.25.5,14.94.11l-.38.32L10,4.23C9.57,2.73,8.83,1.85,8,1.85s-1.57.83-2,2.27L1.42.32,1,0Z"/></g></g></svg>',
+                size: [16,18]
+        },
+        'hi_perf': {
+                svg: '<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 15 21" width="15px" height="21px" add_stroke_selected><defs><style>.cls-1{fill:aircraft_color_fill;}.cls-2{fill:aircraft_color_stroke;}</style></defs><title>hi_perf_live</title><g id="Layer_2" data-name="Layer 2"><g id="Hi_Perf" data-name="Hi Perf"><path class="cls-1" d="M3.14,20.76v-1.6l2.57-1.7V16.1H.26V12.25H1.61v1.17L5.28,9.9c.14-1.16,1-8.19,2-9.3L7.5.38l.2.22c1,1.12,1.89,8.14,2,9.3l3.67,3.52V12.25h1.35V16.1H9.29v1.35l2.57,1.7v1.6Z"/><path class="cls-2" d="M7.5.76c1,1.12,2,9.26,2,9.26l4.17,4V12.5h.84v3.36H9v1.72l2.57,1.7v1.23H3.4V19.28L6,17.58V15.86H.51V12.5h.84V14l4.17-4s1-8.13,2-9.26M7.5,0,7.11.44C6.11,1.58,5.24,8.09,5,9.79l-3.17,3V12H0v4.34H5.45v1L3.11,18.88,2.89,19v2h9.23V19l-.22-.15L9.55,17.32v-1H15V12H13.14v.82L10,9.79C9.76,8.09,8.89,1.58,7.89.44L7.5,0Z"/></g></g></svg>',
+                size: [15,21]
+        },
+        'jet_nonswept': {
+                svg: '<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 18 18" width="18px" height="18px" add_stroke_selected><defs><style>.cls-1{fill:aircraft_color_fill;}.cls-2{fill:aircraft_color_stroke;}</style></defs><title>jet_nonswept_live</title><g id="Layer_2" data-name="Layer 2"><g id="Bizjet_Non-Swept" data-name="Bizjet Non-Swept"><path class="cls-1" d="M9,17.09l-3.51.61v-.3c0-.65.11-1,.33-1.09L8.5,15a5.61,5.61,0,0,1-.28-1.32l-.53-.41-.1-.69H7.12l0-.21a7.19,7.19,0,0,1-.15-2.19L.24,9.05V8.84c0-1.1.51-1.15.61-1.15L7.8,7.18V2.88C7.8.64,8.89.3,8.93.28L9,.26l.07,0s1.13.36,1.13,2.6v4.3l7,.51c.09,0,.59.06.59,1.15v.21l-6.69,1.16a7.17,7.17,0,0,1-.15,2.19l0,.21h-.47l-.1.69-.53.41A5.61,5.61,0,0,1,9.5,15l2.74,1.28c.2.07.31.43.31,1.08v.3Z"/><path class="cls-2" d="M9,.53s1,.28,1,2.35V7.41l7.19.53h0s.36,0,.36.9L10.78,10a5,5,0,0,1-.1,2.35H10.2l-.12.8-.54.42a4.88,4.88,0,0,1-.35,1.59l2.95,1.38s.16.06.17.85L9,16.84l-3.31.56c0-.79.17-.85.17-.85l2.95-1.38a4.88,4.88,0,0,1-.35-1.59l-.54-.42-.12-.8H7.32A5,5,0,0,1,7.22,10L.49,8.84c0-.88.33-.9.36-.9h0L8,7.41V2.88C8,.81,9,.53,9,.53M9,0,8.87,0c-.13,0-1.31.45-1.31,2.84V6.94L.82,7.43h0c-.24,0-.82.19-.82,1.4v.43l.41.07,6.26,1.08a8.45,8.45,0,0,0,.18,2l.08.41h.47l.05.37,0,.21.16.12.36.28a5.87,5.87,0,0,0,.22,1.05L5.66,16.09c-.39.15-.45.78-.46,1.31V18l.57-.1L9,17.35l3.23.55.57.1v-.6c0-.53-.06-1.16-.49-1.32L9.79,14.9A5.87,5.87,0,0,0,10,13.85l.36-.28.16-.12,0-.21.05-.37h.47l.08-.41a8.45,8.45,0,0,0,.18-2l6.26-1.08L18,9.27V8.84c0-1.34-.71-1.41-.85-1.41l-6.71-.49V2.88C10.44.49,9.27.08,9.13,0L9,0Z"/></g></g></svg>',
+                size: [18,18]
+        },
+        'jet_swept': {
+                svg: '<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 18 24" width="18px" height="24" add_stroke_selected><defs><style>.cls-1{fill:aircraft_color_fill;}.cls-2{fill:aircraft_color_stroke;}</style></defs><title>jet_swept_live</title><g id="Layer_2" data-name="Layer 2"><g id="Bizjet_Swept" data-name="Bizjet Swept"><path class="cls-1" d="M9.44,23c-.1.6-.35.6-.44.6s-.34,0-.44-.6l-3,.67V22.6A.54.54,0,0,1,6,22.05l2.38-1.12L8,19.33H6.69l0-.2a8.23,8.23,0,0,1-.14-3.85l.06-.18H7.73V13.19h-2L.26,14.29v-.93c0-.28.07-.46.22-.53l7.25-3.6V3.85A4.47,4.47,0,0,1,8.83.49L9,.34l.17.15a4.47,4.47,0,0,1,1.1,3.36V9.23l7.25,3.6c.14.07.22.25.22.53v.93l-5.51-1.1h-2V15.1h1.17l.06.18a8.24,8.24,0,0,1-.15,3.84l0,.2H10l-.36,1.6,2.43,1.14a.52.52,0,0,1,.35.53v1.08Z"/><path class="cls-2" d="M9,.68a4.25,4.25,0,0,1,1,3.16V9.39l7.4,3.67s.07,0,.07.3V14l-5.2-1H10v2.42h1.24a8,8,0,0,1-.15,3.72H9.79l-.45,2L12,22.3a.28.28,0,0,1,.2.3v.76l-3-.66s0,.66-.21.66-.21-.66-.21-.66l-3,.66V22.6a.28.28,0,0,1,.2-.3l2.62-1.23-.45-2H6.9a8,8,0,0,1-.15-3.72H8V12.93H5.71L.52,14v-.62c0-.26.07-.3.07-.3L8,9.39V3.85A4.25,4.25,0,0,1,9,.68M9,0,8.66.3A4.73,4.73,0,0,0,7.47,3.85V9.07L.36,12.6c-.16.08-.36.28-.36.76V14.6l.62-.12,5.15-1h1.7v1.4H6.36l-.11.36a8.49,8.49,0,0,0,.14,4l.09.4H7.79l.27,1.2-2.21,1a.79.79,0,0,0-.53.78V24l.63-.14,2.42-.54c.12.37.33.55.63.55s.51-.19.63-.55l2.42.54.63.14V22.6a.79.79,0,0,0-.53-.78l-2.21-1,.27-1.2h1.31l.09-.4a8.49,8.49,0,0,0,.14-4l-.11-.36H10.53v-1.4h1.7l5.15,1,.62.12V13.36c0-.48-.2-.68-.36-.76L10.53,9.07V3.85A4.73,4.73,0,0,0,9.34.3L9,0Z"/></g></g></svg>',
+                size: [18,24]
+        },
+        'twin_large': {
+                svg: '<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 21 20" width="21px" height="20px" add_stroke_selected><defs><style>.cls-1{fill:aircraft_color_fill;}.cls-2{fill:aircraft_color_stroke;}</style></defs><title>twin_large_live</title><g id="Layer_2" data-name="Layer 2"><g id="Twinprop_Large" data-name="Twinprop Large"><path class="cls-1" d="M10.1,18.34H7l0-.21c-.08-.54,0-.87.11-1L7.19,17l.2,0,2.35-.33c-.16-.82-.42-2.9-.42-3.14s0-2.71,0-3.51H8c-.12,1.34-.41,1.36-.55,1.37h0c-.19,0-.46,0-.6-1.55L.27,9.52l0-.25c.06-.73.31-.9.45-.93l6-.48a3.65,3.65,0,0,1,.3-2,.45.45,0,0,1,.32-.16h0a.39.39,0,0,1,.3.12A3.67,3.67,0,0,1,8,7.77l1.26-.07c0-.71,0-2.92,0-4.48A3.84,3.84,0,0,1,10.1.4a.4.4,0,0,1,.28-.16h.23A.4.4,0,0,1,10.9.4a3.84,3.84,0,0,1,.87,2.81c0,1.55,0,3.77,0,4.48L13,7.77a3.67,3.67,0,0,1,.29-1.94.38.38,0,0,1,.28-.12.46.46,0,0,1,.34.16,3.66,3.66,0,0,1,.3,2l6,.48c.18,0,.43.21.49.94l0,.25-6.53.3c-.14,1.55-.42,1.55-.59,1.55s-.45,0-.57-1.37H11.74c0,.8,0,3.27,0,3.51s-.26,2.32-.42,3.14l2.38.34h.11l.13.13c.15.18.19.51.11,1l0,.21H10.9l-.4,1Z"/><path class="cls-2" d="M10.61.49a3.28,3.28,0,0,1,.91,2.72c0,1.89,0,4.71,0,4.71l1.76.1s-.1-2.08.32-2.08h0c.52,0,.37,2.13.37,2.13l6.22.49s.21.05.26.71l-6.5.3s-.11,1.54-.36,1.54h0c-.25,0-.34-1.37-.34-1.37l-1.78,0s-.05,3.48-.05,3.76A33,33,0,0,1,11,16.84l2.65.37h0s.26,0,.14.89h-3l-.23.58-.23-.58h-3c-.12-.85.1-.89.14-.89h0L10,16.84a33,33,0,0,1-.47-3.35c0-.28-.05-3.76-.05-3.76l-1.78,0s-.09,1.35-.34,1.37h0C7.14,11.13,7,9.58,7,9.58l-6.5-.3c.05-.66.26-.71.26-.71L7,8.08S6.87,6,7.38,5.95h0c.42,0,.32,2.08.32,2.08l1.76-.1s.06-2.82,0-4.71A3.28,3.28,0,0,1,10.39.49h.23m0-.49h-.23a.65.65,0,0,0-.46.23,4.09,4.09,0,0,0-.94,3C9,4.63,9,6.59,9,7.46l-.76,0a2.91,2.91,0,0,0-.37-1.85.64.64,0,0,0-.46-.2.72.72,0,0,0-.52.24A3.24,3.24,0,0,0,6.5,7.63L.76,8.09H.68C.47,8.15.11,8.36,0,9.25l0,.5.51,0,6.06.28c.14,1.29.41,1.56.81,1.56s.67-.28.8-1.37H9c0,1,0,3,0,3.26s.21,2,.38,2.93l-2.09.3a.61.61,0,0,0-.42.21,1.52,1.52,0,0,0-.17,1.24l.06.42H9.93l.11.26L10.5,20,11,18.86l.11-.26h3.12l.06-.42a1.52,1.52,0,0,0-.17-1.24.61.61,0,0,0-.42-.21l-2.09-.3c.17-1,.38-2.72.38-2.93s0-2.29,0-3.26h.84c.13,1.09.4,1.35.76,1.37h0c.44,0,.71-.27.85-1.56l6.06-.28.51,0,0-.5c-.07-.88-.43-1.1-.64-1.15h-.08L14.5,7.63a3.24,3.24,0,0,0-.37-1.93.7.7,0,0,0-.49-.24h0a.65.65,0,0,0-.48.2,2.91,2.91,0,0,0-.37,1.85l-.76,0c0-.87,0-2.83,0-4.24a4.09,4.09,0,0,0-.94-3A.65.65,0,0,0,10.61,0Z"/></g></g></svg>',
+                size: [21,20]
+        },
+        'twin_small': {
+                svg: '<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 19 16" width="19px" height="16px" add_stroke_selected><defs><style>.cls-1{fill:aircraft_color_fill;}.cls-2{fill:aircraft_color_stroke;}</style></defs><title>twin_small_live</title><g id="Layer_2" data-name="Layer 2"><g id="Twinprop_Small" data-name="Twinprop Small"><path class="cls-1" d="M9.5,15.75c-.21,0-.34-.17-.41-.51l-2.88.23v-.27c0-.78,0-1.11.28-1.13L9,13.1c-.31-1.86-.55-5-.59-5.55l-.08-.09H6.08L.25,6.54v-1A.43.43,0,0,1,.67,5l3.75-.27L5,4.45V3.53H4.73V2.7a.35.35,0,0,1,.34-.35h.07c.12-.52.26-.83.54-.83s.42.31.53.83h.07a.35.35,0,0,1,.34.35v.83H6.36v1l2-.08C8.42.81,9.09.25,9.49.25s1.09.55,1.12,4.21l2,.08v-1h-.25V2.7a.35.35,0,0,1,.34-.35h.07c.12-.52.26-.83.53-.83s.42.31.54.83h.07a.35.35,0,0,1,.34.35v.83H14v.92l.57.32L18.32,5a.42.42,0,0,1,.43.46v1L13,7.46H10.71l-.08.09c0,.56-.27,3.68-.59,5.55l2.46,1c.28,0,.28.35.28,1.13v.27l-2.88-.23C9.84,15.58,9.71,15.75,9.5,15.75Z"/><path class="cls-2" d="M9.51.5c.08,0,.86.11.86,4.2l2.51.1V3.28h-.26V2.7a.1.1,0,0,1,.09-.1H13c.08-.4.2-.83.33-.83s.26.43.34.83h.27a.1.1,0,0,1,.09.1v.57h-.25V4.6h0l.75.42,3.79.28h0c.06,0,.17,0,.17.22v.82l-5.58.89H10.6l-.21.24s-.26,3.8-.63,5.81l2.71,1.05h0s.06.08.06.88L9.7,15s0,.53-.2.53S9.3,15,9.3,15l-2.84.22c0-.8,0-.88.06-.88h0l2.71-1.05c-.36-2-.63-5.81-.63-5.81L8.4,7.21H6.08L.49,6.33V5.51c0-.19.11-.22.17-.22h0L4.49,5l.75-.42V3.28H5V2.7a.1.1,0,0,1,.09-.1h.27c.08-.4.2-.83.34-.83s.25.43.33.83h.27a.1.1,0,0,1,.09.1v.57H6.12V4.8l2.51-.1c0-4.09.78-4.2.86-4.2h0m0-.5h0c-.22,0-.61.14-.9.89a10.72,10.72,0,0,0-.43,3.33l-1.53.06v-.5h.25V2.7a.6.6,0,0,0-.46-.59c-.11-.42-.3-.85-.73-.85s-.63.43-.73.85a.6.6,0,0,0-.46.59V3.78h.25V4.3l-.4.22L.71,4.79h0A.67.67,0,0,0,0,5.51V6.76l.42.07L6,7.71H8.14c.06.8.27,3.44.55,5.22l-2.23.87H6.31L6.17,14c-.16.16-.2.32-.2,1.24v.54l.53,0,2.41-.19a.6.6,0,0,0,1.19,0l2.41.19.53,0v-.54c0-.76,0-1.33-.47-1.38l-2.24-.87c.28-1.78.49-4.42.55-5.22H13l5.58-.89L19,6.76V5.51a.67.67,0,0,0-.67-.72h-.05l-3.63-.27-.4-.22V3.78h.25V2.7a.6.6,0,0,0-.46-.59c-.11-.42-.3-.85-.73-.85s-.62.43-.73.85a.6.6,0,0,0-.46.59V3.78h.25v.5l-1.53-.06C10.81,1.45,10.37,0,9.53,0h0Z"/></g></g></svg>',
+                size: [19,16]
+        },
+        'ground_emergency': {
+                svg: '<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 6 15" add_stroke_selected><defs><style>.cls-1{fill:#5a5a5a;}.cls-2{fill:#fff;}</style></defs><title>emergency_dark</title><g id="Layer_2" data-name="Layer 2"><g id="Emergency"><path class="cls-1" d="M1.77,0a3.32,3.32,0,0,0-.63.07L1,.11.86.16h0L.7.23.59.3l0,0L.49.38l0,.06a.15.15,0,0,0,0,0h0v0h0V.9l0,0,0,0h0l0,.07V4c0,.13.06.16.1.23v.3H.09c0,1.32,0,3.38,0,4.8l0,.44C.07,9.82,0,9.88,0,10v2.82c0,.09-.05.14.07.18v1.9a50.76,50.76,0,0,0,5.78,0V13.06C6,13,6,12.93,6,12.84V10c0-.15-.05-.2-.11-.22V9.37c0-1.41,0-3.51,0-4.8H5.55v-.3c0-.08.11-.1.09-.23v-3L5.6,1h0l0,0,0,0V.51h0v0h0a.15.15,0,0,0,0,0,.16.16,0,0,0,0-.06L5.41.32l0,0L5.26.23,5.12.17h0L5,.11l-.16,0A3.45,3.45,0,0,0,4,0H1.77Z"/><path class="cls-2" d="M.77,2.77A4.31,4.31,0,0,1,3,2.33a4.31,4.31,0,0,1,2.26.44l-.38.92A7.51,7.51,0,0,0,3,3.41a7.9,7.9,0,0,0-1.91.27Z"/><path class="cls-2" d="M4.35,8.27a1.05,1.05,0,0,1-.59.93A3.5,3.5,0,0,0,2.62,6.63a1.71,1.71,0,0,1-.56,1.26l-.41.38a1.71,1.71,0,0,0-.56,1.26A1.79,1.79,0,0,0,2.4,11.21H3.6A1.79,1.79,0,0,0,4.92,9.52,1.71,1.71,0,0,0,4.35,8.27Z"/></g></g></svg>',
+                size: [6, 15]
+        },
+        'ground_service': {
+                svg: '<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 6 15" add_stroke_selected><defs><style>.cls-1{fill:#5a5a5a;}.cls-2{fill:#fff;}</style></defs><title>service_dark</title><g id="Layer_2" data-name="Layer 2"><g id="Service"><path class="cls-1" d="M1.77,0a3.32,3.32,0,0,0-.63.07L1,.11.86.16h0L.7.23.59.3l0,0L.49.38l0,.06a.15.15,0,0,0,0,0h0v0h0V.9l0,0,0,0h0l0,.07V4c0,.13.06.16.1.23v.3H.09c0,1.32,0,3.38,0,4.8l0,.44C.07,9.82,0,9.88,0,10v2.82c0,.09-.05.14.07.18v1.9a50.76,50.76,0,0,0,5.78,0V13.06C6,13,6,12.93,6,12.84V10c0-.15-.05-.2-.11-.22V9.37c0-1.41,0-3.51,0-4.8H5.55v-.3c0-.08.11-.1.09-.23v-3L5.6,1h0l0,0,0,0V.51h0v0h0a.15.15,0,0,0,0,0,.16.16,0,0,0,0-.06L5.41.32l0,0L5.26.23,5.12.17h0L5,.11l-.16,0A3.45,3.45,0,0,0,4,0H1.77Z"/><path class="cls-2" d="M.77,2.77A4.31,4.31,0,0,1,3,2.33a4.31,4.31,0,0,1,2.26.44l-.38.92A7.51,7.51,0,0,0,3,3.41a7.9,7.9,0,0,0-1.91.27Z"/><path class="cls-2" d="M4.85,8a1.67,1.67,0,0,0-.65-1.3A.12.12,0,0,0,4,6.74v.95a.12.12,0,0,1,0,.09l-.9.65a.12.12,0,0,1-.13,0L2,7.77a.12.12,0,0,1,0-.09V6.73a.11.11,0,0,0-.18-.08A1.72,1.72,0,0,0,1.15,8,1.66,1.66,0,0,0,2,9.4a.19.19,0,0,1,.1.17l0,1.54a.1.1,0,0,0,.11.1H3.78c.07,0,.12,0,.11-.1V9.57A.22.22,0,0,1,4,9.4,1.7,1.7,0,0,0,4.85,8Z"/></g></g></svg>',
+                size: [6, 15]
+        },
+        'ground_unknown': {
+                svg: '<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 6 15" add_stroke_selected><defs><style>.cls-1{fill:#5a5a5a;}.cls-2{fill:#fff;}</style></defs><title>unknown_dark</title><g id="Layer_2" data-name="Layer 2"><g id="Unknown"><path class="cls-1" d="M1.77,0a3.32,3.32,0,0,0-.63.07L1,.11.86.16h0L.7.23.59.3l0,0L.49.38l0,.06a.15.15,0,0,0,0,0h0v0h0V.9l0,0,0,0h0l0,.07V4c0,.13.06.16.1.23v.3H.09c0,1.32,0,3.38,0,4.8l0,.44C.07,9.82,0,9.88,0,10v2.82c0,.09-.05.14.07.18v1.9a50.76,50.76,0,0,0,5.78,0V13.06C6,13,6,12.93,6,12.84V10c0-.15-.05-.2-.11-.22V9.37c0-1.41,0-3.51,0-4.8H5.55v-.3c0-.08.11-.1.09-.23v-3L5.6,1h0l0,0,0,0V.51h0v0h0a.15.15,0,0,0,0,0,.16.16,0,0,0,0-.06L5.41.32l0,0L5.26.23,5.12.17h0L5,.11l-.16,0A3.45,3.45,0,0,0,4,0H1.77Z"/><path class="cls-2" d="M.77,2.77A4.31,4.31,0,0,1,3,2.33a4.31,4.31,0,0,1,2.26.44l-.38.92A7.51,7.51,0,0,0,3,3.41a7.9,7.9,0,0,0-1.91.27Z"/><path class="cls-2" d="M4.31,7.51A1.1,1.1,0,0,0,4,7.12a1.55,1.55,0,0,0-.5-.3,2.18,2.18,0,0,0-.77-.12,1.81,1.81,0,0,0-.65.11,1.48,1.48,0,0,0-.5.32,1.43,1.43,0,0,0-.32.48,1.62,1.62,0,0,0-.12.6v.12H2.31V8.2a1,1,0,0,1,0-.25.54.54,0,0,1,.09-.19.42.42,0,0,1,.15-.12.49.49,0,0,1,.22,0,.41.41,0,0,1,.29.09.39.39,0,0,1,.1.3.33.33,0,0,1,0,.19A.65.65,0,0,1,3,8.33l-.22.16a1.61,1.61,0,0,0-.25.22A1.28,1.28,0,0,0,2.33,9a1.2,1.2,0,0,0-.11.45v.37H3.29V9.52a.44.44,0,0,1,.09-.22,1,1,0,0,1,.19-.18l.25-.17a1.35,1.35,0,0,0,.27-.23,1.19,1.19,0,0,0,.21-.33,1.23,1.23,0,0,0,.09-.49A1.06,1.06,0,0,0,4.31,7.51Z"/><rect class="cls-2" x="2.18" y="10.26" width="1.12" height="1.02"/></g></g></svg>',
+                size: [6, 15]
+        },
+        'ground_fixed': {
+                svg: '<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 12 12" add_stroke_selected><defs><style>.cls-1{fill:#5a5a5a;}.cls-2{fill:#fff;}</style></defs><title>fixed_dark</title><g id="Layer_2" data-name="Layer 2"><g id="Fixed"><polygon class="cls-1" points="0 0 0 0.43 0 12 12 12 12 0 0 0"/><path class="cls-2" d="M3.24,2.73,1.36.86h9.29L8.77,2.73A4.29,4.29,0,0,0,3.24,2.73Z"/><circle class="cls-2" cx="6" cy="6" r="3.58" transform="translate(-2.49 6) rotate(-45)"/><path class="cls-2" d="M2.73,3.23a4.29,4.29,0,0,0,0,5.54L.86,10.62V1.37Z"/><path class="cls-2" d="M3.24,9.28a4.29,4.29,0,0,0,5.54,0l1.87,1.87H1.35Z"/><path class="cls-2" d="M9.28,8.77a4.29,4.29,0,0,0,0-5.54l1.86-1.86v9.26Z"/><circle class="cls-1" cx="6" cy="6" r="2" transform="translate(-2.49 6) rotate(-45)"/></g></g></svg>',
+                size: [12, 12]
+        },
+        'unknown': {
+                svg: '<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 17 17" width="17px" height="17px"  add_stroke_selected><defs><style>.cls-1{fill:aircraft_color_fill;}.cls-2{fill:aircraft_color_stroke;}</style></defs><title>unknown_live</title><g id="Layer_2" data-name="Layer 2"><g id="Unknown"><path class="cls-1" d="M5.25,16.76c-.92,0-1.33-.46-1.39-.86a1,1,0,0,1,.79-1.11c.25-.08,1.22-.43,2.63-1V10.65h-6c-.68,0-1-.35-1-.66a.81.81,0,0,1,.6-.86C1.14,9,4.8,7,7.28,5.63V3c0-1.11.44-2.71,1.23-2.71S9.77,1.84,9.77,3V5.63C12.22,7,15.87,9,16.14,9.13a.8.8,0,0,1,.61.86c-.05.31-.36.67-1.05.67H9.77v3.19l1.61.59,1,.36a1.05,1.05,0,0,1,.8,1.11c-.07.39-.47.86-1.39.86Z"/><path class="cls-2" d="M8.54.48c.55,0,1,1.36,1,2.47V5.77s6.15,3.45,6.53,3.59c.72.25.61,1.06-.36,1.06H9.53V14c1.44.52,2.5.93,2.76,1,1,.36.85,1.5-.52,1.5H5.25c-1.38,0-1.52-1.14-.52-1.5.26-.08,1.33-.47,2.78-1V10.41H1.29c-1,0-1-.81-.36-1.06.4-.13,6.59-3.59,6.59-3.59V3c0-1.11.44-2.47,1-2.47h0m0-.48h0C7.51,0,7,1.76,7,3V5.49C4.69,6.79,1.11,8.77.77,8.9A1,1,0,0,0,0,10a1.15,1.15,0,0,0,1.27.86H7v2.78c-1.3.49-2.23.82-2.45.89a1.29,1.29,0,0,0-1,1.39c.08.49.56,1.05,1.63,1.05h6.51c1.07,0,1.54-.57,1.63-1.05a1.28,1.28,0,0,0-.94-1.38l-1-.36L10,13.67V10.89h5.7A1.16,1.16,0,0,0,17,10a1,1,0,0,0-.77-1.12C15.9,8.77,12.34,6.79,10,5.49V3c0-1.19-.47-3-1.47-3Z"/></g></g></svg>',
+                size: [17,17]
+        }
+}
 
 var TypeDesignatorIcons = {
-        'A318': _a320, // shortened a320
-        'A319': _a320, // shortened a320
-        'A320': _a320,
-        'A321': _a320, // stretched a320
+        'A318': 'airliner', // shortened a320
+        'A319': 'airliner', // shortened a320
+        'A320': 'airliner',
+        'A321': 'airliner', // stretched a320
 
-        'A388': _a380,
+        'A388': 'heavy_4e',
 
         // dubious since these are old-generation 737s
         // but the shape is similar
-        'B731': _b738,
-        'B732': _b738,
-        'B733': _b738,
-        'B734': _b738,
-        'B735': _b738,
+        'B731': 'airliner',
+        'B732': 'airliner',
+        'B733': 'airliner',
+        'B734': 'airliner',
+        'B735': 'airliner',
 
         // these probably need reworking
         // since they vary in length
-        'B736': _b738,
-        'B737': _b738,
-        'B738': _b738,
-        'B739': _b738,
+        'B736': 'airliner',
+        'B737': 'airliner',
+        'B738': 'airliner',
+        'B739': 'airliner',
 
-        'B741': _b744,
-        'B742': _b744,
-        'B743': _b744,
-        'B744': _b744,
-        'B74D': _b744,
-        'B74S': _b744,
-        'B74R': _b744,
-        'BLCF': _b744,
-        'BSCA': _b744, // hah!
-        'B748': _b744,
+        'B741': 'heavy_4e',
+        'B742': 'heavy_4e',
+        'B743': 'heavy_4e',
+        'B744': 'heavy_4e',
+        'B74D': 'heavy_4e',
+        'B74S': 'heavy_4e',
+        'B74R': 'heavy_4e',
+        'BLCF': 'heavy_2e',
+        'BSCA': 'heavy_4e', // hah!
+        'B748': 'heavy_4e',
 
-        'B772': _b777, // all pretty similar except for length
-        'B77W': _b777,
-        'B773': _b777,
-        'B77L': _b777,
+        'B772': 'heavy_2e', // all pretty similar except for length
+        'B77W': 'heavy_2e',
+        'B773': 'heavy_2e',
+        'B77L': 'heavy_2e',
 
-        'DH8A': _dash8,
-        'DH8B': _dash8,
-        'DH8C': _dash8,
-        'DH8D': _dash8,
+        'DH8A': 'twin_small',
+        'DH8B': 'twin_small',
+        'DH8C': 'twin_small',
+        'DH8D': 'twin_small',
 
-        'BE20': _b200,
+        'E170': 'jet_swept',
+        'E45X': 'jet_swept',
+        'B712': 'jet_swept',
+        'C650': 'jet_swept',
+        'C750': 'jet_swept',
+        'E135': 'jet_swept',
+        'E145': 'jet_swept',
+        'CL30': 'jet_swept',
+        'CL35': 'jet_swept',
+        'CL60': 'jet_swept',
+        'GL5T': 'jet_swept',
+        'GLF2': 'jet_swept', // close enough
+        'GLF3': 'jet_swept',
+        'GLF4': 'jet_swept',
+        'GLF5': 'jet_swept',
+        'GLF6': 'jet_swept',
+        'CRJ1': 'jet_swept',
+        'CRJ2': 'jet_swept',
+        'CRJ7': 'jet_swept',
+        'CRJ9': 'jet_swept',
+        'H25A': 'jet_swept',
+        'H25B': 'jet_swept',
+        'H25C': 'jet_swept',
+        'MD80': 'jet_swept',
+        'MD81': 'jet_swept',
+        'MD82': 'jet_swept',
+        'MD83': 'jet_swept',
+        'MD87': 'jet_swept',
+        'MD88': 'jet_swept',
 
-        'GLF5': _g650, // close enough
-        'GLF6': _g650,
 
-        'C130': _c130,
-        'C30J': _c130
+
+        'A37': 'hi_perf',
+        'A700': 'hi_perf',
+        'LEOP': 'hi_perf',
+        'ME62': 'hi_perf',
+        'T2': 'hi_perf',
+        'T37': 'hi_perf',
+        'T38': 'hi_perf',
+        'A10': 'hi_perf',
+        'A148': 'hi_perf',
+        'A3': 'hi_perf',
+        'A6': 'hi_perf',
+        'AJET': 'hi_perf',
+        'AT3': 'hi_perf',
+        'CKUO': 'hi_perf',
+        'EUFI': 'hi_perf',
+        'F1': 'hi_perf',
+        'F100': 'hi_perf',
+        'F111': 'hi_perf',
+        'F117': 'hi_perf',
+        'F14': 'hi_perf',
+        'F15': 'hi_perf',
+        'F18': 'hi_perf',
+        'F22': 'hi_perf',
+        'F22A': 'hi_perf',
+        'F4': 'hi_perf',
+        'F5': 'hi_perf',
+        'FOUG': 'hi_perf',
+        'J8A': 'hi_perf',
+        'J8B': 'hi_perf',
+        'JH7': 'hi_perf',
+        'LTNG': 'hi_perf',
+        'METR': 'hi_perf',
+        'MG19': 'hi_perf',
+        'MG25': 'hi_perf',
+        'MG29': 'hi_perf',
+        'MG31': 'hi_perf',
+        'MG44': 'hi_perf',
+        'MIR4': 'hi_perf',
+        'MT2': 'hi_perf',
+        'Q5': 'hi_perf',
+        'RFAL': 'hi_perf',
+        'S3': 'hi_perf',
+        'S37': 'hi_perf',
+        'SR71': 'hi_perf',
+        'SU15': 'hi_perf',
+        'SU24': 'hi_perf',
+        'SU25': 'hi_perf',
+        'SU27': 'hi_perf',
+        'T22M': 'hi_perf',
+        'T4': 'hi_perf',
+        'TOR': 'hi_perf',
+        'TU22': 'hi_perf',
+        'VAUT': 'hi_perf',
+        'WB57': 'hi_perf',
+        'Y130': 'hi_perf',
+        'YK28': 'hi_perf',
+        // 'BE20': _b200,
+
+        // 'C130': _c130,
+        // 'C30J': _c130
 };
 
 // Maps ICAO aircraft type description codes (e.g. "L2J") to aircraft icons. This is used if the ICAO type designator (e.g. "B731")
@@ -225,98 +217,81 @@ var TypeDesignatorIcons = {
 //     a dash (e.g. "L2J-M").
 
 var TypeDescriptionIcons = {
-        'H': _helicopter,
+        'H': 'helicopter',
 
-        'L1P': _single_prop,
-        'L1T': _single_prop,
+        'L1P': 'cessna',
+        'L1T': 'cessna',
+        'L1J': 'hi_perf',
 
-        'L2T': _dash8,
+        'L2T': 'twin_small',
+        'L2P': 'twin_large',
 
-        'L2J-L': _g650,
-        'L2J-M': _a320,
-        'L2J-H': _b777,
+        'L2J-L': 'jet_swept',
+        'L2J-M': 'airliner',
+        'L2J-H': 'heavy_2e',
 
-        'L4T': _c130,
-        'L4J-H': _b744
+        'L4T': 'heavy_4e',
+        'L4J-H': 'heavy_4e'
 };
 
 var CategoryIcons = {
-        "A1" : _single_prop,
+        "A1" : 'cessna',
 
-        "A2" : _g650,
+        "A2" : 'jet_nonswept',
 
-        "A3" : _a320,
+        "A3" : 'airliner',
 
-        "A5" : _b777,
+        "A5" : 'heavy_4e',
 
-        "A7" : _helicopter,
+        "A7" : 'helicopter',
 
-        "B2" : _balloon
-};
+        "B2" : 'balloon',
 
-var DefaultIcon = {
-        key : "default",
-        scale : 0.4,
-        size : [64, 64],
-        anchor : [32, 32],
-        path : _generic_plane_svg
+        'C0' : 'ground_unknown',
+
+        'C1' : 'ground_emergency',
+
+        'C2' : 'ground_service',
+
+        'C3' : 'ground_fixed'
 };
 
 function getBaseMarker(category, typeDesignator, typeDescription, wtc) {
         if (typeDesignator in TypeDesignatorIcons) {
-                return TypeDesignatorIcons[typeDesignator];
+                return shapes[TypeDesignatorIcons[typeDesignator]];
         }
 
         if (typeDescription !== undefined && typeDescription !== null && typeDescription.length === 3) {
                 if (wtc !== undefined && wtc !== null && wtc.length === 1) {
                         var typeDescriptionWithWtc = typeDescription + "-" + wtc;
                         if (typeDescriptionWithWtc in TypeDescriptionIcons) {
-                                return TypeDescriptionIcons[typeDescriptionWithWtc];
+                                return shapes[TypeDescriptionIcons[typeDescriptionWithWtc]];
                         }
                 }
 
                 if (typeDescription in TypeDescriptionIcons) {
-                        return TypeDescriptionIcons[typeDescription];
+                        return shapes[TypeDescriptionIcons[typeDescription]];
                 }
 
                 var basicType = typeDescription.charAt(0);
                 if (basicType in TypeDescriptionIcons) {
-                        return TypeDescriptionIcons[basicType];
+                        return shapes[TypeDescriptionIcons[basicType]];
                 }
         }
 
         if (category in CategoryIcons) {
-                return CategoryIcons[category];
+                return shapes[CategoryIcons[category]];
         }
 
-        return DefaultIcon;
+        return shapes['unknown'];
 }
 
-function svgPathToSvg(path, size, stroke, width, fill, transparentBorderWidth) {
-        var svg = '<svg width="' + size[0] + 'px" height="' + size[1] + 'px" version="1.1" xmlns="http://www.w3.org/2000/svg">';
-        svg += '<path d="' + path + '"';
-        if (stroke !== null) {
-                svg += ' stroke="' + stroke + '"';
-        }
-        if (width !== null) {
-                svg += ' stroke-width="' + width + '"';
-        }
-        if (fill !== null) {
-                svg += ' fill="' + fill + '"';
-        }
-        svg += '/>';
-        // Add a transparent border to increase the size of the plane marker clickable area.
-        if (transparentBorderWidth > 0) {
-                // If the border is 100% transparent, OpenLayers will ignore it completely - see
-                // https://github.com/openlayers/ol3/issues/2961. The stroke opacity is set to 1% as a workaround. 
-                // This is transparent enough to be invisible to the user.
-                svg += '<path d="' + path + '" fill="none" stroke="#FFFFFF" stroke-opacity="0.01" stroke-width="' + transparentBorderWidth + '" />';
-        }
-        svg += '</svg>';
-        return svg;
+function svgPathToSvg(path, stroke, fill, selected_stroke) {
+        path = path.replace('aircraft_color_fill', fill).replace('aircraft_color_stroke', stroke).replace('add_stroke_selected', selected_stroke);
+        return path;
 }
 
 
-function svgPathToURI(path, size, stroke, width, fill, transparentBorderWidth) {
-        return "data:image/svg+xml;base64," + btoa(svgPathToSvg(path, size, stroke, width, fill, transparentBorderWidth));
+function svgPathToURI(path, stroke, fill, selected_stroke) {
+        return "data:image/svg+xml;base64," + btoa(svgPathToSvg(path, stroke, fill, selected_stroke));
 }
diff --git a/public_html/planeObject.js b/public_html/planeObject.js
index ddd2130..a0df910 100644
--- a/public_html/planeObject.js
+++ b/public_html/planeObject.js
@@ -86,6 +86,20 @@ PlaneObject.prototype.isFiltered = function() {
         return planeAltitude < this.filter.minAltitude || planeAltitude > this.filter.maxAltitude;
     }
 
+    // filter out ground vehicles
+    if (typeof this.filter.groundVehicles !== 'undefined' && this.filter.groundVehicles === 'filtered') {
+        if (typeof this.category === 'string' && this.category.startsWith('C')) {
+            return true;
+        }
+    }
+
+    // filter out blocked MLAT flights
+    if (typeof this.filter.blockedMLAT !== 'undefined' && this.filter.blockedMLAT === 'filtered') {
+        if (typeof this.icao === 'string' && this.icao.startsWith('~')) {
+            return true;
+        }
+    }
+
     return false;
 }
 
@@ -115,7 +129,8 @@ PlaneObject.prototype.updateTrack = function(estimate_time) {
                                head_update: this.last_position_time,
                                tail_update: this.last_position_time,
                                estimated: false,
-                               ground: (this.altitude === "ground")
+                               ground: (this.altitude === "ground"),
+                               altitude: this.altitude
                              };
                 this.track_linesegs.push(newseg);
                 this.history_size ++;
@@ -137,6 +152,7 @@ PlaneObject.prototype.updateTrack = function(estimate_time) {
                         this.track_linesegs.push({ fixed: new ol.geom.LineString([projPrev, projHere]),
                                                    feature: null,
                                                    head_update: this.last_position_time,
+                                                   altitude: 0,
                                                    estimated: true });
                         this.history_size += 2;
                 } else {
@@ -157,14 +173,15 @@ PlaneObject.prototype.updateTrack = function(estimate_time) {
                             head_update: this.last_position_time,
                             tail_update: this.last_position_time,
                             estimated: false,
-                            ground: (this.altitude === "ground") };
+                            ground: (this.altitude === "ground"),
+                            altitude: this.altitude };
                 this.track_linesegs.push(lastseg);
                 this.history_size ++;
                 // continue
         }
         
         if ( (lastseg.ground && this.altitude !== "ground") ||
-             (!lastseg.ground && this.altitude === "ground") ) {
+             (!lastseg.ground && this.altitude === "ground") || this.altitude !== lastseg.altitude ) {
                 //console.log(this.icao + " ground state changed");
                 // Create a new segment as the ground state changed.
                 // assume the state changed halfway between the two points
@@ -176,6 +193,7 @@ PlaneObject.prototype.updateTrack = function(estimate_time) {
                                            head_update: this.last_position_time,
                                            tail_update: this.last_position_time,
                                            estimated: false,
+                                           altitude: this.altitude,
                                            ground: (this.altitude === "ground") });
                 this.history_size += 3;
                 return true;
@@ -236,33 +254,11 @@ PlaneObject.prototype.getMarkerColor = function() {
 
         var h, s, l;
 
-        if (this.altitude === null) {
-                h = ColorByAlt.unknown.h;
-                s = ColorByAlt.unknown.s;
-                l = ColorByAlt.unknown.l;
-        } else if (this.altitude === "ground") {
-                h = ColorByAlt.ground.h;
-                s = ColorByAlt.ground.s;
-                l = ColorByAlt.ground.l;
-        } else {
-                s = ColorByAlt.air.s;
-                l = ColorByAlt.air.l;
+        var colorArr = this.getAltitudeColor();
 
-                // find the pair of points the current altitude lies between,
-                // and interpolate the hue between those points
-                var hpoints = ColorByAlt.air.h;
-                h = hpoints[0].val;
-                for (var i = hpoints.length-1; i >= 0; --i) {
-                        if (this.altitude > hpoints[i].alt) {
-                                if (i == hpoints.length-1) {
-                                        h = hpoints[i].val;
-                                } else {
-                                        h = hpoints[i].val + (hpoints[i+1].val - hpoints[i].val) * (this.altitude - hpoints[i].alt) / (hpoints[i+1].alt - hpoints[i].alt)
-                                }
-                                break;
-                        }
-                }
-        }
+        h = colorArr[0];
+        s = colorArr[1];
+        l = colorArr[2];
 
         // If we have not seen a recent position update, change color
         if (this.seen_pos > 15) {
@@ -300,71 +296,91 @@ PlaneObject.prototype.getMarkerColor = function() {
         return 'hsl(' + (h/5).toFixed(0)*5 + ',' + (s/5).toFixed(0)*5 + '%,' + (l/5).toFixed(0)*5 + '%)'
 }
 
+PlaneObject.prototype.getAltitudeColor = function(altitude) {
+        var h, s, l;
+
+        if (typeof altitude === 'undefined') {
+            altitude = this.altitude;
+        }
+
+        if (altitude === null) {
+                h = ColorByAlt.unknown.h;
+                s = ColorByAlt.unknown.s;
+                l = ColorByAlt.unknown.l;
+        } else if (this.altitude === "ground") {
+                h = ColorByAlt.ground.h;
+                s = ColorByAlt.ground.s;
+                l = ColorByAlt.ground.l;
+        } else {
+                s = ColorByAlt.air.s;
+                l = ColorByAlt.air.l;
+
+                // find the pair of points the current altitude lies between,
+                // and interpolate the hue between those points
+                var hpoints = ColorByAlt.air.h;
+                h = hpoints[0].val;
+                for (var i = hpoints.length-1; i >= 0; --i) {
+                        if (altitude > hpoints[i].alt) {
+                                if (i == hpoints.length-1) {
+                                        h = hpoints[i].val;
+                                } else {
+                                        h = hpoints[i].val + (hpoints[i+1].val - hpoints[i].val) * (altitude - hpoints[i].alt) / (hpoints[i+1].alt - hpoints[i].alt)
+                                }
+                                break;
+                        }
+                }
+        }
+
+         if (h < 0) {
+                h = (h % 360) + 360;
+        } else if (h >= 360) {
+                h = h % 360;
+        }
+
+        if (s < 5) s = 5;
+        else if (s > 95) s = 95;
+
+        if (l < 5) l = 5;
+        else if (l > 95) l = 95;
+
+        return [h, s, l];
+}
+
 PlaneObject.prototype.updateIcon = function() {
         var scaleFactor = Math.max(0.2, Math.min(1.2, 0.15 * Math.pow(1.25, ZoomLvl))).toFixed(1);
 
         var col = this.getMarkerColor();
         var opacity = 1.0;
         var outline = (this.position_from_mlat ? OutlineMlatColor : OutlineADSBColor);
+        var add_stroke = (this.selected && !SelectedAllPlanes) ? ' stroke="black" stroke-width="1px"' : '';
         var baseMarker = getBaseMarker(this.category, this.icaotype, this.typeDescription, this.wtc);
-        var weight = ((this.selected && !SelectedAllPlanes ? 2 : 1) / baseMarker.scale / scaleFactor).toFixed(1);
         var rotation = (this.track === null ? 0 : this.track);
-        var transparentBorderWidth = (32 / baseMarker.scale / scaleFactor).toFixed(1);
+        //var transparentBorderWidth = (32 / baseMarker.scale / scaleFactor).toFixed(1);
 
-        var svgKey = col + '!' + outline + '!' + baseMarker.key + '!' + weight + "!" + scaleFactor;
+        var svgKey = col + '!' + outline + '!' + baseMarker.svg + '!' + add_stroke + "!" + scaleFactor;
         var styleKey = opacity + '!' + rotation;
 
         if (this.markerStyle === null || this.markerIcon === null || this.markerSvgKey != svgKey) {
                 //console.log(this.icao + " new icon and style " + this.markerSvgKey + " -> " + svgKey);
 
                 var icon = new ol.style.Icon({
-                        anchor: baseMarker.anchor,
-                        anchorXUnits: 'pixels',
-                        anchorYUnits: 'pixels',
-                        scale: baseMarker.scale * scaleFactor,
+                        anchor: [0.5, 0.5],
+                        anchorXUnits: 'fraction',
+                        anchorYUnits: 'fraction',
+                        scale: 1.2 * scaleFactor,
                         imgSize: baseMarker.size,
-                        src: svgPathToURI(baseMarker.path, baseMarker.size, outline, weight, col, transparentBorderWidth),
+                        src: svgPathToURI(baseMarker.svg, outline, col, add_stroke),
                         rotation: (baseMarker.noRotate ? 0 : rotation * Math.PI / 180.0),
                         opacity: opacity,
                         rotateWithView: (baseMarker.noRotate ? false : true)
                 });
 
-                if (baseMarker.noRotate) {
-                        // the base marker won't be rotated
-                        this.markerStaticIcon = icon;
-                        this.markerStaticStyle = new ol.style.Style({
-                                image: this.markerStaticIcon
-                        });
-
-                        // create an arrow that we will rotate around the base marker
-                        // to indicate heading
-
-                        var offset = baseMarker.markerRadius * baseMarker.scale + 6;
-                        var size = offset * 2;
-
-                        var arrowPath = "M " + offset + ",0 m 4,4 -8,0 4,-4 z";
-                        this.markerIcon = new ol.style.Icon({
-                                anchor: [offset, offset],
-                                anchorXUnits: 'pixels',
-                                anchorYUnits: 'pixels',
-                                scale: 1.0 * scaleFactor,
-                                imgSize: [size, size],
-                                src: svgPathToURI(arrowPath, [size, size], outline, 1, outline, 0),
-                                rotation: rotation * Math.PI / 180.0,
-                                opacity: opacity,
-                                rotateWithView: true
-                        });
-                        this.markerStyle = new ol.style.Style({
-                                image: this.markerIcon
-                        });
-                } else {
-                        this.markerIcon = icon;
-                        this.markerStyle = new ol.style.Style({
-                                image: this.markerIcon
-                        });
-                        this.markerStaticIcon = null;
-                        this.markerStaticStyle = new ol.style.Style({});
-                }
+                this.markerIcon = icon;
+                this.markerStyle = new ol.style.Style({
+                        image: this.markerIcon
+                });
+                this.markerStaticIcon = null;
+                this.markerStaticStyle = new ol.style.Style({});
 
                 this.markerStyleKey = styleKey;
                 this.markerSvgKey = svgKey;
@@ -500,6 +516,18 @@ PlaneObject.prototype.updateMarker = function(moved) {
 	}
 };
 
+
+// return the styling of the lines based on altitude
+PlaneObject.prototype.altitudeLines = function(altitude) {
+    var colorArr = this.getAltitudeColor(altitude);
+    return new ol.style.Style({
+        stroke: new ol.style.Stroke({
+            color: 'hsl(' + (colorArr[0]/5).toFixed(0)*5 + ',' + (colorArr[1]/5).toFixed(0)*5 + '%,' + (colorArr[2]/5).toFixed(0)*5 + '%)',
+            width: 2
+        })
+    })
+}
+
 // Update our planes tail line,
 PlaneObject.prototype.updateLines = function() {
         if (!this.selected)
@@ -542,7 +570,7 @@ PlaneObject.prototype.updateLines = function() {
         var lastfixed = lastseg.fixed.getCoordinateAt(1.0);
         var geom = new ol.geom.LineString([lastfixed, ol.proj.fromLonLat(this.position)]);
         this.elastic_feature = new ol.Feature(geom);
-        this.elastic_feature.setStyle(this.altitude === 'ground' ? groundStyle : airStyle);
+        this.elastic_feature.setStyle(this.altitudeLines(lastseg.altitude));
 
         if (oldElastic < 0) {
                 PlaneTrailFeatures.push(this.elastic_feature);
@@ -557,10 +585,8 @@ PlaneObject.prototype.updateLines = function() {
                         seg.feature = new ol.Feature(seg.fixed);
                         if (seg.estimated) {
                                 seg.feature.setStyle(estimateStyle);
-                        } else if (seg.ground) {
-                                seg.feature.setStyle(groundStyle);
                         } else {
-                                seg.feature.setStyle(airStyle);
+                                seg.feature.setStyle(this.altitudeLines(seg.altitude));
                         }
 
                         PlaneTrailFeatures.push(seg.feature);
diff --git a/public_html/script.js b/public_html/script.js
index 687b978..bc3fcbb 100644
--- a/public_html/script.js
+++ b/public_html/script.js
@@ -12,7 +12,10 @@ var PlanesOrdered = [];
 var PlaneFilter   = {};
 var SelectedPlane = null;
 var SelectedAllPlanes = false;
+var HighlightedPlane = null;
 var FollowSelected = false;
+var infoBoxOriginalPosition = {};
+var customAltitudeColors = true;
 
 var SpecialSquawks = {
         '7500' : { cssClass: 'squawk7500', markerColor: 'rgb(255, 85, 85)', text: 'Aircraft Hijacking' },
@@ -45,6 +48,11 @@ var MessageRate = 0;
 
 var NBSP='\u00a0';
 
+var layers;
+
+// piaware vs flightfeeder
+var isFlightFeeder = false;
+
 function processReceiverUpdate(data) {
 	// Loop through all the planes in the data packet
         var now = data.now;
@@ -150,6 +158,7 @@ function fetchData() {
 		selectNewPlanes();
 		refreshTableInfo();
 		refreshSelected();
+		refreshHighlighted();
                 
                 if (ReceiverClock) {
                         var rcv = new Date(now * 1000);
@@ -180,39 +189,12 @@ var PositionHistorySize = 0;
 function initialize() {
         // Set page basics
         document.title = PageName;
-        $("#infoblock_name").text(PageName);
+
+        flightFeederCheck();
 
         PlaneRowTemplate = document.getElementById("plane_row_template");
 
-        if (!ShowClocks) {
-                $('#timestamps').css('display','none');
-        } else {
-                // Create the clocks.
-		new CoolClock({
-			canvasId:       "utcclock",
-			skinId:         "classic",
-			displayRadius:  40,
-			showSecondHand: true,
-			gmtOffset:      "0", // this has to be a string!
-			showDigital:    false,
-			logClock:       false,
-			logClockRev:    false
-		});
-
-		ReceiverClock = new CoolClock({
-			canvasId:       "receiverclock",
-			skinId:         "classic",
-			displayRadius:  40,
-			showSecondHand: true,
-			gmtOffset:      null,
-			showDigital:    false,
-			logClock:       false,
-			logClockRev:    false
-		});
-
-                // disable ticking on the receiver clock, we will update it ourselves
-                ReceiverClock.tick = (function(){})
-        }
+        refreshClock();
 
         $("#loader").removeClass("hidden");
         
@@ -254,8 +236,58 @@ function initialize() {
                 }
             }
         });
+
+        // check if the altitude color values are default to enable the altitude filter
+        if (ColorByAlt.air.h.length === 3 && ColorByAlt.air.h[0].alt === 2000 && ColorByAlt.air.h[0].val === 20 && ColorByAlt.air.h[1].alt === 10000 && ColorByAlt.air.h[1].val === 140 && ColorByAlt.air.h[2].alt === 40000 && ColorByAlt.air.h[2].val === 300) {
+            customAltitudeColors = false;
+        }
+
+
         $("#altitude_filter_reset_button").click(onResetAltitudeFilter);
 
+        $('#settingsCog').on('click', function() {
+        	$('#settings_infoblock').toggle();
+        });
+
+        $('#settings_close').on('click', function() {
+            $('#settings_infoblock').hide();
+        });
+
+        $('#groundvehicle_filter').on('click', function() {
+        	filterGroundVehicles(true);
+        	refreshSelected();
+        	refreshHighlighted();
+        	refreshTableInfo();
+        });
+
+        $('#blockedmlat_filter').on('click', function() {
+        	filterBlockedMLAT(true);
+        	refreshSelected();
+        	refreshHighlighted();
+        	refreshTableInfo();
+        });
+
+        $('#grouptype_checkbox').on('click', function() {
+        	if ($('#grouptype_checkbox').hasClass('settingsCheckboxChecked')) {
+        		sortByDistance();
+        	} else {
+        		sortByDataSource();
+        	}
+        	
+        });
+
+        $('#altitude_checkbox').on('click', function() {
+        	toggleAltitudeChart(true);
+        });
+
+        $('#selectall_checkbox').on('click', function() {
+        	if ($('#selectall_checkbox').hasClass('settingsCheckboxChecked')) {
+        		deselectAllPlanes();
+        	} else {
+        		selectAllPlanes();
+        	}
+        })
+
         // Force map to redraw if sidebar container is resized - use a timer to debounce
         var mapResizeTimeout;
         $("#sidebar_container").on("resize", function() {
@@ -263,6 +295,10 @@ function initialize() {
             mapResizeTimeout = setTimeout(updateMapSize, 10);
         });
 
+        filterGroundVehicles(false);
+        filterBlockedMLAT(false);
+        toggleAltitudeChart(false);
+
         // Get receiver metadata, reconfigure using it, then continue
         // with initialization
         $.ajax({ url: 'data/receiver.json',
@@ -371,6 +407,7 @@ function end_load_history() {
 
         refreshTableInfo();
         refreshSelected();
+        refreshHighlighted();
         reaper();
 
         // Setup our timer to poll from the server.
@@ -434,7 +471,7 @@ function initialize_map() {
 
         // Initialize OL3
 
-        var layers = createBaseLayers();
+        layers = createBaseLayers();
 
         var iconsLayer = new ol.layer.Vector({
                 name: 'ac_positions',
@@ -471,12 +508,14 @@ function initialize_map() {
         }));
 
         var foundType = false;
+        var baseCount = 0;
 
         ol.control.LayerSwitcher.forEachRecursive(layers, function(lyr) {
                 if (!lyr.get('name'))
                         return;
 
                 if (lyr.get('type') === 'base') {
+                    baseCount++;
                         if (MapType === lyr.get('name')) {
                                 foundType = true;
                                 lyr.setVisible(true);
@@ -522,14 +561,17 @@ function initialize_map() {
                 }),
                 controls: [new ol.control.Zoom(),
                            new ol.control.Rotate(),
-                           new ol.control.Attribution({collapsed: false}),
-                           new ol.control.ScaleLine({units: DisplayUnits}),
-                           new ol.control.LayerSwitcher()
+                           new ol.control.Attribution({collapsed: true}),
+                           new ol.control.ScaleLine({units: DisplayUnits})
                           ],
                 loadTilesWhileAnimating: true,
                 loadTilesWhileInteracting: true
         });
 
+        if (baseCount > 1) {
+            OLMap.addControl(new ol.control.LayerSwitcher());
+        }
+
 	// Listeners for newly created Map
         OLMap.getView().on('change:center', function(event) {
                 var center = ol.proj.toLonLat(OLMap.getView().getCenter(), OLMap.getView().getProjection());
@@ -542,6 +584,7 @@ function initialize_map() {
                             Math.abs(center[1] - selected.position[1]) > 0.0001) {
                                 FollowSelected = false;
                                 refreshSelected();
+                                refreshHighlighted();
                         }
                 }
         });
@@ -573,6 +616,36 @@ function initialize_map() {
                 }
         });
 
+
+    // show the hover box
+    OLMap.on('pointermove', function(evt) {
+        var hex = evt.map.forEachFeatureAtPixel(evt.pixel,
+            function(feature, layer) {
+                    return feature.hex;
+            },
+            null,
+            function(layer) {
+                    return (layer === iconsLayer);
+            },
+            null
+        );
+
+        if (hex) {
+            highlightPlaneByHex(hex);
+        } else {
+            removeHighlight();
+        }
+
+    })
+
+    // handle the layer settings pane checkboxes
+	OLMap.once('postrender', function(e) {
+		toggleLayer('#nexrad_checkbox', 'nexrad');
+		toggleLayer('#sitepos_checkbox', 'site_pos');
+		toggleLayer('#actrail_checkbox', 'ac_trail');
+		toggleLayer('#acpositions_checkbox', 'ac_positions');
+	});
+
 	// Add home marker if requested
 	if (SitePosition) {
                 var markerStyle = new ol.style.Style({
@@ -652,13 +725,22 @@ function createSiteCircleFeatures() {
     });
     SiteCircleFeatures.clear();
 
-    var circleStyle = new ol.style.Style({
+    var circleStyle = function(distance) {
+    	return new ol.style.Style({
             fill: null,
             stroke: new ol.style.Stroke({
                     color: '#000000',
                     width: 1
-            })
-    });
+            }),
+            text: new ol.style.Text({
+            	font: '10px Helvetica Neue, sans-serif',
+            	fill: new ol.style.Fill({ color: '#000' }),
+				offsetY: -8,
+				text: format_distance_long(distance, DisplayUnits, 0)
+
+			})
+		});
+    };
 
     var conversionFactor = 1000.0;
     if (DisplayUnits === "nautical") {
@@ -672,7 +754,7 @@ function createSiteCircleFeatures() {
             var circle = make_geodesic_circle(SitePosition, distance, 360);
             circle.transform('EPSG:4326', 'EPSG:3857');
             var feature = new ol.Feature(circle);
-            feature.setStyle(circleStyle);
+            feature.setStyle(circleStyle(distance));
             StaticFeatures.push(feature);
             SiteCircleFeatures.push(feature);
     }
@@ -701,12 +783,15 @@ function reaper() {
         PlanesOrdered = newPlanes;
         refreshTableInfo();
         refreshSelected();
+        refreshHighlighted();
 }
 
 // Page Title update function
 function refreshPageTitle() {
-        if (!PlaneCountInTitle && !MessageRateInTitle)
+        if (!PlaneCountInTitle && !MessageRateInTitle) {
+                document.title = PageName;
                 return;
+        }
 
         var subtitle = "";
 
@@ -763,7 +848,7 @@ function refreshSelected() {
         } else {
                 $('#selected_callsign').text('n/a');
         }
-        $('#selected_flightaware_link').html(getFlightAwareModeSLink(selected.icao, selected.flight, "[FlightAware]"));
+        $('#selected_flightaware_link').html(getFlightAwareModeSLink(selected.icao, selected.flight, "FlightAware.com"));
 
         if (selected.registration !== null) {
                 $('#selected_registration').text(selected.registration);
@@ -777,13 +862,14 @@ function refreshSelected() {
                 $('#selected_icaotype').text("");
         }
 
-        var emerg = document.getElementById('selected_emergency');
-        if (selected.squawk in SpecialSquawks) {
-                emerg.className = SpecialSquawks[selected.squawk].cssClass;
-                emerg.textContent = NBSP + 'Squawking: ' + SpecialSquawks[selected.squawk].text + NBSP ;
-        } else {
-                emerg.className = 'hidden';
-        }
+        // Not using this logic for the redesigned info panel at the time, but leaving it in  if/when adding it back
+        // var emerg = document.getElementById('selected_emergency');
+        // if (selected.squawk in SpecialSquawks) {
+        //         emerg.className = SpecialSquawks[selected.squawk].cssClass;
+        //         emerg.textContent = NBSP + 'Squawking: ' + SpecialSquawks[selected.squawk].text + NBSP ;
+        // } else {
+        //         emerg.className = 'hidden';
+        // }
 
         $("#selected_altitude").text(format_altitude_long(selected.altitude, selected.vert_rate, DisplayUnits));
 
@@ -818,12 +904,13 @@ function refreshSelected() {
                 $('#selected_position').text('n/a');
                 $('#selected_follow').addClass('hidden');
         } else {
-                var mlat_bit = (selected.position_from_mlat ? "MLAT: " : "");
+                
                 if (selected.seen_pos > 1) {
-                        $('#selected_position').text(mlat_bit + format_latlng(selected.position) + " (" + selected.seen_pos.toFixed(1) + "s)");
+                        $('#selected_position').text(format_latlng(selected.position));
                 } else {
-                        $('#selected_position').text(mlat_bit + format_latlng(selected.position));
+                        $('#selected_position').text(format_latlng(selected.position));
                 }
+                $('#selected_source').text( (selected.position_from_mlat ? "MLAT" : "ADS-B"));
                 $('#selected_follow').removeClass('hidden');
                 if (FollowSelected) {
                         $('#selected_follow').css('font-weight', 'bold');
@@ -839,77 +926,131 @@ function refreshSelected() {
         $('#selected_photo_link').html(getFlightAwarePhotoLink(selected.registration));
 }
 
-// Refreshes the larger table of all the planes
-function refreshTableInfo() {
-        var show_squawk_warning = false;
+function refreshHighlighted() {
+	// this is following nearly identical logic, etc, as the refreshSelected function, but doing less junk for the highlighted pane
+	var highlighted = false;
 
-        TrackedAircraft = 0
-        TrackedAircraftPositions = 0
-        TrackedHistorySize = 0
-
-        $(".altitudeUnit").text(get_unit_label("altitude", DisplayUnits));
-        $(".speedUnit").text(get_unit_label("speed", DisplayUnits));
-        $(".distanceUnit").text(get_unit_label("distance", DisplayUnits));
-        $(".verticalRateUnit").text(get_unit_label("verticalRate", DisplayUnits));
-
-        for (var i = 0; i < PlanesOrdered.length; ++i) {
-		var tableplane = PlanesOrdered[i];
-                TrackedHistorySize += tableplane.history_size;
-		if (tableplane.seen >= 58 || tableplane.isFiltered()) {
-                        tableplane.tr.className = "plane_table_row hidden";
-                } else {
-                        TrackedAircraft++;
-                        var classes = "plane_table_row";
-
-		        if (tableplane.position !== null && tableplane.seen_pos < 60) {
-                                ++TrackedAircraftPositions;
-                                if (tableplane.position_from_mlat)
-                                        classes += " mlat";
-				else
-                                        classes += " vPosition";
-			}
-			if (tableplane.icao == SelectedPlane)
-                                classes += " selected";
-                        
-                        if (tableplane.squawk in SpecialSquawks) {
-                                classes = classes + " " + SpecialSquawks[tableplane.squawk].cssClass;
-                                show_squawk_warning = true;
-			}			                
-
-                        // ICAO doesn't change
-                        if (tableplane.flight) {
-                                tableplane.tr.cells[2].innerHTML = getFlightAwareModeSLink(tableplane.icao, tableplane.flight, tableplane.flight);
-                        } else {
-                                tableplane.tr.cells[2].innerHTML = "";
-                        }
-                        tableplane.tr.cells[3].textContent = (tableplane.registration !== null ? tableplane.registration : "");
-                        tableplane.tr.cells[4].textContent = (tableplane.icaotype !== null ? tableplane.icaotype : "");
-                        tableplane.tr.cells[5].textContent = (tableplane.squawk !== null ? tableplane.squawk : "");
-                        tableplane.tr.cells[6].innerHTML = format_altitude_brief(tableplane.altitude, tableplane.vert_rate, DisplayUnits);
-                        tableplane.tr.cells[7].textContent = format_speed_brief(tableplane.speed, DisplayUnits);
-                        tableplane.tr.cells[8].textContent = format_vert_rate_brief(tableplane.vert_rate, DisplayUnits);
-                        tableplane.tr.cells[9].textContent = format_distance_brief(tableplane.sitedist, DisplayUnits);
-                        tableplane.tr.cells[10].textContent = format_track_brief(tableplane.track);
-                        tableplane.tr.cells[11].textContent = tableplane.messages;
-                        tableplane.tr.cells[12].textContent = tableplane.seen.toFixed(0);
-                        tableplane.tr.cells[13].textContent = (tableplane.rssi !== null ? tableplane.rssi : "");
-                        tableplane.tr.cells[14].textContent = (tableplane.position !== null ? tableplane.position[1].toFixed(4) : "");
-                        tableplane.tr.cells[15].textContent = (tableplane.position !== null ? tableplane.position[0].toFixed(4) : "");
-                        tableplane.tr.cells[16].textContent = format_data_source(tableplane.getDataSource());
-                        tableplane.tr.cells[17].innerHTML = getAirframesModeSLink(tableplane.icao);
-                        tableplane.tr.cells[18].innerHTML = getFlightAwareModeSLink(tableplane.icao, tableplane.flight);
-                        tableplane.tr.cells[19].innerHTML = getFlightAwarePhotoLink(tableplane.registration);
-                        tableplane.tr.className = classes;
-		}
+	if (typeof HighlightedPlane !== 'undefined' && HighlightedPlane !== null) {
+		highlighted = Planes[HighlightedPlane];
 	}
 
-	if (show_squawk_warning) {
-                $("#SpecialSquawkWarning").css('display','block');
+	// no highlighted plane
+	if (!highlighted) {
+		$('#highlighted_infoblock').hide();
+		return;
+	}
+
+	$('#highlighted_infoblock').show();
+
+	if (highlighted.flight !== null && highlighted.flight !== "") {
+		$('#highlighted_callsign').text(highlighted.flight);
+	} else {
+		$('#highlighted_callsign').text('n/a');
+	}
+
+	if (highlighted.icaotype !== null) {
+		$('#higlighted_icaotype').text(highlighted.icaotype);
+	} else {
+		$('#higlighted_icaotype').text("");
+	}
+
+
+	$('#highlighted_speed').text(format_speed_long(highlighted.speed, DisplayUnits));
+
+	$("#highlighted_altitude").text(format_altitude_long(highlighted.altitude, highlighted.vert_rate, DisplayUnits));
+
+	$('#highlighted_icao').text(highlighted.icao.toUpperCase());
+
+}
+
+function refreshClock() {
+	$('#clock_div').text(new Date().toLocaleString());
+	var c = setTimeout(refreshClock, 500);
+}
+
+function removeHighlight() {
+	HighlightedPlane = null;
+	refreshHighlighted();
+}
+
+// Refreshes the larger table of all the planes
+function refreshTableInfo() {
+    var show_squawk_warning = false;
+
+    TrackedAircraft = 0
+    TrackedAircraftPositions = 0
+    TrackedHistorySize = 0
+
+    $(".altitudeUnit").text(get_unit_label("altitude", DisplayUnits));
+    $(".speedUnit").text(get_unit_label("speed", DisplayUnits));
+    $(".distanceUnit").text(get_unit_label("distance", DisplayUnits));
+    $(".verticalRateUnit").text(get_unit_label("verticalRate", DisplayUnits));
+
+    for (var i = 0; i < PlanesOrdered.length; ++i) {
+	var tableplane = PlanesOrdered[i];
+    TrackedHistorySize += tableplane.history_size;
+	if (tableplane.seen >= 58 || tableplane.isFiltered()) {
+        tableplane.tr.className = "plane_table_row hidden";
+    } else {
+        TrackedAircraft++;
+        var classes = "plane_table_row";
+
+        if (tableplane.position !== null && tableplane.seen_pos < 60) {
+            ++TrackedAircraftPositions;
+		}
+
+		if (tableplane.getDataSource() === "adsb_icao") {
+        	classes += " vPosition";
+        } else if (tableplane.getDataSource() === "tisb_trackfile") {
+        	classes += " tisb";
+        } else if (tableplane.getDataSource() === "mlat") {
+        	classes += " mlat";
         } else {
-                $("#SpecialSquawkWarning").css('display','none');
+        	classes += " other";
         }
 
-        resortTable();
+		if (tableplane.icao == SelectedPlane)
+            classes += " selected";
+                    
+        if (tableplane.squawk in SpecialSquawks) {
+            classes = classes + " " + SpecialSquawks[tableplane.squawk].cssClass;
+            show_squawk_warning = true;
+		}			                
+
+        // ICAO doesn't change
+        if (tableplane.flight) {
+                tableplane.tr.cells[2].innerHTML = getFlightAwareModeSLink(tableplane.icao, tableplane.flight, tableplane.flight);
+        } else {
+                tableplane.tr.cells[2].innerHTML = "";
+        }
+        tableplane.tr.cells[3].textContent = (tableplane.registration !== null ? tableplane.registration : "");
+        tableplane.tr.cells[4].textContent = (tableplane.icaotype !== null ? tableplane.icaotype : "");
+        tableplane.tr.cells[5].textContent = (tableplane.squawk !== null ? tableplane.squawk : "");
+        tableplane.tr.cells[6].innerHTML = format_altitude_brief(tableplane.altitude, tableplane.vert_rate, DisplayUnits);
+        tableplane.tr.cells[7].textContent = format_speed_brief(tableplane.speed, DisplayUnits);
+        tableplane.tr.cells[8].textContent = format_vert_rate_brief(tableplane.vert_rate, DisplayUnits);
+        tableplane.tr.cells[9].textContent = format_distance_brief(tableplane.sitedist, DisplayUnits);
+        tableplane.tr.cells[10].textContent = format_track_brief(tableplane.track);
+        tableplane.tr.cells[11].textContent = tableplane.messages;
+        tableplane.tr.cells[12].textContent = tableplane.seen.toFixed(0);
+        tableplane.tr.cells[13].textContent = (tableplane.rssi !== null ? tableplane.rssi : "");
+        tableplane.tr.cells[14].textContent = (tableplane.position !== null ? tableplane.position[1].toFixed(4) : "");
+        tableplane.tr.cells[15].textContent = (tableplane.position !== null ? tableplane.position[0].toFixed(4) : "");
+        tableplane.tr.cells[16].textContent = format_data_source(tableplane.getDataSource());
+        tableplane.tr.cells[17].innerHTML = getAirframesModeSLink(tableplane.icao);
+        tableplane.tr.cells[18].innerHTML = getFlightAwareModeSLink(tableplane.icao, tableplane.flight);
+        tableplane.tr.cells[19].innerHTML = getFlightAwarePhotoLink(tableplane.registration);
+        tableplane.tr.className = classes;
+	}
+}
+
+if (show_squawk_warning) {
+            $("#SpecialSquawkWarning").css('display','block');
+    } else {
+            $("#SpecialSquawkWarning").css('display','none');
+    }
+
+    resortTable();
 }
 
 //
@@ -988,6 +1129,11 @@ function resortTable() {
 }
 
 function sortBy(id,sc,se) {
+		if (id !== 'data_source') {
+			$('#grouptype_checkbox').removeClass('settingsCheckboxChecked');
+		} else {
+			$('#grouptype_checkbox').addClass('settingsCheckboxChecked');
+		}
         if (id === sortId) {
                 sortAscending = !sortAscending;
                 PlanesOrdered.reverse(); // this correctly flips the order of rows that compare equal
@@ -1005,7 +1151,7 @@ function sortBy(id,sc,se) {
 function selectPlaneByHex(hex,autofollow) {
         //console.log("select: " + hex);
 	// If SelectedPlane has something in it, clear out the selected
-
+    removeHighlight();
 	if (SelectedAllPlanes) {
 		deselectAllPlanes();
 	}
@@ -1043,10 +1189,23 @@ function selectPlaneByHex(hex,autofollow) {
 	} 
 
 	refreshSelected();
+	refreshHighlighted();
+}
+
+function highlightPlaneByHex(hex) {
+	// if we've selected a plane, don't show the highlighting box
+	if (SelectedPlane != null) {
+		return;
+	}
+
+	if (hex != null) {
+		HighlightedPlane = hex;
+	}
 }
 
 // loop through the planes and mark them as selected to show the paths for all planes
 function selectAllPlanes() {
+    HighlightedPlane = null;
 	// if all planes are already selected, deselect them all
 	if (SelectedAllPlanes) {
 		deselectAllPlanes();
@@ -1071,7 +1230,10 @@ function selectAllPlanes() {
 		}
 	}
 
+	$('#selectall_checkbox').addClass('settingsCheckboxChecked');
+
 	refreshSelected();
+	refreshHighlighted();
 }
 
 // on refreshes, try to find new planes and mark them as selected
@@ -1101,9 +1263,11 @@ function deselectAllPlanes() {
 		Planes[key].updateMarker();
 		$(Planes[key].tr).removeClass("selected");
 	}
+	$('#selectall_checkbox').removeClass('settingsCheckboxChecked');
 	SelectedPlane = null;
 	SelectedAllPlanes = false;
 	refreshSelected();
+	refreshHighlighted();
 }
 
 function toggleFollowSelected() {
@@ -1225,6 +1389,14 @@ function adjustSelectedInfoBlockPosition() {
         // Get info box position and size
         var infoBox = $('#selected_infoblock');
         var infoBoxPosition = infoBox.position();
+        if (typeof infoBoxOriginalPosition.top === 'undefined') {
+            infoBoxOriginalPosition.top = infoBoxPosition.top;
+            infoBoxOriginalPosition.left = infoBoxPosition.left;
+        } else {
+            infoBox.css("left", infoBoxOriginalPosition.left);
+            infoBox.css("top", infoBoxOriginalPosition.top);
+            infoBoxPosition = infoBox.position();
+        }
         var infoBoxExtent = getExtent(infoBoxPosition.left, infoBoxPosition.top, infoBox.outerWidth(), infoBox.outerHeight());
 
         // Get map size
@@ -1235,8 +1407,8 @@ function adjustSelectedInfoBlockPosition() {
         if (isPointInsideExtent(markerPosition[0], markerPosition[1], infoBoxExtent)) {
             // Array of possible new positions for info box
             var candidatePositions = [];
-            candidatePositions.push( { x: 20, y: 20 } );
-            candidatePositions.push( { x: 20, y: markerPosition[1] + 40 } );
+            candidatePositions.push( { x: 40, y: 60 } );
+            candidatePositions.push( { x: 40, y: markerPosition[1] + 80 } );
 
             // Find new position
             for (var i = 0; i < candidatePositions.length; i++) {
@@ -1276,6 +1448,8 @@ function initializeUnitsSelector() {
     var displayUnits = localStorage['displayUnits'];
     DisplayUnits = displayUnits;
 
+    setAltitudeLegend(displayUnits);
+
     // Initialize drop-down
     var unitsSelector = $("#units_selector");
     unitsSelector.val(displayUnits);
@@ -1288,12 +1462,15 @@ function onDisplayUnitsChanged(e) {
     localStorage['displayUnits'] = displayUnits;
     DisplayUnits = displayUnits;
 
+    setAltitudeLegend(displayUnits);
+
     // Update filters
     updatePlaneFilter();
 
     // Refresh data
     refreshTableInfo();
     refreshSelected();
+    refreshHighlighted();
 
     // Redraw range rings
     if (SitePosition !== null && SitePosition !== undefined && SiteCircles) {
@@ -1308,6 +1485,14 @@ function onDisplayUnitsChanged(e) {
     });
 }
 
+function setAltitudeLegend(units) {
+    if (units === 'metric') {
+        $('#altitude_chart_button').addClass('altitudeMeters');
+    } else {
+        $('#altitude_chart_button').removeClass('altitudeMeters');
+    }
+}
+
 function onFilterByAltitude(e) {
     e.preventDefault();
     updatePlaneFilter();
@@ -1320,9 +1505,68 @@ function onFilterByAltitude(e) {
         selectedPlane.clearLines();
         selectedPlane.updateMarker();         
         refreshSelected();
+        refreshHighlighted();
     }
 }
 
+function filterGroundVehicles(switchFilter) {
+	if (typeof localStorage['groundVehicleFilter'] === 'undefined') {
+		localStorage['groundVehicleFilter'] = 'not_filtered';
+	}
+	var groundFilter = localStorage['groundVehicleFilter'];
+	if (switchFilter === true) {
+		groundFilter = (groundFilter === 'not_filtered') ? 'filtered' : 'not_filtered';
+	}
+	if (groundFilter === 'not_filtered') {
+		$('#groundvehicle_filter').addClass('settingsCheckboxChecked');
+	} else {
+		$('#groundvehicle_filter').removeClass('settingsCheckboxChecked');
+	}
+	localStorage['groundVehicleFilter'] = groundFilter;
+	PlaneFilter.groundVehicles = groundFilter;
+}
+
+function filterBlockedMLAT(switchFilter) {
+	if (typeof localStorage['blockedMLATFilter'] === 'undefined') {
+		localStorage['blockedMLATFilter'] = 'not_filtered';
+	}
+	var blockedMLATFilter = localStorage['blockedMLATFilter'];
+	if (switchFilter === true) {
+		blockedMLATFilter = (blockedMLATFilter === 'not_filtered') ? 'filtered' : 'not_filtered';
+	}
+	if (blockedMLATFilter === 'not_filtered') {
+		$('#blockedmlat_filter').addClass('settingsCheckboxChecked');
+	} else {
+		$('#blockedmlat_filter').removeClass('settingsCheckboxChecked');
+	}
+	localStorage['blockedMLATFilter'] = blockedMLATFilter;
+	PlaneFilter.blockedMLAT = blockedMLATFilter;
+}
+
+function toggleAltitudeChart(switchToggle) {
+	if (typeof localStorage['altitudeChart'] === 'undefined') {
+		localStorage['altitudeChart'] = 'show';
+	}
+	var altitudeChartDisplay = localStorage['altitudeChart'];
+	if (switchToggle === true) {
+		altitudeChartDisplay = (altitudeChartDisplay === 'show') ? 'hidden' : 'show';
+	}
+    // if you're using custom colors always hide the chart
+    if (customAltitudeColors === true) {
+        altitudeChartDisplay = 'hidden';
+        // also hide the control option
+        $('#altitude_chart_container').hide();
+    }
+	if (altitudeChartDisplay === 'show') {
+		$('#altitude_checkbox').addClass('settingsCheckboxChecked');
+		$('#altitude_chart').show();
+	} else {
+		$('#altitude_checkbox').removeClass('settingsCheckboxChecked');
+		$('#altitude_chart').hide();
+	}
+	localStorage['altitudeChart'] = altitudeChartDisplay;
+}
+
 function onResetAltitudeFilter(e) {
     $("#altitude_filter_min").val("");
     $("#altitude_filter_max").val("");
@@ -1378,7 +1622,7 @@ function getFlightAwareModeSLink(code, ident, linkText) {
 
 function getFlightAwarePhotoLink(registration) {
     if (registration !== null && registration !== "") {
-        return "<a target=\"_blank\" href=\"https://flightaware.com/photos/aircraft/" + registration.replace(/[^0-9a-z]/ig,'') + "\">See Photos</a>";
+        return "<a target=\"_blank\" href=\"https://flightaware.com/photos/aircraft/" + registration.replace(/[^0-9a-z]/ig,'') + "\">See Aircraft Photos</a>";
     }
 
     return "";   
@@ -1391,3 +1635,57 @@ function getAirframesModeSLink(code) {
 
     return "";   
 }
+
+
+// takes in an elemnt jQuery path and the OL3 layer name and toggles the visibility based on clicking it
+function toggleLayer(element, layer) {
+	// set initial checked status
+	ol.control.LayerSwitcher.forEachRecursive(layers, function(lyr) { 
+		if (lyr.get('name') === layer && lyr.getVisible()) {
+			$(element).addClass('settingsCheckboxChecked');
+		}
+	});
+	$(element).on('click', function() {
+		var visible = false;
+		if ($(element).hasClass('settingsCheckboxChecked')) {
+			visible = true;
+		}
+		ol.control.LayerSwitcher.forEachRecursive(layers, function(lyr) { 
+			if (lyr.get('name') === layer) {
+				if (visible) {
+					lyr.setVisible(false);
+					$(element).removeClass('settingsCheckboxChecked');
+				} else {
+					lyr.setVisible(true);
+					$(element).addClass('settingsCheckboxChecked');
+				}
+			}
+		});
+	});
+}
+
+// check status.json if it has a serial number for a flightfeeder
+function flightFeederCheck() {
+	$.ajax('/status.json', {
+		success: function(data) {
+			if (data.type === "flightfeeder") {
+				isFlightFeeder = true;
+				updatePiAwareOrFlightFeeder();
+			}
+		}
+	})
+}
+
+// updates the page to replace piaware with flightfeeder references
+function updatePiAwareOrFlightFeeder() {
+	if (isFlightFeeder) {
+		$('.piAwareLogo').hide();
+		$('.flightfeederLogo').show();
+		PageName = 'FlightFeeder Skyview';
+	} else {
+		$('.flightfeederLogo').hide();
+		$('.piAwareLogo').show();
+		PageName = 'PiAware Skyview';
+	}
+	refreshPageTitle();
+}
diff --git a/public_html/style.css b/public_html/style.css
index 456f310..9121863 100644
--- a/public_html/style.css
+++ b/public_html/style.css
@@ -1,19 +1,19 @@
 html, body {
-    margin: 0; padding: 0; background-color: #ffffff; font-family: Tahoma, Sans-Serif;
+    margin: 0; padding: 0; background-color: #ffffff; font-family: Helvetica Neue, Sans-Serif;
     font-size: 10pt; overflow: auto; height: 100%;
 }
 
 #layout_container { 
     display: flex;
-    height: 100%;
+    height: calc(100% - 60px);;
 }
 
 #selected_infoblock {
     position: absolute;
     left: 40px;
-    top: 10px;
-    min-width: 360px;
-    padding: 20px;
+    top: 60px;
+    min-width: 394px;
+    padding: 10px;
     background: #ffffff;
     box-shadow: 4px 4px 10px #444444;
     cursor: pointer;
@@ -35,15 +35,16 @@ html, body {
 #toggle_sidebar_control {
     display: block;
     position: absolute;
-    top: 10px;
-    right: 10px;
+    top: 16px;
+    right: -3px;
 }
 
 #toggle_sidebar_button {
+    cursor: pointer;
     float: right;
-    width: 32px;
-    height: 28px;
-    background-size: 32px 28px;
+    width: 24px;
+    height: 25px;
+    background-size: 24px 25px;
     background-repeat: no-repeat;
     background-position: 0px;
     background-color: transparent;
@@ -51,33 +52,26 @@ html, body {
 }
 
 #toggle_sidebar_button.show_sidebar {
-    background-image: url("images/show_sidebar_inactive_48x40.png");
-}
-
-#toggle_sidebar_button.show_sidebar:hover {
-    background-image: url("images/show_sidebar_active_48x40.png");
+    background-image: url("images/table-icon.png");
 }
 
 #toggle_sidebar_button.hide_sidebar {
-    background-image: url("images/hide_sidebar_inactive_48x40.png");
-}
-
-#toggle_sidebar_button.hide_sidebar:hover {
-    background-image: url("images/hide_sidebar_active_48x40.png");
+    background-image: url("images/map-icon.png");
 }
 
 #expand_sidebar_control {
     display: block;
     position: absolute;
     top: 48px;
-    right: 10px;
+    right: -3px;
 }
 
 #expand_sidebar_button {
+    cursor: pointer;
     float: right;
-    width: 32px;
-    height: 28px;
-    background-size: 32px 28px;
+    width: 24px;
+    height: 25px;
+    background-size: 24px 25px;
     background-repeat: no-repeat;
     background-position: 0px;
     background-color: transparent;
@@ -85,24 +79,53 @@ html, body {
 }
 
 #expand_sidebar_button {
-    background-image: url("images/show_sidebar_inactive_48x40.png");
-}
-
-#expand_sidebar_button:hover {
-    background-image: url("images/show_sidebar_active_48x40.png");
+    background-image: url("images/table-icon.png");
 }
 
 #sidebar_container {
     display: flex;
-    width: 470px;
+    width: 500px;
     left: 0 !important;
 }
 
+
 #splitter {
-    flex: 0 0 6px;
     cursor: col-resize;
-    background-color: #bbbbbb;
-    left: 0 !important;
+    display: block;
+    position: absolute;
+    top: 125px;
+    left: -24px;
+    float: right;
+    width: 24px;
+    height: 25px;
+    background-size: 24px 25px;
+    background-repeat: no-repeat;
+    background-position: 0px;
+    background-color: transparent;
+    border: none;
+    background-image: url("images/column-adjust.png");
+}
+
+.ol-zoom-in {
+    background-image: url("images/zoom-in.png");
+    color:transparent !important;
+    width: 19px !important;
+    height: 19px !important;
+    background-color: transparent !important;
+    margin-bottom: 5px !important;
+}
+
+.ol-zoom-out {
+    background-image: url("images/zoom-out.png");
+    color:transparent !important;
+    width: 19px !important;
+    height: 19px !important;
+    background-color: transparent !important;
+}
+
+.ol-zoom {
+    background-color: transparent !important;
+    left: 10px !important;
 }
 
 #sidebar_canvas { 
@@ -138,7 +161,7 @@ div#loader { z-index: 99; position: absolute; left: 0; top: 0; bottom: 0; right:
 }
 
 .aircraft_table_header { 
-    background-color: #409EDF;
+    background-color: #002F5D;
     color: #FFFFFF;
     cursor: pointer;
 }
@@ -157,22 +180,22 @@ div#loader { z-index: 99; position: absolute; left: 0; top: 0; bottom: 0; right:
     text-transform: uppercase;
 }
 
-.vPosition  { background-color: #C3FFDF; }
-.mlat       { background-color: #C7EAFC; }
+.vPosition  { background-color: #E5F6FC; }
+.mlat       { background-color: #FDF2E5; }
+.other      { background-color: #CCD5F8; }
+.tisb       { background-color: #FFF3B8; }
 .squawk7500 { font-weight: bold; background-color: #ff5555; }
 .squawk7600 { font-weight: bold; background-color: #00ffff; }
 .squawk7700 { font-weight: bold; background-color: #ffff00; }
 .selected   { background-color: #dddddd; }
-.plane_table_row { cursor: pointer; }
+.plane_table_row { 
+    cursor: pointer;
+    font-family: Helvetica Neue;
+}
 .hidden { display: none; }
 
 .infoblock_heading    { font-size: larger; }
 .infoblock_heading a  { text-decoration: none; color: blue; font-size: x-small;}
-.infoblock_body       { font-size: small; }
-
-#selected_icao { font-size: x-small; }
-#selected_registration { font-size: x-small; }
-#selected_icaotype { font-size: x-small; }
 
 .dim    { opacity: 0.3; filter:alpha(opacity=30); /* For IE8 and earlier */ }
 
@@ -199,6 +222,490 @@ select.error, textarea.error, input.error {
 }
 
 .layer-switcher {
-    top: 86px !important;
+    bottom: 80px !important;
+    top: auto !important;
     right: 10px !important;
 }
+
+/* new css */
+.rangeRingText
+{
+    font-family: Helvetica Neue;
+    font-weight: bold;
+    font-size: 8px;
+    color: #333333;
+    color: rgb(51, 51, 51);
+}
+
+.dateTime
+{
+    font-family: Helvetica Neue;
+    font-weight: bold;
+    font-size: 14px;
+    line-height: 18px;
+    color: #FFFFFF;
+    color: rgb(255, 255, 255);
+    line-height: 60px;
+    text-align: right;
+    display: inline-block;
+    padding-right: 20px;
+}
+
+.infoHeading
+{
+    font-family: Helvetica Neue;
+    font-size: 14px;
+    line-height: 18px;
+    color: #002F5D;
+    color: rgb(0, 47, 93);
+}
+
+.infoData
+{
+    font-family: Helvetica Neue;
+    font-size: 14px;
+    line-height: 18px;
+    color: #000000;
+    color: rgb(0, 0, 0);
+}
+
+.legend
+{
+    font-family: Helvetica Neue;
+    width: 100%;
+    font-size: 12px;
+    color: #000000;
+    color: rgb(0, 0, 0);
+    display: inline-flex;
+    justify-content: flex-end;
+    padding-top: 10px;
+}
+
+.settingsHeading
+{
+    font-family: Helvetica Neue;
+    font-size: 14px;
+    line-height: 20px;
+    color: #002F5D;
+    color: rgb(0, 47, 93);
+}
+
+.settingsText
+{
+    font-family: Helvetica Neue;
+    font-size: 14px;
+    line-height: 20px;
+    text-indent: 16px
+    color: #000000;
+    color: rgb(0, 0, 0);
+}
+
+.link
+{
+    font-family: Helvetica Neue;
+    font-size: 10px;
+    line-height: 20px;
+    color: #0000C8;
+    color: rgb(0, 0, 200);
+    text-decoration: underline;
+}
+
+.infoHeading
+{
+    font-family: Helvetica Neue;
+    font-size: 12px;
+    line-height: 16px;
+    color: #666666;
+    color: rgb(102, 102, 102);
+}
+
+.infoData
+{
+    font-family: Helvetica Neue;
+    font-size: 12px;
+    line-height: 16px;
+    color: #000000;
+    color: rgb(0, 0, 0);
+}
+
+#header {
+    width: 100%;
+    height: 60px;
+    background: #002F5D;
+    background: -webkit-linear-gradient(#002F5D, #002F5D 60%, #021624);
+    background: -moz-linear-gradient(#002F5D, #002F5D 60%, #021624);
+    background: -ms-linear-gradient(#002F5D, #002F5D 60%, #021624);
+    background: linear-gradient(#002F5D, #002F5D 60%, #021624);
+    display: flex;
+    box-shadow: -6px 0px 8px #999999;
+    z-index: 99999;
+}
+
+.flightawareLogo {
+    background-color: #FFF;
+    padding-top: 7px;
+    padding-bottom: 6px;
+    padding-left: 20px;
+    padding-right: 20px;
+    width: 121px;
+    height: 46px;
+    box-shadow:inset -12px 0 12px -12px #000000;
+}
+
+.adsbLogo {
+    padding-left: 20px;
+    padding-top: 30px;
+    padding-bottom: 5px;
+}
+
+.piAwareLogo {
+    width: 186px;
+    height: 24px;
+}
+.flightfeederLogo {
+    width: 229px;
+    height: 24px;
+}
+
+.logoContainer {
+    flex: 1;
+}
+
+.buttonContainer {
+    margin-left: auto;
+}
+
+.buttonText
+{
+    font-family: Helvetica Neue;
+    font-weight: bold;
+    font-size: 12px;
+    color: #FFFFFF;
+    color: rgb(255, 255, 255);
+    line-height: 28px;
+    padding-left: 10px;
+    padding-right: 10px;
+}
+
+.button {
+    background: #00A0E2;
+    background: rgba(0, 160, 226, 1);
+    min-width: 80px;
+    height: 28px;
+    border-radius: 4px;
+    -moz-border-radius: 4px;
+    -webkit-border-radius: 4px;
+    display: inline-block;
+    margin-right: 10px;
+    cursor: pointer;
+    text-align: center;
+}
+
+.buttonHeader {
+    margin-top: 15px;
+}
+
+.buttonTable {
+    margin-bottom: 5px;
+}
+
+.settingsContainer {
+    padding-right: 60px;
+    padding-left: 2px;
+    margin-top: 18px;
+    margin-left: auto;
+    cursor: pointer;
+}
+
+#highlighted_infoblock {
+    position: absolute;
+    left: 40px;
+    top: 60px;
+    min-width: 168px;
+    padding-right: 5px;
+    background: #ffffff;
+    box-shadow: 4px 4px 10px #444444;
+    cursor: pointer;
+    z-index: 9999;
+    display: none;
+}
+
+.highlightedTitle {
+    height: 36px;
+    border-bottom: 1px solid #00A0E2;
+    padding-left: 18px;
+    padding-top: 14px;
+}
+
+.highlightedInfo {
+    padding-left: 10px;
+}
+
+.identLarge {
+    font-family: Helvetica Neue;
+    font-size: 24px;
+    line-height: 20px;
+    color: #002F5D;
+    color: rgb(0, 47, 93);
+    font-weight: lighter;
+}
+
+.identSmall {
+    font-family: Helvetica Neue;
+    font-size: 12px;
+    font-weight: bold;
+    line-height: 20px;
+    color: #00A0E2;
+    color: rgb(0, 160, 226);
+}
+
+.highlightedInfo {
+    padding-bottom: 12px;
+}
+
+.infoRowTitle {
+    display: inline-block;
+    width: 50%;
+}
+
+.infoRowContent {
+    display: inline-block;
+    width: 40%;
+}
+
+.infoRowFluid {
+    display: inline-block;
+}
+
+.infoRow {
+    padding-top: 10px;
+}
+
+.removePadding {
+    padding: 0;
+}
+
+.rightLink {
+    float: right;
+    padding-right: 5px;
+}
+
+.infoBlockTopSection {
+    padding-top: 14px;
+    padding-bottom: 14px;
+    padding-left: 8px;
+}
+
+.infoBlock45pxSection {
+    height: 45px;
+    line-height: 45px;
+    padding-left: 10px;
+}
+
+.infoBlockSection {
+    padding-top: 14px;
+    padding-bottom: 14px;
+    padding-left: 10px;
+}
+
+.lightGreyBackground {
+    background-color: #efefef;
+}
+
+.fourColumnSection1 {
+    width: 20%;
+}
+
+.fourColumnSection2 {
+    width: 20%;
+}
+
+.fourColumnSection3 {
+    width: 20%;
+}
+
+.fourColumnSection4 {
+    width: 20%;
+}
+
+#dump1090_infoblock {
+    font-family: Helvetica Neue;
+}
+
+.infoBlockTitleText {
+    font-weight: bold;
+    color: #002F5D;
+}
+
+.legendBox {
+    width: 15px;
+    height: 15px;
+    border: 1px solid #efefef;
+    border-radius: 4px;
+    -moz-border-radius: 4px;
+    -webkit-border-radius: 4px;
+}
+
+#adsbLegendBox {
+    background-color: #E5F6FC;
+}
+
+#mlatLegendBox {
+    background-color: #FDF2E5;
+}
+
+#otherLegendBox {
+    background-color: #E6E6E6;
+}
+
+#tisbLegendBox {
+    background-color: #CCD5DF;
+}
+
+.legendTitle {
+    /*margin-left: auto;*/
+    line-height: 19px;
+    display: inline-block;
+    padding-right: 20px;
+    padding-left: 5px;
+}
+
+#settings_infoblock {
+    position: absolute;
+    right: 1px;
+    top: 60px;
+    width: 398px;
+    min-height: 180px;
+    background: #ffffff;
+    box-shadow: 4px 4px 10px #444444;
+    padding: 20px;
+    z-index: 9999;
+    display: none;
+}
+
+.settingsColumn {
+    display: table-cell;
+    width: 199px;
+}
+.settingsOptionContainer {
+    display: table;
+    padding-bottom: 10px;
+}
+
+.settingsCheckbox {
+    width: 20px;
+    height: 11px;
+    background-image: url('images/box-empty.png');
+    background-repeat: no-repeat;
+    background-position: center;
+    cursor: pointer;
+}
+
+.settingsCheckboxChecked {
+    background-image: url('images/box-checked.png') !important;
+}
+
+.settingsCloseBox {
+    position: absolute;
+    right: 8px;
+    top: 8px;
+    background-image: url('images/close-settings.png');
+    width: 20px;
+    height: 20px;
+    cursor: pointer;
+}
+
+.settingsText {
+    line-height: 20px;
+    display: table-cell;
+}
+
+#altitude_chart {
+    float: right;
+    width: calc(100% - 5px);
+    max-width: 800px;
+    right: 5px;
+    bottom: 35px;
+    background-color: transparent !important;
+}
+
+#altitude_chart_button {
+    background-image: url('images/alt_legend_feet.svg');
+    background-size: cover;
+    background-color: transparent;
+    width: 100%;
+    height: 0;
+    padding: 0;
+    padding-bottom: calc(100% * 56 / 1815);
+}
+
+.altitudeMeters {
+    background-image: url('images/alt_legend_meters.svg') !important;
+}
+
+/* remove the blue highlighting around the map buttons */
+.ol-control button {
+    outline: none;
+}
+
+/* Retina 2x images */
+@media (-webkit-min-device-pixel-ratio: 2), (min-resolution: 192dpi) { 
+    .settingsCloseBox {
+        background-image: url('images/close-settings@2x.png');
+    }
+    .settingsCheckboxChecked {
+        background-image: url('images/box-checked@2x.png') !important;
+    }
+    .settingsCheckbox {
+        background-image: url('images/box-empty@2x.png');
+    }
+    .ol-zoom-out {
+        background-image: url("images/zoom-out@2x.png");
+    }
+    .ol-zoom-in {
+        background-image: url("images/zoom-in@2x.png");
+    }
+    #splitter {
+        background-image: url("images/column-adjust@2x.png");
+    }
+    #toggle_sidebar_button.show_sidebar {
+        background-image: url("images/table-icon@2x.png");
+    }
+    #expand_sidebar_button {
+        background-image: url("images/table-icon@2x.png");
+    }
+    #toggle_sidebar_button.hide_sidebar {
+        background-image: url("images/map-icon@2x.png");
+    }
+}
+
+/* Retina 3x images */
+@media (-webkit-min-device-pixel-ratio: 3), (min-resolution: 192dpi) { 
+    .settingsCloseBox {
+        background-image: url('images/close-settings@3x.png');
+    }
+    .settingsCheckboxChecked {
+        background-image: url('images/box-checked@3x.png') !important;
+    }
+    .settingsCheckbox {
+        background-image: url('images/box-empty@3x.png');
+    }
+    .ol-zoom-out {
+        background-image: url("images/zoom-out@3x.png");
+    }
+    .ol-zoom-in {
+        background-image: url("images/zoom-in@3x.png");
+    }
+    #splitter {
+        background-image: url("images/column-adjust@3x.png");
+    }
+    #toggle_sidebar_button.show_sidebar {
+        background-image: url("images/table-icon@3x.png");
+    }
+    #expand_sidebar_button {
+        background-image: url("images/table-icon@3x.png");
+    }
+    #toggle_sidebar_button.hide_sidebar {
+        background-image: url("images/map-icon@3x.png");
+    }
+}
\ No newline at end of file