diff --git a/Essentials Core/PepperDashEssentialsBase/PepperDash_Essentials_Core.projectinfo b/Essentials Core/PepperDashEssentialsBase/PepperDash_Essentials_Core.projectinfo
index 748d17b0..6ce5f07e 100644
Binary files a/Essentials Core/PepperDashEssentialsBase/PepperDash_Essentials_Core.projectinfo and b/Essentials Core/PepperDashEssentialsBase/PepperDash_Essentials_Core.projectinfo differ
diff --git a/Essentials DM/Essentials_DM/Essentials_DM.projectinfo b/Essentials DM/Essentials_DM/Essentials_DM.projectinfo
index ace1a86c..dadb4199 100644
Binary files a/Essentials DM/Essentials_DM/Essentials_DM.projectinfo and b/Essentials DM/Essentials_DM/Essentials_DM.projectinfo differ
diff --git a/Essentials Devices Common/Essentials Devices Common/Essentials Devices Common.projectinfo b/Essentials Devices Common/Essentials Devices Common/Essentials Devices Common.projectinfo
index 7114a127..a5764db7 100644
Binary files a/Essentials Devices Common/Essentials Devices Common/Essentials Devices Common.projectinfo and b/Essentials Devices Common/Essentials Devices Common/Essentials Devices Common.projectinfo differ
diff --git a/Essentials/PepperDashEssentials/PepperDashEssentials.projectinfo b/Essentials/PepperDashEssentials/PepperDashEssentials.projectinfo
index 50a80eda..34f6adbc 100644
Binary files a/Essentials/PepperDashEssentials/PepperDashEssentials.projectinfo and b/Essentials/PepperDashEssentials/PepperDashEssentials.projectinfo differ
diff --git a/Essentials/PepperDashEssentials/UI Drivers/EssentialsHuddlePanelAvFunctionsDriver.cs b/Essentials/PepperDashEssentials/UI Drivers/EssentialsHuddlePanelAvFunctionsDriver.cs
index 6b391df9..cccb15a6 100644
--- a/Essentials/PepperDashEssentials/UI Drivers/EssentialsHuddlePanelAvFunctionsDriver.cs	
+++ b/Essentials/PepperDashEssentials/UI Drivers/EssentialsHuddlePanelAvFunctionsDriver.cs	
@@ -78,6 +78,11 @@ namespace PepperDash.Essentials
 		}
 		EssentialsHuddleSpaceRoom _CurrentRoom;
 
+        /// <summary>
+        /// 
+        /// </summary>
+        uint CurrentInterlockedModalJoin;
+
         /// <summary>
         /// For hitting feedback
         /// </summary>
@@ -140,6 +145,8 @@ namespace PepperDash.Essentials
 		/// </summary>
 		CTimer PowerOffTimer;
 
+        ModalDialog PowerDownModal;
+
         ModalDialog WarmingCoolingModal;
 
 		/// <summary>
@@ -338,17 +345,12 @@ namespace PepperDash.Essentials
         /// </summary>
         void ShareButtonPressed()
         {
-            //if (!_CurrentRoom.OnFeedback.BoolValue)
-            //{
-                ShareButtonSig.BoolValue = true;
-                TriList.BooleanInput[UIBoolJoin.StartPageVisible].BoolValue = false;
-                TriList.BooleanInput[UIBoolJoin.StagingPageVisible].BoolValue = true;
-                TriList.BooleanInput[UIBoolJoin.SelectASourceVisible].BoolValue = true;
-            //}
+            ShareButtonSig.BoolValue = true;
+            TriList.BooleanInput[UIBoolJoin.StartPageVisible].BoolValue = false;
+            TriList.BooleanInput[UIBoolJoin.StagingPageVisible].BoolValue = true;
+            TriList.BooleanInput[UIBoolJoin.SelectASourceVisible].BoolValue = true;
         }
 
-        uint CurrentInterlockedModalJoin;
-
         void ShowInterlockedModal(uint join)
         {
             if (CurrentInterlockedModalJoin == join)
@@ -458,8 +460,8 @@ namespace PepperDash.Essentials
 		/// </summary>
 		public void PowerButtonPressed()
 		{
-            var room = CurrentRoom;
-			if (!room.OnFeedback.BoolValue || room.ShutdownPromptTimer.IsRunningFeedback.BoolValue) 
+			if (!CurrentRoom.OnFeedback.BoolValue 
+                || CurrentRoom.ShutdownPromptTimer.IsRunningFeedback.BoolValue) 
                 return;
 
             CurrentRoom.StartShutdown(ShutdownType.Manual);
@@ -472,7 +474,6 @@ namespace PepperDash.Essentials
         /// <param name="e"></param>
         void ShutdownPromptTimer_HasStarted(object sender, EventArgs e)
         {
-            
             // Do we need to check where the UI is? No?
             var timer = CurrentRoom.ShutdownPromptTimer;
             EndMeetingButtonSig.BoolValue = true;
@@ -480,7 +481,7 @@ namespace PepperDash.Essentials
 
             if (CurrentRoom.ShutdownType == ShutdownType.Manual)
             {
-                var modal = new ModalDialog(TriList);
+                PowerDownModal = new ModalDialog(TriList);
                 var message = string.Format("Meeting will end in {0} seconds", CurrentRoom.ShutdownPromptSeconds);
 
                 // figure out a cleaner way to update gauge
@@ -498,14 +499,14 @@ namespace PepperDash.Essentials
                     if (!onFb.BoolValue)
                     {
                         EndMeetingButtonSig.BoolValue = false;
-                        modal.HideDialog();
+                        PowerDownModal.HideDialog();
                         onFb.OutputChange -= offHandler;
                         gauge.OutputChange -= gaugeHandler;
                     }
                 };
                 onFb.OutputChange += offHandler;
 
-                modal.PresentModalDialog(2, "End Meeting", "Power", message, "Cancel", "End Meeting Now", true, true,
+                PowerDownModal.PresentModalDialog(2, "End Meeting", "Power", message, "Cancel", "End Meeting Now", true, true,
                     but =>
                     {
                         if (but != 2) // any button except for End cancels
@@ -535,7 +536,10 @@ namespace PepperDash.Essentials
         void ShutdownPromptTimer_WasCancelled(object sender, EventArgs e)
         {
             Debug.Console(2, "UI shutdown prompt cancelled");
-            ShareButtonSig.BoolValue = true; // restore Share fb
+            if (PowerDownModal != null)
+                PowerDownModal.HideDialog();
+            //CurrentRoom_SyncOnFeedback();
+            //ShareButtonSig.BoolValue = true; // restore Share fb
             EndMeetingButtonSig.BoolValue = false;
         }
 
@@ -551,27 +555,6 @@ namespace PepperDash.Essentials
 			}
 		}
 
-		/// <summary>
-		/// Runs the power off function on the current room
-		/// </summary>
-        //public void FinishPowerOff()
-        //{
-        //    if (CurrentRoom == null)
-        //        return;
-        //    CurrentRoom.RunRouteAction("roomOff");
-        //    CancelPowerOff();
-        //}
-
-		/// <summary>
-		/// Hides power off pages and stops timer
-		/// </summary>
-        //void CancelPowerOff()
-        //{
-        //    CancelPowerOffTimer();
-        //    TriList.BooleanInput[UIBoolJoin.PowerOffStep1Visible].BoolValue = false;
-        //    TriList.BooleanInput[UIBoolJoin.PowerOffStep2Visible].BoolValue = false;
-        //}
-
 		/// <summary>
 		/// 
 		/// </summary>
@@ -710,9 +693,12 @@ namespace PepperDash.Essentials
             var value = _CurrentRoom.OnFeedback.BoolValue;
             Debug.Console(2, CurrentRoom, "UI: Is on event={0}", value);
             TriList.BooleanInput[UIBoolJoin.RoomIsOn].BoolValue = value;
+
             if (value) //ON
             {
                 SetupActivityFooterWhenRoomOn();
+                TriList.BooleanInput[UIBoolJoin.SelectASourceVisible].BoolValue = false;
+                TriList.BooleanInput[UIBoolJoin.StagingPageVisible].BoolValue = true;
                 TriList.BooleanInput[UIBoolJoin.StartPageVisible].BoolValue = false;
                 TriList.BooleanInput[UIBoolJoin.VolumeSingleMute1Visible].BoolValue = true;
             }
diff --git a/Release Package/PepperDashEssentials.cpz b/Release Package/PepperDashEssentials.cpz
index 0d479ce0..ea33ac22 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 e87d25c5..d2e8bfcd 100644
Binary files a/Release Package/PepperDashEssentials.dll and b/Release Package/PepperDashEssentials.dll differ