diff --git a/graphics/VP1/VP1Base/src/vp13dstandardchannelsnapshotgroupbox.ui b/graphics/VP1/VP1Base/src/vp13dstandardchannelsnapshotgroupbox.ui
index 08a0d27d6e053805a99566c88565eb75dcdd7812..1cafcc5f2ac55dd2747bdf3d8b061f2ea965e69d 100644
--- a/graphics/VP1/VP1Base/src/vp13dstandardchannelsnapshotgroupbox.ui
+++ b/graphics/VP1/VP1Base/src/vp13dstandardchannelsnapshotgroupbox.ui
@@ -14,7 +14,16 @@
    <string>Form</string>
   </property>
   <layout class="QVBoxLayout">
-   <property name="margin">
+   <property name="leftMargin">
+    <number>0</number>
+   </property>
+   <property name="topMargin">
+    <number>0</number>
+   </property>
+   <property name="rightMargin">
+    <number>0</number>
+   </property>
+   <property name="bottomMargin">
     <number>0</number>
    </property>
    <item>
@@ -254,7 +263,7 @@
          </property>
          <layout class="QVBoxLayout" name="verticalLayout_2">
           <item>
-           <layout class="QGridLayout" name="gridLayout">
+           <layout class="QGridLayout" name="gridLayout11">
             <item row="0" column="1">
              <widget class="QRadioButton" name="radioButton_1080p">
               <property name="toolTip">
diff --git a/graphics/VP1/VP1Base/src/vp1customstereoeditor.ui b/graphics/VP1/VP1Base/src/vp1customstereoeditor.ui
index 10b5fa9be1072651ae38212672271478e7a055fb..f1ec670202c9a87b8b8e738994e0f7517f33cd0f 100644
--- a/graphics/VP1/VP1Base/src/vp1customstereoeditor.ui
+++ b/graphics/VP1/VP1Base/src/vp1customstereoeditor.ui
@@ -579,7 +579,6 @@ However, if you have a large scene, where you want to fly around in the scene, a
           </layout>
          </item>
         </layout>
-        <zorder></zorder>
        </widget>
       </item>
       <item>
diff --git a/graphics/VP1/VP1Systems/VP1CaloReadoutSystems/src/caloreadoutsystemcontroller.ui b/graphics/VP1/VP1Systems/VP1CaloReadoutSystems/src/caloreadoutsystemcontroller.ui
index 90d15fdb9b90dd50290bcef0571c519bbf97323f..3466608a0c4a09265c2ecb8f4e33f0ad9d1ff164 100644
--- a/graphics/VP1/VP1Systems/VP1CaloReadoutSystems/src/caloreadoutsystemcontroller.ui
+++ b/graphics/VP1/VP1Systems/VP1CaloReadoutSystems/src/caloreadoutsystemcontroller.ui
@@ -686,7 +686,7 @@
            <property name="title" >
             <string>HV Pathologic</string>
            </property>
-           <layout class="QGridLayout" name="gridLayout" >
+           <layout class="QGridLayout" name="gridLayout_7" >
             <item row="0" column="2" >
              <widget class="QLabel" name="hecLabel_2" >
               <property name="text" >
diff --git a/graphics/VP1/VP1Systems/VP1GeometrySystems/src/geometrysystemcontroller.ui b/graphics/VP1/VP1Systems/VP1GeometrySystems/src/geometrysystemcontroller.ui
index d74f4080959842d34ade939be290faccfa4285c9..6fa82999c7c745efc0d270d30cec37add12938ca 100644
--- a/graphics/VP1/VP1Systems/VP1GeometrySystems/src/geometrysystemcontroller.ui
+++ b/graphics/VP1/VP1Systems/VP1GeometrySystems/src/geometrysystemcontroller.ui
@@ -6,8 +6,8 @@
    <rect>
     <x>0</x>
     <y>0</y>
-    <width>287</width>
-    <height>646</height>
+    <width>338</width>
+    <height>822</height>
    </rect>
   </property>
   <property name="sizePolicy">
@@ -46,7 +46,16 @@
         </sizepolicy>
        </property>
        <layout class="QGridLayout" name="_19">
-        <property name="margin">
+        <property name="leftMargin">
+         <number>0</number>
+        </property>
+        <property name="topMargin">
+         <number>0</number>
+        </property>
+        <property name="rightMargin">
+         <number>0</number>
+        </property>
+        <property name="bottomMargin">
          <number>0</number>
         </property>
         <property name="spacing">
@@ -149,20 +158,38 @@
           <property name="spacing">
            <number>0</number>
           </property>
-          <property name="margin">
+          <property name="leftMargin">
+           <number>4</number>
+          </property>
+          <property name="topMargin">
+           <number>4</number>
+          </property>
+          <property name="rightMargin">
+           <number>4</number>
+          </property>
+          <property name="bottomMargin">
            <number>4</number>
           </property>
           <item>
            <layout class="QGridLayout" name="_4">
+            <property name="leftMargin">
+             <number>0</number>
+            </property>
+            <property name="topMargin">
+             <number>0</number>
+            </property>
+            <property name="rightMargin">
+             <number>0</number>
+            </property>
+            <property name="bottomMargin">
+             <number>0</number>
+            </property>
             <property name="horizontalSpacing">
              <number>6</number>
             </property>
             <property name="verticalSpacing">
              <number>0</number>
             </property>
-            <property name="margin">
-             <number>0</number>
-            </property>
             <item row="0" column="1">
              <widget class="QCheckBox" name="checkBox_SCT">
               <property name="text">
@@ -218,7 +245,16 @@
           <property name="spacing">
            <number>0</number>
           </property>
-          <property name="margin">
+          <property name="leftMargin">
+           <number>4</number>
+          </property>
+          <property name="topMargin">
+           <number>4</number>
+          </property>
+          <property name="rightMargin">
+           <number>4</number>
+          </property>
+          <property name="bottomMargin">
            <number>4</number>
           </property>
           <item>
@@ -538,7 +574,7 @@
         </widget>
        </item>
        <item>
-        <widget class="QGroupBox" name="groupBox_misc">
+        <widget class="QGroupBox" name="groupBox_fwd">
          <property name="title">
           <string>Forward Region</string>
          </property>
@@ -546,7 +582,16 @@
           <property name="spacing">
            <number>0</number>
           </property>
-          <property name="margin">
+          <property name="leftMargin">
+           <number>4</number>
+          </property>
+          <property name="topMargin">
+           <number>4</number>
+          </property>
+          <property name="rightMargin">
+           <number>4</number>
+          </property>
+          <property name="bottomMargin">
            <number>4</number>
           </property>
           <item>
@@ -602,11 +647,20 @@
          <property name="title">
           <string>Miscellaneous</string>
          </property>
-         <layout class="QVBoxLayout" name="_12">
+         <layout class="QVBoxLayout" name="_12_2">
           <property name="spacing">
            <number>0</number>
           </property>
-          <property name="margin">
+          <property name="leftMargin">
+           <number>4</number>
+          </property>
+          <property name="topMargin">
+           <number>4</number>
+          </property>
+          <property name="rightMargin">
+           <number>4</number>
+          </property>
+          <property name="bottomMargin">
            <number>4</number>
           </property>
           <item>