diff --git a/html/early.js b/html/early.js
index 9d7f63b..7a5109d 100644
--- a/html/early.js
+++ b/html/early.js
@@ -12,6 +12,7 @@ let chunkNames;
 let PositionHistoryBuffer = [];
 var	receiverJson;
 let deferHistory = [];
+let historyLoaded = $.Deferred();
 let configureReceiver = $.Deferred();
 let historyTimeout = 60;
 let globeIndex = 0;
@@ -39,8 +40,10 @@ try {
     const search = new URLSearchParams(window.location.search);
     if (search.has('reset')) {
         localStorage.clear();
-        if (window.history && window.history.replaceState && window.history.replaceState("object or string", "Title", window.location.pathname))
+        if (window.history && window.history.replaceState) {
+            window.history.replaceState("object or string", "Title", window.location.pathname);
             location.reload();
+        }
     }
     const feed = search.get('feed');
     if (feed != null) {
@@ -343,10 +346,11 @@ const toggles = {};
 function Toggle(arg) {
     this.key = arg.key;
     this.state = (arg.init ? true : false);
-    this.doStuff = arg.toggle;
-    this.checkbox = '#' + this.key + '_cb';
+    this.setState = arg.setState;
+    this.checkbox = (arg.checkbox == undefined) ? ('#' + this.key + '_cb') : null;
     this.display = arg.display;
     this.container = arg.container;
+    this.button = arg.button || this.checkbox;
 
     toggles[this.key] = this;
 
@@ -354,13 +358,16 @@ function Toggle(arg) {
 }
 
 Toggle.prototype.init = function() {
-    $(this.container).append((
-        '<div class="settingsOptionContainer">'
-        + '<div class="settingsCheckbox" id="' + this.key + '_cb' + '"></div>'
-        + '<div class="settingsText">' + this.display + '</div>'
-        + '</div>'));
+    if (this.container) {
+        $(this.container).append((
+            '<div class="settingsOptionContainer">'
+            + '<div class="settingsCheckbox" id="' + this.key + '_cb' + '"></div>'
+            + '<div class="settingsText">' + this.display + '</div>'
+            + '</div>'));
+    }
 
-    $(this.checkbox).on('click', this.toggle.bind(this));
+    if (this.button)
+        $(this.button).on('click', this.toggle.bind(this));
 
     if (localStorage[this.key] == 'true')
         this.state = true;
@@ -380,19 +387,27 @@ Toggle.prototype.toggle = function(override) {
 
     if (this.state == false) {
         localStorage[this.key] = 'false';
-        $(this.checkbox).removeClass('settingsCheckboxChecked');
+        if (this.checkbox)
+            $(this.checkbox).removeClass('settingsCheckboxChecked');
     }
     if (this.state == true) {
         localStorage[this.key] = 'true';
-        $(this.checkbox).addClass('settingsCheckboxChecked');
+        if (this.checkbox)
+            $(this.checkbox).addClass('settingsCheckboxChecked');
     }
 
-    if (this.doStuff)
-        this.doStuff(this.state);
+    if (this.setState)
+        this.setState(this.state);
 }
 
-Toggle.prototype.hide = function () {
-    $(this.checkbox).parent().hide();
+Toggle.prototype.restore = function () {
+    if (this.setState)
+        this.setState(this.state);
+}
+
+Toggle.prototype.hideCheckbox = function () {
+    if (this.checkbox)
+        $(this.checkbox).parent().hide();
 }
 
 // Set the name of the hidden property and the change event for visibility
diff --git a/html/index.html b/html/index.html
index ff1b005..87e5b19 100644
--- a/html/index.html
+++ b/html/index.html
@@ -779,7 +779,7 @@
         </div>
       </div> <!-- map_container-->
 
-      <div id="sidebar_container">
+      <div id="sidebar_container" style="display: none">
         <div id="splitter" class="ui-resizable-handle ui-resizable-w"></div>
         <div id="sidebar_canvas">
 
diff --git a/html/script.js b/html/script.js
index 7eb33f8..7017696 100644
--- a/html/script.js
+++ b/html/script.js
@@ -53,7 +53,6 @@ let debugJump = false;
 let jumpTo = null;
 let noMLAT = false;
 let noVanish = false;
-let sidebarVisible = true;
 let filterTracks = false;
 let refreshId = 0;
 let globeIndexGrid = 0;
@@ -634,16 +633,6 @@ function initialize() {
         buttonActive('#P', noVanish);
     }
 
-    $.when(configureReceiver, heatmapDefer).done(function() {
-        configureReceiver = null;
-
-        // Initialize stuff
-        init_page();
-
-        // Wait for history item downloads and append them to the buffer
-        push_history();
-    });
-
     let coll = document.getElementsByClassName("collapseButton");
 
     for (let i = 0; i < coll.length; i++) {
@@ -658,9 +647,21 @@ function initialize() {
         });
     }
 
+    $.when(configureReceiver, heatmapDefer).done(function() {
+        configureReceiver = null;
+
+        // Initialize stuff
+        initPage();
+
+        // Wait for history item downloads and append them to the buffer
+        push_history();
+        $.when(historyLoaded).done(function() {
+            startPage();
+        });
+    });
 }
 
-function init_page() {
+function initPage() {
     // Set page basics
     document.title = PageName;
 
@@ -685,7 +686,7 @@ function init_page() {
         localStorage['sidebar_width'] = $('#sidebar_container').width();
         $('#sidebar_container').width(localStorage['sidebar_width']);
     });
-    
+
     if (localStorage['sidebar_width'] != null)
         $('#sidebar_container').width(localStorage['sidebar_width']);
     else
@@ -742,7 +743,6 @@ function init_page() {
     });
 
     // Set up event handlers for buttons
-    $("#toggle_sidebar_button").click(toggleSidebarVisibility);
     $("#expand_sidebar_button").click(expandSidebar);
     $("#shrink_sidebar_button").click(showMap);
 
@@ -809,7 +809,7 @@ function init_page() {
         display: "Last Leg only",
         container: "#settingsLeft",
         init: true,
-        toggle: function(state) {
+        setState: function(state) {
             lastLeg = state;
             if (SelectedPlane && !showTrace)
                 SelectedPlane.processTrace();
@@ -839,7 +839,7 @@ function init_page() {
         display: "Debug Tracks",
         container: "#settingsLeft",
         init: false,
-        toggle: function(state) {
+        setState: function(state) {
             debugTracks = state;
             remakeTrails();
         }
@@ -850,7 +850,7 @@ function init_page() {
         display: "Debug show all",
         container: "#settingsLeft",
         init: false,
-        toggle: function(state) {
+        setState: function(state) {
             if (state)
                 debugAll = true;
             else
@@ -863,7 +863,7 @@ function init_page() {
         display: "Colored Planes",
         container: "#settingsRight",
         init: true,
-        toggle: function(state) {
+        setState: function(state) {
             if (state)
                 monochromeMarkers = null;
             else
@@ -878,7 +878,7 @@ function init_page() {
         display: "Colored Trails",
         container: "#settingsRight",
         init: true,
-        toggle: function(state) {
+        setState: function(state) {
             if (state)
                 monochromeTracks = null;
             else
@@ -888,6 +888,29 @@ function init_page() {
         }
     });
 
+    new Toggle({
+        key: "sidebar_visible",
+        display: "Sidebar visible",
+        container: null,
+        checkbox: null,
+        button: '#toggle_sidebar_button',
+        init: (onMobile ? false : true),
+        setState: function (state) {
+            if (state) {
+                $("#sidebar_container").show();
+                $("#expand_sidebar_control").show();
+                $("#toggle_sidebar_button").removeClass("show_sidebar");
+                $("#toggle_sidebar_button").addClass("hide_sidebar");
+            } else {
+                $("#sidebar_container").hide();
+                $("#expand_sidebar_control").hide();
+                $("#toggle_sidebar_button").removeClass("hide_sidebar");
+                $("#toggle_sidebar_button").addClass("show_sidebar");
+            }
+            updateMapSize();
+        },
+    });
+
     $('#selectall_checkbox').on('click', function() {
         if ($('#selectall_checkbox').hasClass('settingsCheckboxChecked')) {
             deselectAllPlanes();
@@ -904,8 +927,41 @@ function init_page() {
 
     filterGroundVehicles(false);
     filterBlockedMLAT(false);
-    
+
     TAR.altitudeChart.init();
+
+    if (adsbexchange) {
+        $('#adsbexchange_header').show();
+        if (window.self != window.top) {
+            window.top.location.href = "https://www.adsbexchange.com/"
+            return;
+        }
+    }
+
+    initMap();
+
+    if (!globeIndex) {
+        $('#show_trace').hide();
+    }
+    if (globeIndex) {
+        $('#V').hide();
+        $('#uat_legend_2').hide();
+        $('#mode_s_legend_2').hide();
+    } else {
+        $('#unknown_legend_2').hide();
+        $('#sat_legend_2').hide();
+    }
+
+    if (hideButtons) {
+        $('#large_mode_control').hide();
+        $('#header_top').hide();
+        $('#header_side').hide();
+        $('#splitter').hide();
+        $('#jumpSearch').hide();
+        $('#filterButton').hide();
+        $('.ol-control').hide();
+        $('.ol-attribution').show();
+    }
 }
 
 function push_history() {
@@ -914,9 +970,9 @@ function push_history() {
         push_history_item(i);
     }
     if (globeIndex) {
-        parse_history();
+        parseHistory();
     } else if (!nHistoryItems) {
-        parse_history();
+        parseHistory();
         console.log("History loading failed");
     }
 }
@@ -942,7 +998,7 @@ function push_history_item(i) {
             $("#loader_progress").attr('value',HistoryItemsReturned);
             HistoryItemsReturned++;
             if (HistoryItemsReturned == nHistoryItems) {
-                parse_history();
+                parseHistory();
             }
         })
 
@@ -953,20 +1009,12 @@ function push_history_item(i) {
             //console.log(error);
             HistoryItemsReturned++;
             if (HistoryItemsReturned == nHistoryItems) {
-                parse_history();
+                parseHistory();
             }
         });
 }
 
-function parse_history() {
-
-    if (adsbexchange) {
-        $('#adsbexchange_header').show();
-        if (window.self != window.top) {
-            window.top.location.href = "https://www.adsbexchange.com/"
-            return;
-        }
-    }
+function parseHistory() {
     if (nHistoryItems) {
         console.timeEnd("Downloaded History");
         console.time("Loaded aircraft tracks from History");
@@ -975,7 +1023,6 @@ function parse_history() {
     for (let i in deferHistory)
         deferHistory[i] = null;
 
-    initialize_map();
 
     if (PositionHistoryBuffer.length > 0) {
 
@@ -1049,10 +1096,11 @@ function parse_history() {
     if (nHistoryItems)
         console.timeEnd("Loaded aircraft tracks from History");
 
-    console.log("Completing init");
+    historyLoaded.resolve();
+}
 
-    refreshSelected();
-    refreshHighlighted();
+function startPage() {
+    console.log("Completing init");
 
     // Setup our timer to poll from the server.
     window.setInterval(reaper, 20000);
@@ -1092,41 +1140,8 @@ function parse_history() {
         play(); // kick off first play
     }
 
-    if (!globeIndex) {
-        $('#show_trace').hide();
-    }
-    if (globeIndex) {
-        $('#V').hide();
-        $('#uat_legend_2').hide();
-        $('#mode_s_legend_2').hide();
-    } else {
-        $('#unknown_legend_2').hide();
-        $('#sat_legend_2').hide();
-    }
-
-    updateMapSize();
-
     loadFinished = true;
 
-    //drawAlt();
-
-    if (localStorage['sidebar_visible'] == "false")
-        toggleSidebarVisibility();
-
-    if (onMobile && localStorage['sidebar_visible'] == undefined)
-        toggleSidebarVisibility();
-
-    if (hideButtons) {
-        $('#large_mode_control').hide();
-        $('#header_top').hide();
-        $('#header_side').hide();
-        $('#splitter').hide();
-        $('#jumpSearch').hide();
-        $('#filterButton').hide();
-        $('.ol-control').hide();
-        $('.ol-attribution').show();
-    }
-
     if (tempTrails)
         selectAllPlanes();
 
@@ -1134,6 +1149,9 @@ function parse_history() {
 
     if (!heatmap)
         $("#loader").addClass("hidden");
+
+    refreshSelected();
+    refreshHighlighted();
 }
 
 //
@@ -1179,7 +1197,7 @@ function parse_history() {
 
 
 // Initalizes the map and starts up our timers to call various functions
-function initialize_map() {
+function initMap() {
     if (receiverJson && receiverJson.lat != null) {
         SiteLat = receiverJson.lat;
         SiteLon = receiverJson.lon;
@@ -1391,7 +1409,7 @@ function initialize_map() {
         display: "Dim Map",
         container: "#settingsLeft",
         init: true,
-        toggle: function(state) {
+        setState: function(state) {
             if (!state) {
                 ol.control.LayerSwitcher.forEachRecursive(layers_group, function(lyr) {
                     if (lyr.get('type') != 'base')
@@ -1511,8 +1529,7 @@ function initialize_map() {
                     $('#filterButton').show();
                     $('.ol-control').show();
                     $('#expand_sidebar_control').hide();
-                    toggleSidebarVisibility();
-                    toggleSidebarVisibility();
+                    toggles['sidebar_visible'].restore();
                     TAR.altitudeChart.render();
                 }
                 hideButtons = !hideButtons;
@@ -2147,7 +2164,7 @@ function refreshFeatures() {
         sort: function () { sortBy('speed', compareNumeric, function(x) { return x.gs; }); },
         value: function(plane) { return format_speed_brief(plane.gs, DisplayUnits); },
         align: 'right',
-        header: function () { return 'Speed(' + get_unit_label("speed", DisplayUnits) + ')';},
+        header: function () { return 'Spd(' + get_unit_label("speed", DisplayUnits) + ')';},
     };
     cols.vert_rate = {
         text: 'Vertical Rate',
@@ -2307,6 +2324,7 @@ function refreshFeatures() {
             lastRenderExtent = myExtent(OLMap.getView().calculateExtent(size));
         }
 
+        const sidebarVisible = toggles['sidebar_visible'].state;
         for (let i = 0; i < PlanesOrdered.length; ++i) {
             const plane = PlanesOrdered[i];
 
@@ -2565,7 +2583,7 @@ function refreshFeatures() {
                 display: col.text,
                 container: container,
                 init: col.visible,
-                toggle: function (state) {
+                setState: function (state) {
                     planesTable.setColumnVis(col.id, state);
                 }
             });
@@ -2758,18 +2776,8 @@ function resetMap() {
 }
 
 function updateMapSize() {
-    OLMap.updateSize();
-}
-
-function toggleSidebarVisibility(e) {
-    if (e)
-        e.preventDefault();
-    $("#sidebar_container").toggle();
-    $("#expand_sidebar_control").toggle();
-    $("#toggle_sidebar_button").toggleClass("show_sidebar");
-    $("#toggle_sidebar_button").toggleClass("hide_sidebar");
-    localStorage['sidebar_visible'] = sidebarVisible = $("#sidebar_container").is(":visible");
-    updateMapSize();
+    if (OLMap)
+        OLMap.updateSize();
 }
 
 function expandSidebar(e) {
@@ -3063,7 +3071,7 @@ function dim(evt) {
             display: "Altitude Chart",
             container: "#settingsLeft",
             init: (onMobile ? false : true),
-            toggle: altitudeChart.render
+            setState: altitudeChart.render
         });
     }
 
@@ -3860,7 +3868,6 @@ function inView(pos, ex) {
     //console.log((currExtent[2]-currExtent[0])/40075016);
     //console.log([bottomLeft[0], topRight[0]]);
     //console.log([bottomLeft[1], topRight[1]]);
-    //sidebarVisible = $("#sidebar_container").is(":visible");
     //const proj = ol.proj.fromLonLat(pos);
     if (lat < ex.minLat || lat > ex.maxLat)
         return false;