diff --git a/TBF/TBF.csproj b/TBF/TBF.csproj
index 3729549b8..da9be45ed 100644
--- a/TBF/TBF.csproj
+++ b/TBF/TBF.csproj
@@ -1049,7 +1049,9 @@
     <Compile Include="Rig\Operations\LargeMessageBoxOp.cs" />
     <Compile Include="Rig\Operations\ReturnGivenEventOp.cs" />
     <Compile Include="Rig\Output\DB\DatabaseWriter\Factory.cs" />
-    <Compile Include="Rig\Output\DB\DatabaseWriter\WriteDBCfgCtrl.cs" />
+    <Compile Include="Rig\Output\DB\DatabaseWriter\WriteDBCfgCtrl.cs">
+      <SubType>UserControl</SubType>
+    </Compile>
     <Compile Include="Rig\Output\DB\DatabaseWriter\WriteDBCfgCtrl.designer.cs" />
     <Compile Include="Rig\Output\DB\DatabaseWriter\WriterCfg.cs" />
     <Compile Include="Rig\Output\DB\DatabaseWriter\WritingToDB.cs" />
@@ -1386,12 +1388,16 @@
     <Compile Include="Rig\RegisterReaders\GenesisRegReader\communication\Utils\SerialDriver.cs" />
     <Compile Include="Rig\RegisterReaders\GenesisRegReader\communication\Utils\SerialDriverBuilder.cs" />
     <Compile Include="Rig\RegisterReaders\GenesisRegReader\Factory.cs" />
-    <Compile Include="Rig\RegisterReaders\GenesisRegReader\GenesisHeadTestCtrl.cs" />
+    <Compile Include="Rig\RegisterReaders\GenesisRegReader\GenesisHeadTestCtrl.cs">
+      <SubType>UserControl</SubType>
+    </Compile>
     <Compile Include="Rig\RegisterReaders\GenesisRegReader\GenesisHeadTestCtrl.Designer.cs">
       <DependentUpon>GenesisHeadTestCtrl.cs</DependentUpon>
     </Compile>
     <Compile Include="Rig\RegisterReaders\GenesisRegReader\GenesisCfg.cs" />
-    <Compile Include="Rig\RegisterReaders\GenesisRegReader\GenesisCfgCtrl.cs" />
+    <Compile Include="Rig\RegisterReaders\GenesisRegReader\GenesisCfgCtrl.cs">
+      <SubType>UserControl</SubType>
+    </Compile>
     <Compile Include="Rig\RegisterReaders\GenesisRegReader\GenesisCfgCtrl.designer.cs">
       <DependentUpon>GenesisCfgCtrl.cs</DependentUpon>
     </Compile>
@@ -1410,9 +1416,13 @@
     <Compile Include="Rig\RegisterReaders\iPerlASICReader\Factory.cs" />
     <Compile Include="Rig\RegisterReaders\iPerlASICReader\implementations\IPerlASICImplHeadTestCtrl.cs" />
     <Compile Include="Rig\RegisterReaders\iPerlASICReader\implementations\SmartReader.cs" />
-    <Compile Include="Rig\RegisterReaders\iPerlASICReader\IperlASICUniHeadTestCtrl.cs" />
+    <Compile Include="Rig\RegisterReaders\iPerlASICReader\IperlASICUniHeadTestCtrl.cs">
+      <SubType>UserControl</SubType>
+    </Compile>
     <Compile Include="Rig\RegisterReaders\iPerlASICReader\IperlASICUniHeadTestCtrl.Designer.cs" />
-    <Compile Include="Rig\RegisterReaders\iPerlASICReader\IPerlUniCfgCtrl.cs" />
+    <Compile Include="Rig\RegisterReaders\iPerlASICReader\IPerlUniCfgCtrl.cs">
+      <SubType>UserControl</SubType>
+    </Compile>
     <Compile Include="Rig\RegisterReaders\iPerlASICReader\IPerlUniCfgCtrl.designer.cs" />
     <Compile Include="Rig\RegisterReaders\iPerlReaderUNI\common\IUniHeadTestCtrl.cs" />
     <Compile Include="Rig\RegisterReaders\iPerlReaderUNI\Factory.cs" />
@@ -1715,7 +1725,9 @@
     <Compile Include="Rig\TestMethods\GenesisCommunication\GenesisHead\Factory.cs" />
     <Compile Include="Rig\TestMethods\GenesisCommunication\GenesisHead\GenesisHead.cs" />
     <Compile Include="Rig\TestMethods\GenesisCommunication\GenesisHead\GenesisHeadCfg.cs" />
-    <Compile Include="Rig\TestMethods\GenesisCommunication\GenesisHead\GenesisHeadCfgCtrl.cs" />
+    <Compile Include="Rig\TestMethods\GenesisCommunication\GenesisHead\GenesisHeadCfgCtrl.cs">
+      <SubType>UserControl</SubType>
+    </Compile>
     <Compile Include="Rig\TestMethods\GenesisCommunication\GenesisHead\GenesisHeadCfgCtrl.designer.cs" />
     <Compile Include="Rig\TestMethods\GenesisCommunication\GenesisHead\OptoReceivedEventArgs.cs" />
     <Compile Include="Rig\TestMethods\GenesisCommunication\GenesisHead\OptoTelegramRaw.cs" />
@@ -1771,7 +1783,9 @@
     <Compile Include="Rig\TestMethods\iPerlCommunication\communication\Utils\ISerialDriver.cs" />
     <Compile Include="Rig\TestMethods\iPerlCommunication\communication\Utils\SerialDriver.cs" />
     <Compile Include="Rig\TestMethods\iPerlCommunication\communication\Utils\SerialDriverBuilder.cs" />
-    <Compile Include="Rig\TestMethods\iPerlCommunication\iPerlCommunicationForm.cs" />
+    <Compile Include="Rig\TestMethods\iPerlCommunication\iPerlCommunicationForm.cs">
+      <SubType>Form</SubType>
+    </Compile>
     <Compile Include="Rig\TestMethods\iPerlCommunication\iPerlCommunicationForm.designer.cs" />
     <Compile Include="Rig\TestMethods\iPerlCommunication\iPerlCommunicationParams.cs" />
     <Compile Include="Rig\TestMethods\iPerlCommunication\iPerlCommunicationSeq.cs" />
diff --git a/TBF/UI/Bench/Components/ComponentParametersDlg.cs b/TBF/UI/Bench/Components/ComponentParametersDlg.cs
index 908697976..1a0261226 100644
--- a/TBF/UI/Bench/Components/ComponentParametersDlg.cs
+++ b/TBF/UI/Bench/Components/ComponentParametersDlg.cs
@@ -189,8 +189,16 @@ namespace TBF.UI.Bench.Components
             int extraWidth = splitContainer.Panel2.Width + 40;
             int extraHeight = 80;
 
-            this.Width = desired.Width + extraWidth;
-            this.Height = desired.Height + extraHeight;
+            if (!desired.IsEmpty)
+            {
+                this.Width = desired.Width + extraWidth;
+                this.Height = desired.Height + extraHeight;
+            }
+            else
+            {
+                //this.Width += extraWidth;
+                //this.Height += extraHeight;
+            }
 
             // Do not exceed screen working area
             var screen = Screen.FromControl(this).WorkingArea;