diff --git a/Essentials/PepperDashEssentials/ControlSystem.cs b/Essentials/PepperDashEssentials/ControlSystem.cs
index 79034231..82a35bd0 100644
--- a/Essentials/PepperDashEssentials/ControlSystem.cs
+++ b/Essentials/PepperDashEssentials/ControlSystem.cs
@@ -34,6 +34,9 @@ namespace PepperDash.Essentials
 		{
             DeterminePlatform();
 
+            CrestronConsole.AddNewConsoleCommand(s => GoWithLoad(), "go", "Loads configuration file",
+                ConsoleAccessLevelEnum.AccessOperator);
+
             CrestronConsole.AddNewConsoleCommand(s =>
             {
                 foreach (var tl in TieLineCollection.Default)
@@ -56,7 +59,7 @@ namespace PepperDash.Essentials
 						"Template URL: {1}", ConfigReader.ConfigObject.SystemUrl, ConfigReader.ConfigObject.TemplateUrl);
 				}, "portalinfo", "Shows portal URLS from configuration", ConsoleAccessLevelEnum.AccessOperator);
 
-            GoWithLoad();
+            //GoWithLoad();
 		}
 
         /// <summary>
diff --git a/Essentials/PepperDashEssentials/Factory/UiDeviceFactory.cs b/Essentials/PepperDashEssentials/Factory/UiDeviceFactory.cs
index ac7fec1a..fad2ce93 100644
--- a/Essentials/PepperDashEssentials/Factory/UiDeviceFactory.cs
+++ b/Essentials/PepperDashEssentials/Factory/UiDeviceFactory.cs
@@ -36,12 +36,13 @@ namespace PepperDash.Essentials
                     var room = DeviceManager.GetDeviceForKey(props.DefaultRoomKey);
                     if (room is EssentialsHuddleSpaceRoom)
                     {
-                        Debug.Console(0, panelController, "Adding huddle space AV driver");
 
                         // Header Driver
+                        Debug.Console(0, panelController, "Adding header driver");
                         mainDriver.HeaderDriver = new EssentialsHeaderDriver(mainDriver, props);
                         
                         // AV Driver
+                        Debug.Console(0, panelController, "Adding huddle space AV driver");
                         var avDriver = new EssentialsHuddlePanelAvFunctionsDriver(mainDriver, props);
                         avDriver.CurrentRoom = room as EssentialsHuddleSpaceRoom;
                         avDriver.DefaultRoomKey = props.DefaultRoomKey;
@@ -54,6 +55,8 @@ namespace PepperDash.Essentials
                             mainDriver.EnvironmentDriver = new EssentialsEnvironmentDriver(mainDriver, props);
                         }
 
+                        mainDriver.HeaderDriver.SetupHeaderButtons(avDriver, avDriver.CurrentRoom);
+
                         panelController.LoadAndShowDriver(mainDriver);  // This is a little convoluted.
 
                         if (panelController.Panel is TswFt5ButtonSystem)
@@ -110,6 +113,8 @@ namespace PepperDash.Essentials
                             mainDriver.EnvironmentDriver = new EssentialsEnvironmentDriver(mainDriver, props);
                         }
 
+                        mainDriver.HeaderDriver.SetupHeaderButtons(avDriver, avDriver.CurrentRoom);
+
                         panelController.LoadAndShowDriver(mainDriver);  // This is a little convoluted.
 
                         if (panelController.Panel is TswFt5ButtonSystem)
diff --git a/Essentials/PepperDashEssentials/UIDrivers/Essentials/EssentialsEnvironmentDriver.cs b/Essentials/PepperDashEssentials/UIDrivers/Essentials/EssentialsEnvironmentDriver.cs
index 4c9026ea..6096e2dc 100644
--- a/Essentials/PepperDashEssentials/UIDrivers/Essentials/EssentialsEnvironmentDriver.cs
+++ b/Essentials/PepperDashEssentials/UIDrivers/Essentials/EssentialsEnvironmentDriver.cs
@@ -23,4 +23,6 @@ namespace PepperDash.Essentials
         }
 
     }
+
+    
 }
\ No newline at end of file
diff --git a/Essentials/PepperDashEssentials/UIDrivers/Essentials/EssentialsHeaderDriver.cs b/Essentials/PepperDashEssentials/UIDrivers/Essentials/EssentialsHeaderDriver.cs
index 211b9894..c08a31ba 100644
--- a/Essentials/PepperDashEssentials/UIDrivers/Essentials/EssentialsHeaderDriver.cs
+++ b/Essentials/PepperDashEssentials/UIDrivers/Essentials/EssentialsHeaderDriver.cs
@@ -105,7 +105,8 @@ namespace PepperDash.Essentials
                 TriList.SetString(nextJoin, "Lights");
                 TriList.SetSigFalseAction(nextJoin, environmentDriver.Show);
 
-                return nextJoin--;
+                nextJoin--;
+                return nextJoin;
             }
             else
                 return nextJoin;
@@ -119,7 +120,8 @@ namespace PepperDash.Essentials
                 TriList.SetString(nextJoin, "Calendar");
                 TriList.SetSigFalseAction(nextJoin, avDriver.CalendarPress);
 
-                return nextJoin--;
+                nextJoin--;
+                return nextJoin;
             }
             else
                 return nextJoin;
@@ -132,7 +134,8 @@ namespace PepperDash.Essentials
             TriList.SetSigFalseAction(nextJoin, avDriver.ShowActiveCallsList);
             HeaderCallButtonIconSig = TriList.StringInput[nextJoin];
 
-            return nextJoin--;
+            nextJoin--;
+            return nextJoin;
         }
 
         /// <summary>
@@ -182,10 +185,8 @@ namespace PepperDash.Essentials
         /// <summary>
         /// Sets up Header Buttons for the EssentialsHuddleVtc1Room type
         /// </summary>
-        public void SetupHeaderButtons(EssentialsHuddleVtc1Room currentRoom)
+        public void SetupHeaderButtons(EssentialsHuddleVtc1PanelAvFunctionsDriver avDriver, EssentialsHuddleVtc1Room currentRoom)
         {
-            var avDriver = Parent.AvDriver as EssentialsHuddleVtc1PanelAvFunctionsDriver;
-
             HeaderButtonsAreSetUp = false;
 
             TriList.SetBool(UIBoolJoin.TopBarHabaneroDynamicVisible, true);
@@ -214,6 +215,7 @@ namespace PepperDash.Essentials
             TriList.SetSigFalseAction(UIBoolJoin.HeaderCallStatusLabelPress, avDriver.ShowActiveCallsList);
 
             // Set Call Status Subpage Position
+#warning may need to add a new position when environment icon is displayed
 
             if (nextJoin == 3951)
             {
@@ -236,11 +238,8 @@ namespace PepperDash.Essentials
         /// <summary>
         /// Sets up Header Buttons for the EssentialsHuddleSpaceRoom type
         /// </summary>
-        public void SetupHeaderButtons(EssentialsHuddleSpaceRoom currentRoom)
+        public void SetupHeaderButtons(EssentialsHuddlePanelAvFunctionsDriver avDriver, EssentialsHuddleSpaceRoom currentRoom)
         {
-#warning This is returning avDriver as null
-            var avDriver = Parent.AvDriver as EssentialsHuddlePanelAvFunctionsDriver;
-
             HeaderButtonsAreSetUp = false;
 
             TriList.SetBool(UIBoolJoin.TopBarHabaneroDynamicVisible, true);
diff --git a/Essentials/PepperDashEssentials/UIDrivers/EssentialsHuddle/EssentialsHuddlePanelAvFunctionsDriver.cs b/Essentials/PepperDashEssentials/UIDrivers/EssentialsHuddle/EssentialsHuddlePanelAvFunctionsDriver.cs
index b7e1c203..589cf734 100644
--- a/Essentials/PepperDashEssentials/UIDrivers/EssentialsHuddle/EssentialsHuddlePanelAvFunctionsDriver.cs
+++ b/Essentials/PepperDashEssentials/UIDrivers/EssentialsHuddle/EssentialsHuddlePanelAvFunctionsDriver.cs
@@ -808,7 +808,7 @@ namespace PepperDash.Essentials
 				_CurrentRoom.CurrentSingleSourceChange += CurrentRoom_SourceInfoChange;
 				RefreshSourceInfo();
 
-                (Parent as EssentialsPanelMainInterfaceDriver).HeaderDriver.SetupHeaderButtons(CurrentRoom);
+                (Parent as EssentialsPanelMainInterfaceDriver).HeaderDriver.SetupHeaderButtons(this, CurrentRoom);
             }
 			else
 			{
diff --git a/Essentials/PepperDashEssentials/UIDrivers/EssentialsHuddleVTC/EssentialsHuddleVtc1PanelAvFunctionsDriver.cs b/Essentials/PepperDashEssentials/UIDrivers/EssentialsHuddleVTC/EssentialsHuddleVtc1PanelAvFunctionsDriver.cs
index 06845ede..6a381703 100644
--- a/Essentials/PepperDashEssentials/UIDrivers/EssentialsHuddleVTC/EssentialsHuddleVtc1PanelAvFunctionsDriver.cs
+++ b/Essentials/PepperDashEssentials/UIDrivers/EssentialsHuddleVTC/EssentialsHuddleVtc1PanelAvFunctionsDriver.cs
@@ -942,7 +942,7 @@ namespace PepperDash.Essentials
 
                 TriList.SetSigFalseAction(UIBoolJoin.CallStopSharingPress, () => _CurrentRoom.RunRouteAction("codecOsd"));
 
-                (Parent as EssentialsPanelMainInterfaceDriver).HeaderDriver.SetupHeaderButtons(CurrentRoom);
+                (Parent as EssentialsPanelMainInterfaceDriver).HeaderDriver.SetupHeaderButtons(this, CurrentRoom);
             }
             else
             {
diff --git a/Release Package/PepperDashEssentials.cpz b/Release Package/PepperDashEssentials.cpz
index d4be998e..7627ed8c 100644
Binary files a/Release Package/PepperDashEssentials.cpz and b/Release Package/PepperDashEssentials.cpz differ
diff --git a/Release Package/PepperDashEssentials.dll b/Release Package/PepperDashEssentials.dll
index a08723cc..d6bd8645 100644
Binary files a/Release Package/PepperDashEssentials.dll and b/Release Package/PepperDashEssentials.dll differ