diff --git a/html/index.html b/html/index.html
index b356a1a..b17a26d 100644
--- a/html/index.html
+++ b/html/index.html
@@ -45,6 +45,7 @@
 				<div title="Toggle Map (B)rightness" class="button buttonHeader" onclick="toggleMapDim();"><span class="buttonText">B</span></div>
 				<div title="Toggle Trac(K) Labels" class="button buttonHeader" onclick="toggleTrackLabels();"><span class="buttonText">K</span></div>
 				<div title="Toggle (L)abels" class="button buttonHeader" onclick="toggleLabels();"><span class="buttonText">L</span></div>
+				<div title="Toggle Label Extensi(O)ns" class="button buttonHeader" onclick="toggleExtendedLabels();"><span class="buttonText">O</span></div>
 				<div title="Toggle (M)ultiSelect" class="button buttonHeader" onclick="toggleMultiSelect();"><span class="buttonText">M</span></div>
 				<div title="Follow a (R)andom plane!" class="button buttonHeader" onclick="followRandomPlane();"><span class="buttonText">R</span></div>
 				<div title="(H)ome" class="button buttonHeader" onclick="resetMap();"><span class="buttonText">Reset Map</span></div>
diff --git a/html/planeObject.js b/html/planeObject.js
index 8c30bac..48369bb 100644
--- a/html/planeObject.js
+++ b/html/planeObject.js
@@ -541,7 +541,11 @@ PlaneObject.prototype.updateIcon = function() {
 		|| (ZoomLvl >= labelZoomGround-2 && this.speed > 18)
 		|| ZoomLvl >= labelZoomGround
 	)) {
-		labelText = this.name;
+		if (extendedLabels) {
+			labelText =  Number(this.speed).toFixed(0)+ "  " + this.altitude + "\n" + this.name;
+		} else {
+			labelText = this.name;
+		}
 	}
 	var styleKey = svgKey + '!' + labelText + '!' + this.scale;
 
@@ -671,6 +675,9 @@ PlaneObject.prototype.updateData = function(receiver_timestamp, data, init) {
 		this.zIndex = this.alt_rounded;
 	}
 
+	// needed for track labels
+	this.speed = data.gs;
+
 	// don't expire the track, even display outdated track
 	if ("track" in data) {
 		this.track = data.track;
@@ -709,7 +716,6 @@ PlaneObject.prototype.updateData = function(receiver_timestamp, data, init) {
 	// simple fields
 
 	this.alt_geom = data.alt_geom;
-	this.speed = data.gs;
 	this.ias = data.ias;
 	this.tas = data.tas;
 	this.track_rate = data.track_rate;
@@ -955,7 +961,7 @@ PlaneObject.prototype.updateLines = function() {
 			seg.label.setStyle(
 				new ol.style.Style({
 					text: new ol.style.Text({
-						text: (seg.alt_real + "\n" + seg.speed),
+						text: (Number(seg.speed).toFixed(0)+ "\n" + seg.alt_real),
 						fill: new ol.style.Fill({color: 'white' }),
 						backgroundFill: new ol.style.Stroke({color: 'rgba(0,0,0,0.4'}),
 						textAlign: 'left',
diff --git a/html/script.js b/html/script.js
index 1b1f199..4be141f 100644
--- a/html/script.js
+++ b/html/script.js
@@ -35,6 +35,7 @@ var grouptype_checkbox;
 var multiSelect = false;
 var uat_data = null;
 var enableLabels = false;
+var extendedLabels = false;
 var mapIsVisible = false;
 var columnVis = Array(30).fill(true);
 var emptyStyle = new ol.style.Style({});
@@ -339,6 +340,9 @@ function initialize() {
 	if (localStorage['enableLabels'] == 'true'){
 		enableLabels = true;
 	}
+	if (localStorage['extendedLabels'] == 'true'){
+		extendedLabels = true;
+	}
 	if (localStorage['trackLabels'] == "true") {
 		trackLabels = true;
 	}
@@ -973,6 +977,9 @@ function initialize_map() {
 			case "l":
 				toggleLabels();
 				break;
+			case "o":
+				toggleExtendedLabels();
+				break;
 			case "k":
 				toggleTrackLabels();
 				break;
@@ -2189,6 +2196,13 @@ function toggleLabels() {
 		PlanesOrdered[key].updateMarker(false);
 	}
 }
+function toggleExtendedLabels() {
+	extendedLabels = !extendedLabels;
+	localStorage['extendedLabels'] = extendedLabels;
+	for (var key in PlanesOrdered) {
+		PlanesOrdered[key].updateMarker(false);
+	}
+}
 
 function toggleTrackLabels() {
 	trackLabels = !trackLabels;