diff --git a/essentials-framework/Essentials Core/PepperDashEssentialsBase/Bridges/JoinMaps/VideoCodecControllerJoinMap.cs b/essentials-framework/Essentials Core/PepperDashEssentialsBase/Bridges/JoinMaps/VideoCodecControllerJoinMap.cs
index 724331fb..c2d45e42 100644
--- a/essentials-framework/Essentials Core/PepperDashEssentialsBase/Bridges/JoinMaps/VideoCodecControllerJoinMap.cs	
+++ b/essentials-framework/Essentials Core/PepperDashEssentialsBase/Bridges/JoinMaps/VideoCodecControllerJoinMap.cs	
@@ -875,12 +875,11 @@ namespace PepperDash.Essentials.Core.Bridges.JoinMaps
 				JoinType = eJoinType.Digital
 			});
 
-			        // TODO: #698 Set Join number
         [JoinName("ParticipantAudioMuteToggleStart")]
         public JoinDataComplete ParticipantAudioMuteToggleStart = new JoinDataComplete(
 			new JoinData 
 			{ 
-				JoinNumber = 2001,
+				JoinNumber = 500,
 				JoinSpan = 50 
 			},
             new JoinMetadata
@@ -890,12 +889,11 @@ namespace PepperDash.Essentials.Core.Bridges.JoinMaps
                 JoinType = eJoinType.Digital
             });
 
-        // TODO: #698 Set Join number
         [JoinName("ParticipantVideoMuteToggleStart")]
         public JoinDataComplete ParticipantVideoMuteToggleStart = new JoinDataComplete(
 			new JoinData 
 			{ 
-				JoinNumber = 2101, 
+				JoinNumber = 800, 
 				JoinSpan = 50 
 			},
             new JoinMetadata
@@ -905,12 +903,11 @@ namespace PepperDash.Essentials.Core.Bridges.JoinMaps
                 JoinType = eJoinType.Digital
             });
 
-        // TODO: #698 Set Join number
         [JoinName("ParticipantPinToggleStart")]
         public JoinDataComplete ParticipantPinToggleStart = new JoinDataComplete(
 			new JoinData 
 			{ 
-				JoinNumber = 2201, 
+				JoinNumber = 1100, 
 				JoinSpan = 50 
 			},
             new JoinMetadata
@@ -2177,14 +2174,13 @@ namespace PepperDash_Essentials_Core.Bridges.JoinMaps
 				JoinType = eJoinType.Digital
 			});
 
-		// TODO: #698 Set Join number
         [JoinName("ParticipantAudioMuteToggleStart")]
         public JoinDataComplete ParticipantAudioMuteToggleStart = new JoinDataComplete(
-			new JoinData 
-			{ 
-				JoinNumber = 2001,
-				JoinSpan = 50 
-			},
+            new JoinData
+            {
+                JoinNumber = 500,
+                JoinSpan = 50
+            },
             new JoinMetadata
             {
                 Description = "Toggles the participant's audio mute status",
@@ -2192,14 +2188,13 @@ namespace PepperDash_Essentials_Core.Bridges.JoinMaps
                 JoinType = eJoinType.Digital
             });
 
-        // TODO: #698 Set Join number
         [JoinName("ParticipantVideoMuteToggleStart")]
         public JoinDataComplete ParticipantVideoMuteToggleStart = new JoinDataComplete(
-			new JoinData 
-			{ 
-				JoinNumber = 2101, 
-				JoinSpan = 50 
-			},
+            new JoinData
+            {
+                JoinNumber = 800,
+                JoinSpan = 50
+            },
             new JoinMetadata
             {
                 Description = "Toggles the participant's video mute status",
@@ -2207,14 +2202,13 @@ namespace PepperDash_Essentials_Core.Bridges.JoinMaps
                 JoinType = eJoinType.Digital
             });
 
-        // TODO: #698 Set Join number
         [JoinName("ParticipantPinToggleStart")]
         public JoinDataComplete ParticipantPinToggleStart = new JoinDataComplete(
-			new JoinData 
-			{ 
-				JoinNumber = 2201, 
-				JoinSpan = 50 
-			},
+            new JoinData
+            {
+                JoinNumber = 1100,
+                JoinSpan = 50
+            },
             new JoinMetadata
             {
                 Description = "Toggles the participant's pin status",
diff --git a/essentials-framework/Essentials Devices Common/Essentials Devices Common/VideoCodec/ZoomRoom/ZoomRoom.cs b/essentials-framework/Essentials Devices Common/Essentials Devices Common/VideoCodec/ZoomRoom/ZoomRoom.cs
index 10f5929d..5b5a2966 100644
--- a/essentials-framework/Essentials Devices Common/Essentials Devices Common/VideoCodec/ZoomRoom/ZoomRoom.cs	
+++ b/essentials-framework/Essentials Devices Common/Essentials Devices Common/VideoCodec/ZoomRoom/ZoomRoom.cs	
@@ -1727,13 +1727,13 @@ namespace PepperDash.Essentials.Devices.Common.VideoCodec.ZoomRoom
             {
                 layoutsCodec.AvailableLayoutsChanged += (o, a) =>
                 {
-                    trilist.SetBool(joinMap.LayoutGalleryIsAvailable.JoinNumber, a.AvailableLayouts 
+                    trilist.SetBool(joinMap.LayoutGalleryIsAvailable.JoinNumber, zConfiguration.eLayoutStyle.Gallery 
                         == (a.AvailableLayouts & zConfiguration.eLayoutStyle.Gallery));
-                    trilist.SetBool(joinMap.LayoutSpeakerIsAvailable.JoinNumber, a.AvailableLayouts
+                    trilist.SetBool(joinMap.LayoutSpeakerIsAvailable.JoinNumber, zConfiguration.eLayoutStyle.Speaker
                         == (a.AvailableLayouts & zConfiguration.eLayoutStyle.Speaker));
-                    trilist.SetBool(joinMap.LayoutStripIsAvailable.JoinNumber, a.AvailableLayouts
+                    trilist.SetBool(joinMap.LayoutStripIsAvailable.JoinNumber, zConfiguration.eLayoutStyle.Strip
                         == (a.AvailableLayouts & zConfiguration.eLayoutStyle.Strip));
-                    trilist.SetBool(joinMap.LayoutShareAllIsAvailable.JoinNumber, a.AvailableLayouts
+                    trilist.SetBool(joinMap.LayoutShareAllIsAvailable.JoinNumber, zConfiguration.eLayoutStyle.ShareAll
                         == (a.AvailableLayouts & zConfiguration.eLayoutStyle.ShareAll));
                 };
 
diff --git a/essentials-framework/Essentials Devices Common/Essentials Devices Common/VideoCodec/ZoomRoom/ZoomRoomJoinMap.cs b/essentials-framework/Essentials Devices Common/Essentials Devices Common/VideoCodec/ZoomRoom/ZoomRoomJoinMap.cs
index 7ceb1ba3..61a59fff 100644
--- a/essentials-framework/Essentials Devices Common/Essentials Devices Common/VideoCodec/ZoomRoom/ZoomRoomJoinMap.cs	
+++ b/essentials-framework/Essentials Devices Common/Essentials Devices Common/VideoCodec/ZoomRoom/ZoomRoomJoinMap.cs	
@@ -164,47 +164,47 @@ namespace PepperDash.Essentials.Devices.Common.VideoCodec.ZoomRoom
 				JoinType = eJoinType.Digital
 			});
 
-		[JoinName("ParticipantAudioMuteToggleStart")]
-		public JoinDataComplete ParticipantAudioMuteToggleStart = new JoinDataComplete(
-			new JoinData
-			{
-				JoinNumber = 500,
-				JoinSpan = 100
-			},
-			new JoinMetadata
-			{
-				Description = "Toggles the participant's audio mute status",
-				JoinCapabilities = eJoinCapabilities.ToSIMPL,
-				JoinType = eJoinType.Digital
-			});
+        //[JoinName("ParticipantAudioMuteToggleStart")]
+        //public JoinDataComplete ParticipantAudioMuteToggleStart = new JoinDataComplete(
+        //    new JoinData
+        //    {
+        //        JoinNumber = 500,
+        //        JoinSpan = 100
+        //    },
+        //    new JoinMetadata
+        //    {
+        //        Description = "Toggles the participant's audio mute status",
+        //        JoinCapabilities = eJoinCapabilities.ToSIMPL,
+        //        JoinType = eJoinType.Digital
+        //    });
 
-		[JoinName("ParticipantVideoMuteToggleStart")]
-		public JoinDataComplete ParticipantVideoMuteToggleStart = new JoinDataComplete(
-			new JoinData
-			{
-				JoinNumber = 800,
-				JoinSpan = 100
-			},
-			new JoinMetadata
-			{
-				Description = "Toggles the participant's video mute status",
-				JoinCapabilities = eJoinCapabilities.ToSIMPL,
-				JoinType = eJoinType.Digital
-			});
+        //[JoinName("ParticipantVideoMuteToggleStart")]
+        //public JoinDataComplete ParticipantVideoMuteToggleStart = new JoinDataComplete(
+        //    new JoinData
+        //    {
+        //        JoinNumber = 800,
+        //        JoinSpan = 100
+        //    },
+        //    new JoinMetadata
+        //    {
+        //        Description = "Toggles the participant's video mute status",
+        //        JoinCapabilities = eJoinCapabilities.ToSIMPL,
+        //        JoinType = eJoinType.Digital
+        //    });
 
-		[JoinName("ParticipantPinToggleStart")]
-		public JoinDataComplete ParticipantPinToggleStart = new JoinDataComplete(
-			new JoinData
-			{
-				JoinNumber = 1100,
-				JoinSpan = 100
-			},
-			new JoinMetadata
-			{
-				Description = "Toggles the participant's pin status",
-				JoinCapabilities = eJoinCapabilities.ToSIMPL,
-				JoinType = eJoinType.Digital
-			});
+        //[JoinName("ParticipantPinToggleStart")]
+        //public JoinDataComplete ParticipantPinToggleStart = new JoinDataComplete(
+        //    new JoinData
+        //    {
+        //        JoinNumber = 1100,
+        //        JoinSpan = 100
+        //    },
+        //    new JoinMetadata
+        //    {
+        //        Description = "Toggles the participant's pin status",
+        //        JoinCapabilities = eJoinCapabilities.ToSIMPL,
+        //        JoinType = eJoinType.Digital
+        //    });
 
 		#endregion