diff --git a/Essentials Devices Common/Essentials Devices Common/Essentials Devices Common.csproj b/Essentials Devices Common/Essentials Devices Common/Essentials Devices Common.csproj
index 6c43f4b5..76037968 100644
--- a/Essentials Devices Common/Essentials Devices Common/Essentials Devices Common.csproj	
+++ b/Essentials Devices Common/Essentials Devices Common/Essentials Devices Common.csproj	
@@ -46,14 +46,6 @@
     <GenerateSerializationAssemblies>off</GenerateSerializationAssemblies>
   </PropertyGroup>
   <ItemGroup>
-    <Reference Include="Cisco One Button To Push, Version=1.0.0.26373, Culture=neutral, processorArchitecture=MSIL">
-      <SpecificVersion>False</SpecificVersion>
-      <HintPath>References\Cisco One Button To Push.dll</HintPath>
-    </Reference>
-    <Reference Include="Cisco SX80 Corporate Phone Book, Version=1.0.0.15355, Culture=neutral, processorArchitecture=MSIL">
-      <SpecificVersion>False</SpecificVersion>
-      <HintPath>References\Cisco SX80 Corporate Phone Book.dll</HintPath>
-    </Reference>
     <Reference Include="Crestron.SimplSharpPro.DeviceSupport, Version=1.0.0.0, Culture=neutral, PublicKeyToken=1099c178b3b54c3b, processorArchitecture=MSIL">
       <SpecificVersion>False</SpecificVersion>
       <HintPath>..\..\..\..\..\..\..\ProgramData\Crestron\SDK\SSPDevices\Crestron.SimplSharpPro.DeviceSupport.dll</HintPath>
diff --git a/Essentials Devices Common/Essentials Devices Common/VideoCodec/CiscoCodec/CiscoCodec.cs b/Essentials Devices Common/Essentials Devices Common/VideoCodec/CiscoCodec/CiscoCodec.cs
index bd4c5505..9ce170fe 100644
--- a/Essentials Devices Common/Essentials Devices Common/VideoCodec/CiscoCodec/CiscoCodec.cs	
+++ b/Essentials Devices Common/Essentials Devices Common/VideoCodec/CiscoCodec/CiscoCodec.cs	
@@ -8,8 +8,8 @@ using Crestron.SimplSharp.CrestronXml;
 using Crestron.SimplSharp.CrestronXml.Serialization;
 //using Crestron.SimplSharpPro;
 using Newtonsoft.Json;
-using Cisco_One_Button_To_Push;
-using Cisco_SX80_Corporate_Phone_Book;
+//using Cisco_One_Button_To_Push;
+//using Cisco_SX80_Corporate_Phone_Book;
 
 using PepperDash.Core;
 using PepperDash.Essentials.Core;
diff --git a/Essentials/PepperDashEssentials/UI/JoinConstants/UIStringlJoin.cs b/Essentials/PepperDashEssentials/UI/JoinConstants/UIStringlJoin.cs
index 0a17d2a1..7aeb3feb 100644
--- a/Essentials/PepperDashEssentials/UI/JoinConstants/UIStringlJoin.cs
+++ b/Essentials/PepperDashEssentials/UI/JoinConstants/UIStringlJoin.cs
@@ -26,6 +26,10 @@ namespace PepperDash.Essentials
         public const uint VCRecentListTextStart = 1201;
 		//									RANGE IN USE
 		public const uint VCRecentListTextEnd = 1230;
+		/// <summary>
+		/// 1231 - the current layout mode
+		/// </summary>
+		public const uint VCLayoutModeText = 1231;
 
 		/// <summary>
 		/// 1301 - 1400
diff --git a/Essentials/PepperDashEssentials/UIDrivers/VC/EssentialsVideoCodecUiDriver.cs b/Essentials/PepperDashEssentials/UIDrivers/VC/EssentialsVideoCodecUiDriver.cs
index 91966613..9f1dfb2a 100644
--- a/Essentials/PepperDashEssentials/UIDrivers/VC/EssentialsVideoCodecUiDriver.cs
+++ b/Essentials/PepperDashEssentials/UIDrivers/VC/EssentialsVideoCodecUiDriver.cs
@@ -446,9 +446,20 @@ namespace PepperDash.Essentials.UIDrivers.VC
 		void SetupSelfViewControls()
 		{
 			TriList.SetSigFalseAction(UIBoolJoin.VCStagingSelfViewLayoutPress, this.ShowSelfViewLayout);
-			TriList.SetSigFalseAction(UIBoolJoin.VCSelfViewTogglePress, () => { });
-			TriList.SetSigFalseAction(UIBoolJoin.VCRemoteViewTogglePress, () => { });
-			TriList.SetSigFalseAction(UIBoolJoin.VCSelfViewPipTogglePress, () => { });
+			var svc = Codec as IHasCodecSelfview;
+			if (svc != null)
+			{
+				TriList.SetSigFalseAction(UIBoolJoin.VCSelfViewTogglePress, svc.SelfviewModeToggle);
+				svc.SelfviewIsOnFeedback.LinkInputSig(TriList.BooleanInput[UIBoolJoin.VCSelfViewTogglePress]);
+
+				//TriList.SetSigFalseAction(UIBoolJoin.VCSelfViewPipTogglePress, () => { });
+			}
+			var lc = Codec as IHasCodecLayouts;
+			if (lc != null)
+			{
+				TriList.SetSigFalseAction(UIBoolJoin.VCRemoteViewTogglePress, lc.LocalLayoutToggle);
+				lc.LocalLayoutFeedback.LinkInputSig(TriList.StringInput[UIStringJoin.VCLayoutModeText]);
+			}
 		}
 
         /// <summary>