diff --git a/html/images/settings-icon.png b/html/images/settings-icon.png
index 2f95e58..ea62953 100644
Binary files a/html/images/settings-icon.png and b/html/images/settings-icon.png differ
diff --git a/html/index.html b/html/index.html
index 64fa601..26a9305 100644
--- a/html/index.html
+++ b/html/index.html
@@ -594,24 +594,27 @@
 				<div id="altitude_chart" class="ol-unselectable ol-control altitudeFeet">
 					<button id="altitude_chart_button"></button>
 				</div>
-				<div id="header" class="infoHeading">
+				<div id="header_top" class="infoHeading">
+					<div class="buttonContainer">
+						<span title="(H)ome" class="button buttonHeader" onclick="resetMap();"><span class="buttonText">H</span></span>
+						<span title="All (T)racks" class="button buttonHeader" onclick="selectAllPlanes();"><span class="buttonText">T</span></span>
+					</div>
+				</div>
+				<div id="header_side" class="infoHeading">
 					<div class="buttonContainer">
 						<div id="settingsCog" class="settingsContainer"></div>
-						<div title="(H)ome" class="button buttonHeader" onclick="resetMap();"><span class="buttonText">H</span></div>
-						<div title="Toggle Map (B)rightness" class="button buttonHeader" onclick="toggleMapDim();"><span class="buttonText">B</span></div>
-						<div title="Table: only show aircraft in current (V)iew" class="button buttonHeader" onclick="toggleTableInView();"><span class="buttonText">V</span></div>
-						<div class="buttonSpacer">
-						</div>
-						<div title="All (T)racks" class="button buttonHeader" onclick="selectAllPlanes();"><span class="buttonText">T</span></div>
-						<div title= "(C)lear tracks"class="button buttonHeader" onclick="deselectAllPlanes();"><span class="buttonText">C</span></div>
-						<div title="Toggle (M)ultiSelect" class="button buttonHeader" onclick="toggleMultiSelect();"><span class="buttonText">M</span></div>
-						<div class="buttonSpacer">
-						</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 Trac(K) Labels" class="button buttonHeader" onclick="toggleTrackLabels();"><span class="buttonText">K</span></div>
 						<div class="buttonSpacer">
 						</div>
+						<div title="Toggle Map (B)rightness" class="button buttonHeader" onclick="toggleMapDim();"><span class="buttonText">B</span></div>
+						<div class="buttonSpacer">
+						</div>
+						<div title="Table: only show aircraft in current (V)iew" class="button buttonHeader" onclick="toggleTableInView();"><span class="buttonText">V</span></div>
+						<div title="Toggle (M)ultiSelect" class="button buttonHeader" onclick="toggleMultiSelect();"><span class="buttonText">M</span></div>
+						<div class="buttonSpacer">
+						</div>
 						<div title="Follow a (R)andom plane!" class="button buttonHeader" onclick="followRandomPlane();"><span class="buttonText">R</span></div>
 						<div title="(F)ollow" class="button buttonHeader" onclick="toggleFollowSelected();"><span class="buttonText">F</span></div>
 					</div>
diff --git a/html/planeObject.js b/html/planeObject.js
index a45afa2..ac7b8a5 100644
--- a/html/planeObject.js
+++ b/html/planeObject.js
@@ -150,6 +150,10 @@ PlaneObject.prototype.isFiltered = function() {
 		return true;
 	}
 
+	if (filterTISB && this.dataSource == "tisb") {
+		return true;
+	}
+
 	if (this.filter.minAltitude != undefined && this.filter.maxAltitude != undefined) {
 		if (this.altitude == null) {
 			return true;
diff --git a/html/script.js b/html/script.js
index 999ddbd..b264b87 100644
--- a/html/script.js
+++ b/html/script.js
@@ -43,6 +43,7 @@ var show_squawk_warning_cache = false;
 var tableInView = false;
 var historyOutdated = false;
 var filterMLAT = false;
+var filterTISB = false;
 var sidebar_width = 450;
 
 var SpecialSquawks = {
@@ -1042,6 +1043,9 @@ function initialize_map() {
 			case "M":
 				toggleFilterMLAT();
 				break;
+			case "T":
+				toggleFilterTISB();
+				break;
 			case "k":
 				toggleTrackLabels();
 				break;
@@ -2361,6 +2365,10 @@ function toggleLabels() {
 }
 function toggleExtendedLabels() {
 	extendedLabels = !extendedLabels;
+	if (extendedLabels && !enableLabels) {
+		enableLabels = true;
+		localStorage['enableLabels'] = enableLabels;
+	}
 	localStorage['extendedLabels'] = extendedLabels;
 	for (var key in PlanesOrdered) {
 		PlanesOrdered[key].updateMarker(false);
@@ -2370,6 +2378,10 @@ function toggleFilterMLAT() {
 	filterMLAT = !filterMLAT;
 }
 
+function toggleFilterTISB() {
+	filterTISB = !filterTISB;
+}
+
 function toggleTrackLabels() {
 	trackLabels = !trackLabels;
 	localStorage['trackLabels'] = trackLabels;
diff --git a/html/style.css b/html/style.css
index d58820f..00d8370 100644
--- a/html/style.css
+++ b/html/style.css
@@ -50,7 +50,7 @@ html, body {
 #toggle_sidebar_control {
     display: block;
     position: absolute;
-    top: 6px;
+    top: 3px;
     right: 0px;
 }
 
@@ -77,7 +77,7 @@ html, body {
 #expand_sidebar_control {
     display: block;
     position: absolute;
-    top: 60px;
+    top: 55px;
     right: 0px;
 }
 
@@ -91,9 +91,6 @@ html, body {
     background-position: 0px;
     background-color: transparent;
     border: none;
-}
-
-#expand_sidebar_button {
     background-image: url("images/show_sidebar_active_48x40.png");
 }
 
@@ -102,12 +99,12 @@ html, body {
     cursor: ew-resize;
     display: block;
     position: absolute;
-    top: 110px;
-    left: -24px;
+    top: 108px;
+    left: -30px;
     float: right;
-    width: 24px;
-    height: 25px;
-    background-size: 24px 25px;
+    width: 30px;
+    height: 30px;
+    background-size: 30px 30px;
     background-repeat: no-repeat;
     background-position: 0px;
     background-color: transparent;
@@ -202,7 +199,7 @@ div#loader { z-index: 99; position: absolute; left: 0; top: 0; bottom: 0; right:
 }
 
 .aircraft_table_header { 
-    background-color: #003f4b;
+    background-color: #00596b;
     color: #FFFFFF;
     cursor: pointer;
 }
@@ -260,9 +257,8 @@ select.error, textarea.error, input.error {
 }
 
 .layer-switcher {
-    top: 8px !important;
-    bottom: auto !important;
-    right: 48px !important;
+    top: 3px !important;
+    right: 47px !important;
 }
 
 /* new css */
@@ -366,13 +362,22 @@ select.error, textarea.error, input.error {
     text-decoration: underline;
 }
 
-#header {
+#header_side {
 	position: absolute;
 	right: 0px;
-	top: 130px;
+	top: 140px;
     width: 30pt;
     height: 100%;
-    z-index: 99999;
+    z-index: 9;
+}
+#header_top {
+	text-align: right;
+	position: absolute;
+	right: 90px;
+	top: 0px;
+    width: 100%;
+    height: 30pt;
+    z-index: 9;
 }
 
 .adsbLogo {
@@ -386,12 +391,10 @@ select.error, textarea.error, input.error {
 }
 
 .buttonContainer {
-    margin-top: 2pt;
-    margin-bottom: 2pt;
+	margin: 2pt;
 }
 .buttonSpacer {
-    margin-top: 6pt;
-    margin-bottom: 6pt;
+	margin: 6pt;
 }
 
 .buttonText
@@ -406,7 +409,7 @@ select.error, textarea.error, input.error {
 }
 
 .button {
-    background: #67b6c3;
+    background-color: #00596b;
     width: 22pt;
     height: 22pt;
     border-radius: 2px;
@@ -414,8 +417,6 @@ select.error, textarea.error, input.error {
     -webkit-border-radius: 2px;
     display: inline-block;
 	margin: 4pt;
-	margin-top: 8pt;
-	margin-bottom: 8pt;
     cursor: pointer;
     text-align: center;
 }
@@ -454,7 +455,7 @@ select.error, textarea.error, input.error {
 	margin: 4pt;
 	margin-top: 8pt;
 	margin-bottom: 8pt;
-    background-image: url('images/settings-icon@2x.png');
+    background-image: url('images/settings-icon.png');
     background-size: 22pt;
     background-repeat: no-repeat;
     background-position: center;