Index: src/qt-console/status/storstat.ui
===================================================================
--- src/qt-console/status/storstat.ui	(revision 7352)
+++ src/qt-console/status/storstat.ui	(working copy)
@@ -5,14 +5,20 @@
    <rect>
     <x>0</x>
     <y>0</y>
-    <width>367</width>
-    <height>310</height>
+    <width>386</width>
+    <height>327</height>
    </rect>
   </property>
   <property name="windowTitle" >
    <string>Form</string>
   </property>
   <layout class="QGridLayout" >
+   <property name="margin" >
+    <number>9</number>
+   </property>
+   <property name="spacing" >
+    <number>6</number>
+   </property>
    <item row="0" column="0" >
     <widget class="QSplitter" name="splitter" >
      <property name="orientation" >
@@ -27,6 +33,12 @@
         <string>Header</string>
        </attribute>
        <layout class="QGridLayout" >
+        <property name="margin" >
+         <number>9</number>
+        </property>
+        <property name="spacing" >
+         <number>6</number>
+        </property>
         <item row="0" column="0" >
          <widget class="QTextEdit" name="textEditHeader" />
         </item>
@@ -37,6 +49,12 @@
         <string>Waitreservation</string>
        </attribute>
        <layout class="QGridLayout" >
+        <property name="margin" >
+         <number>9</number>
+        </property>
+        <property name="spacing" >
+         <number>6</number>
+        </property>
         <item row="0" column="0" >
          <widget class="QTextEdit" name="textEditWaitReservation" />
         </item>
@@ -47,6 +65,12 @@
         <string>Devices</string>
        </attribute>
        <layout class="QGridLayout" >
+        <property name="margin" >
+         <number>9</number>
+        </property>
+        <property name="spacing" >
+         <number>6</number>
+        </property>
         <item row="0" column="0" >
          <widget class="QTextEdit" name="textEditDevices" />
         </item>
@@ -57,6 +81,12 @@
         <string>Volumes</string>
        </attribute>
        <layout class="QGridLayout" >
+        <property name="margin" >
+         <number>9</number>
+        </property>
+        <property name="spacing" >
+         <number>6</number>
+        </property>
         <item row="0" column="0" >
          <widget class="QTextEdit" name="textEditVolumes" />
         </item>
@@ -67,6 +97,12 @@
         <string>Spooling</string>
        </attribute>
        <layout class="QGridLayout" >
+        <property name="margin" >
+         <number>9</number>
+        </property>
+        <property name="spacing" >
+         <number>6</number>
+        </property>
         <item row="0" column="0" >
          <widget class="QTextEdit" name="textEditSpooling" />
         </item>
@@ -77,6 +113,12 @@
         <string>Running</string>
        </attribute>
        <layout class="QGridLayout" >
+        <property name="margin" >
+         <number>9</number>
+        </property>
+        <property name="spacing" >
+         <number>6</number>
+        </property>
         <item row="0" column="0" >
          <widget class="QTextEdit" name="textEditRunning" />
         </item>
@@ -133,12 +175,12 @@
            <height>24</height>
           </rect>
          </property>
+         <property name="maximum" >
+          <number>999</number>
+         </property>
          <property name="minimum" >
           <number>5</number>
          </property>
-         <property name="maximum" >
-          <number>999</number>
-         </property>
         </widget>
         <widget class="QCheckBox" name="checkBox" >
          <property name="geometry" >
@@ -158,6 +200,12 @@
      </widget>
      <widget class="QWidget" name="layoutWidget" >
       <layout class="QVBoxLayout" >
+       <property name="margin" >
+        <number>0</number>
+       </property>
+       <property name="spacing" >
+        <number>6</number>
+       </property>
        <item>
         <widget class="QLabel" name="terminatedLabel" >
          <property name="layoutDirection" >
Index: src/qt-console/status/clientstat.ui
===================================================================
--- src/qt-console/status/clientstat.ui	(revision 7352)
+++ src/qt-console/status/clientstat.ui	(working copy)
@@ -5,21 +5,33 @@
    <rect>
     <x>0</x>
     <y>0</y>
-    <width>618</width>
-    <height>630</height>
+    <width>624</width>
+    <height>585</height>
    </rect>
   </property>
   <property name="windowTitle" >
    <string>Form</string>
   </property>
   <layout class="QGridLayout" >
+   <property name="margin" >
+    <number>9</number>
+   </property>
+   <property name="spacing" >
+    <number>6</number>
+   </property>
    <item row="0" column="0" >
     <widget class="QSplitter" name="splitter" >
      <property name="orientation" >
       <enum>Qt::Vertical</enum>
      </property>
-     <widget class="QWidget" name="" >
+     <widget class="QWidget" name="layoutWidget" >
       <layout class="QVBoxLayout" >
+       <property name="margin" >
+        <number>0</number>
+       </property>
+       <property name="spacing" >
+        <number>6</number>
+       </property>
        <item>
         <widget class="QLabel" name="runningLabel_2" >
          <property name="layoutDirection" >
@@ -39,7 +51,9 @@
        <item>
         <widget class="QTextEdit" name="textEditHeader" >
          <property name="sizePolicy" >
-          <sizepolicy vsizetype="Expanding" hsizetype="Expanding" >
+          <sizepolicy>
+           <hsizetype>0</hsizetype>
+           <vsizetype>0</vsizetype>
            <horstretch>200</horstretch>
            <verstretch>0</verstretch>
           </sizepolicy>
@@ -99,8 +113,14 @@
        </item>
       </layout>
      </widget>
-     <widget class="QWidget" name="" >
+     <widget class="QWidget" name="layoutWidget" >
       <layout class="QGridLayout" >
+       <property name="margin" >
+        <number>0</number>
+       </property>
+       <property name="spacing" >
+        <number>6</number>
+       </property>
        <item row="0" column="0" >
         <widget class="QLabel" name="runningLabel" >
          <property name="layoutDirection" >
@@ -122,8 +142,14 @@
        </item>
       </layout>
      </widget>
-     <widget class="QWidget" name="" >
+     <widget class="QWidget" name="layoutWidget" >
       <layout class="QGridLayout" >
+       <property name="margin" >
+        <number>0</number>
+       </property>
+       <property name="spacing" >
+        <number>6</number>
+       </property>
        <item row="0" column="0" >
         <widget class="QLabel" name="terminatedLabel" >
          <property name="layoutDirection" >
Index: src/qt-console/status/dirstat.ui
===================================================================
--- src/qt-console/status/dirstat.ui	(revision 7352)
+++ src/qt-console/status/dirstat.ui	(working copy)
@@ -5,32 +5,20 @@
    <rect>
     <x>0</x>
     <y>0</y>
-    <width>409</width>
-    <height>326</height>
+    <width>432</width>
+    <height>389</height>
    </rect>
   </property>
   <property name="windowTitle" >
    <string>Form</string>
   </property>
   <layout class="QGridLayout" >
-   <property name="leftMargin" >
+   <property name="margin" >
     <number>9</number>
    </property>
-   <property name="topMargin" >
-    <number>9</number>
-   </property>
-   <property name="rightMargin" >
-    <number>9</number>
-   </property>
-   <property name="bottomMargin" >
-    <number>9</number>
-   </property>
-   <property name="horizontalSpacing" >
+   <property name="spacing" >
     <number>6</number>
    </property>
-   <property name="verticalSpacing" >
-    <number>6</number>
-   </property>
    <item row="0" column="0" >
     <widget class="QSplitter" name="splitter" >
      <property name="orientation" >
@@ -38,7 +26,9 @@
      </property>
      <widget class="QTextEdit" name="textEdit" >
       <property name="sizePolicy" >
-       <sizepolicy vsizetype="Fixed" hsizetype="Fixed" >
+       <sizepolicy>
+        <hsizetype>0</hsizetype>
+        <vsizetype>0</vsizetype>
         <horstretch>200</horstretch>
         <verstretch>0</verstretch>
        </sizepolicy>
@@ -97,21 +87,12 @@
      </widget>
      <widget class="QWidget" name="dirstatlayoutWidget" >
       <layout class="QVBoxLayout" >
+       <property name="margin" >
+        <number>0</number>
+       </property>
        <property name="spacing" >
         <number>6</number>
        </property>
-       <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>
         <widget class="QLabel" name="scheduledLabel" >
          <property name="layoutDirection" >
@@ -135,21 +116,12 @@
      </widget>
      <widget class="QWidget" name="layoutWidget_2" >
       <layout class="QVBoxLayout" >
+       <property name="margin" >
+        <number>0</number>
+       </property>
        <property name="spacing" >
         <number>6</number>
        </property>
-       <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>
         <widget class="QLabel" name="runningLabel" >
          <property name="layoutDirection" >
@@ -173,21 +145,12 @@
      </widget>
      <widget class="QWidget" name="layoutWidget" >
       <layout class="QVBoxLayout" >
+       <property name="margin" >
+        <number>0</number>
+       </property>
        <property name="spacing" >
         <number>6</number>
        </property>
-       <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>
         <widget class="QLabel" name="terminatedLabel" >
          <property name="layoutDirection" >
Index: src/qt-console/prefs.ui
===================================================================
--- src/qt-console/prefs.ui	(revision 7352)
+++ src/qt-console/prefs.ui	(working copy)
@@ -6,11 +6,13 @@
     <x>0</x>
     <y>0</y>
     <width>470</width>
-    <height>533</height>
+    <height>613</height>
    </rect>
   </property>
   <property name="sizePolicy" >
-   <sizepolicy vsizetype="Fixed" hsizetype="Fixed" >
+   <sizepolicy>
+    <hsizetype>0</hsizetype>
+    <vsizetype>0</vsizetype>
     <horstretch>0</horstretch>
     <verstretch>0</verstretch>
    </sizepolicy>
@@ -22,24 +24,12 @@
    <iconset>images/bat.png</iconset>
   </property>
   <layout class="QGridLayout" >
-   <property name="leftMargin" >
+   <property name="margin" >
     <number>9</number>
    </property>
-   <property name="topMargin" >
-    <number>9</number>
-   </property>
-   <property name="rightMargin" >
-    <number>9</number>
-   </property>
-   <property name="bottomMargin" >
-    <number>9</number>
-   </property>
-   <property name="horizontalSpacing" >
+   <property name="spacing" >
     <number>6</number>
    </property>
-   <property name="verticalSpacing" >
-    <number>6</number>
-   </property>
    <item row="1" column="0" >
     <widget class="QTabWidget" name="tabWidget" >
      <property name="currentIndex" >
@@ -59,7 +49,9 @@
         </rect>
        </property>
        <property name="sizePolicy" >
-        <sizepolicy vsizetype="Fixed" hsizetype="Fixed" >
+        <sizepolicy>
+         <hsizetype>0</hsizetype>
+         <vsizetype>0</vsizetype>
          <horstretch>0</horstretch>
          <verstretch>0</verstretch>
         </sizepolicy>
@@ -117,7 +109,9 @@
         </rect>
        </property>
        <property name="sizePolicy" >
-        <sizepolicy vsizetype="Fixed" hsizetype="Fixed" >
+        <sizepolicy>
+         <hsizetype>0</hsizetype>
+         <vsizetype>0</vsizetype>
          <horstretch>0</horstretch>
          <verstretch>0</verstretch>
         </sizepolicy>
@@ -160,12 +154,12 @@
           <height>24</height>
          </rect>
         </property>
-        <property name="minimum" >
-         <number>15</number>
-        </property>
         <property name="maximum" >
          <number>3600</number>
         </property>
+        <property name="minimum" >
+         <number>15</number>
+        </property>
        </widget>
       </widget>
      </widget>
@@ -174,28 +168,18 @@
        <string>Joblist</string>
       </attribute>
       <layout class="QGridLayout" >
-       <property name="leftMargin" >
+       <property name="margin" >
         <number>9</number>
        </property>
-       <property name="topMargin" >
-        <number>9</number>
-       </property>
-       <property name="rightMargin" >
-        <number>9</number>
-       </property>
-       <property name="bottomMargin" >
-        <number>9</number>
-       </property>
-       <property name="horizontalSpacing" >
+       <property name="spacing" >
         <number>6</number>
        </property>
-       <property name="verticalSpacing" >
-        <number>6</number>
-       </property>
        <item row="0" column="0" >
         <widget class="QGroupBox" name="groupBox_2" >
          <property name="sizePolicy" >
-          <sizepolicy vsizetype="Fixed" hsizetype="Fixed" >
+          <sizepolicy>
+           <hsizetype>0</hsizetype>
+           <vsizetype>0</vsizetype>
            <horstretch>0</horstretch>
            <verstretch>0</verstretch>
           </sizepolicy>
@@ -204,44 +188,20 @@
           <string>Jolist Limit Options</string>
          </property>
          <layout class="QGridLayout" >
-          <property name="leftMargin" >
+          <property name="margin" >
            <number>9</number>
           </property>
-          <property name="topMargin" >
-           <number>9</number>
-          </property>
-          <property name="rightMargin" >
-           <number>9</number>
-          </property>
-          <property name="bottomMargin" >
-           <number>9</number>
-          </property>
-          <property name="horizontalSpacing" >
+          <property name="spacing" >
            <number>6</number>
           </property>
-          <property name="verticalSpacing" >
-           <number>6</number>
-          </property>
           <item row="0" column="0" >
            <layout class="QGridLayout" >
-            <property name="leftMargin" >
+            <property name="margin" >
              <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" >
+            <property name="spacing" >
              <number>6</number>
             </property>
-            <property name="verticalSpacing" >
-             <number>6</number>
-            </property>
             <item row="2" column="0" >
              <widget class="QCheckBox" name="daysLimit" >
               <property name="text" >
@@ -251,12 +211,12 @@
             </item>
             <item row="3" column="0" >
              <widget class="QSpinBox" name="daysSpinBox" >
-              <property name="minimum" >
-               <number>1</number>
-              </property>
               <property name="maximum" >
                <number>10000</number>
               </property>
+              <property name="minimum" >
+               <number>1</number>
+              </property>
               <property name="singleStep" >
                <number>7</number>
               </property>
@@ -264,12 +224,12 @@
             </item>
             <item row="1" column="0" >
              <widget class="QSpinBox" name="recordSpinBox" >
-              <property name="minimum" >
-               <number>1</number>
-              </property>
               <property name="maximum" >
                <number>10000</number>
               </property>
+              <property name="minimum" >
+               <number>1</number>
+              </property>
               <property name="singleStep" >
                <number>25</number>
               </property>
@@ -358,24 +318,12 @@
         <string>Context Sensitive List Commands</string>
        </property>
        <layout class="QGridLayout" >
-        <property name="leftMargin" >
+        <property name="margin" >
          <number>9</number>
         </property>
-        <property name="topMargin" >
-         <number>9</number>
-        </property>
-        <property name="rightMargin" >
-         <number>9</number>
-        </property>
-        <property name="bottomMargin" >
-         <number>9</number>
-        </property>
-        <property name="horizontalSpacing" >
+        <property name="spacing" >
          <number>6</number>
         </property>
-        <property name="verticalSpacing" >
-         <number>6</number>
-        </property>
         <item row="0" column="0" >
          <widget class="QCheckBox" name="executeLongCheckBox" >
           <property name="text" >
@@ -443,28 +391,18 @@
        <string>Debug</string>
       </attribute>
       <layout class="QGridLayout" >
-       <property name="leftMargin" >
+       <property name="margin" >
         <number>9</number>
        </property>
-       <property name="topMargin" >
-        <number>9</number>
-       </property>
-       <property name="rightMargin" >
-        <number>9</number>
-       </property>
-       <property name="bottomMargin" >
-        <number>9</number>
-       </property>
-       <property name="horizontalSpacing" >
+       <property name="spacing" >
         <number>6</number>
        </property>
-       <property name="verticalSpacing" >
-        <number>6</number>
-       </property>
        <item row="0" column="0" >
         <widget class="QGroupBox" name="groupBox_3" >
          <property name="sizePolicy" >
-          <sizepolicy vsizetype="Fixed" hsizetype="Fixed" >
+          <sizepolicy>
+           <hsizetype>0</hsizetype>
+           <vsizetype>0</vsizetype>
            <horstretch>0</horstretch>
            <verstretch>0</verstretch>
           </sizepolicy>
@@ -473,44 +411,20 @@
           <string>Debugging Options</string>
          </property>
          <layout class="QGridLayout" >
-          <property name="leftMargin" >
+          <property name="margin" >
            <number>9</number>
           </property>
-          <property name="topMargin" >
-           <number>9</number>
-          </property>
-          <property name="rightMargin" >
-           <number>9</number>
-          </property>
-          <property name="bottomMargin" >
-           <number>9</number>
-          </property>
-          <property name="horizontalSpacing" >
+          <property name="spacing" >
            <number>6</number>
           </property>
-          <property name="verticalSpacing" >
-           <number>6</number>
-          </property>
           <item row="0" column="0" >
            <layout class="QGridLayout" >
-            <property name="leftMargin" >
+            <property name="margin" >
              <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" >
+            <property name="spacing" >
              <number>6</number>
             </property>
-            <property name="verticalSpacing" >
-             <number>6</number>
-            </property>
             <item row="0" column="0" >
              <widget class="QCheckBox" name="commDebug" >
               <property name="text" >
@@ -558,28 +472,18 @@
        <string>RestoreTree</string>
       </attribute>
       <layout class="QGridLayout" >
-       <property name="leftMargin" >
+       <property name="margin" >
         <number>9</number>
        </property>
-       <property name="topMargin" >
-        <number>9</number>
-       </property>
-       <property name="rightMargin" >
-        <number>9</number>
-       </property>
-       <property name="bottomMargin" >
-        <number>9</number>
-       </property>
-       <property name="horizontalSpacing" >
+       <property name="spacing" >
         <number>6</number>
        </property>
-       <property name="verticalSpacing" >
-        <number>6</number>
-       </property>
        <item row="0" column="0" >
         <widget class="QGroupBox" name="groupBox_5" >
          <property name="sizePolicy" >
-          <sizepolicy vsizetype="Fixed" hsizetype="Fixed" >
+          <sizepolicy>
+           <hsizetype>0</hsizetype>
+           <vsizetype>0</vsizetype>
            <horstretch>0</horstretch>
            <verstretch>0</verstretch>
           </sizepolicy>
@@ -588,44 +492,20 @@
           <string>Debugging Options</string>
          </property>
          <layout class="QGridLayout" >
-          <property name="leftMargin" >
+          <property name="margin" >
            <number>9</number>
           </property>
-          <property name="topMargin" >
-           <number>9</number>
-          </property>
-          <property name="rightMargin" >
-           <number>9</number>
-          </property>
-          <property name="bottomMargin" >
-           <number>9</number>
-          </property>
-          <property name="horizontalSpacing" >
+          <property name="spacing" >
            <number>6</number>
           </property>
-          <property name="verticalSpacing" >
-           <number>6</number>
-          </property>
           <item row="0" column="0" >
            <layout class="QGridLayout" >
-            <property name="leftMargin" >
+            <property name="margin" >
              <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" >
+            <property name="spacing" >
              <number>6</number>
             </property>
-            <property name="verticalSpacing" >
-             <number>6</number>
-            </property>
             <item row="10" column="0" >
              <widget class="QCheckBox" name="rtRestore2CheckBox" >
               <property name="text" >
@@ -731,21 +611,12 @@
    </item>
    <item row="0" column="0" >
     <layout class="QHBoxLayout" >
+     <property name="margin" >
+      <number>0</number>
+     </property>
      <property name="spacing" >
       <number>6</number>
      </property>
-     <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>
       <spacer>
        <property name="orientation" >
@@ -762,7 +633,9 @@
      <item>
       <widget class="QLabel" name="headingLabel" >
        <property name="sizePolicy" >
-        <sizepolicy vsizetype="Fixed" hsizetype="Fixed" >
+        <sizepolicy>
+         <hsizetype>0</hsizetype>
+         <vsizetype>0</vsizetype>
          <horstretch>0</horstretch>
          <verstretch>0</verstretch>
         </sizepolicy>
Index: src/qt-console/storage/storage.ui
===================================================================
--- src/qt-console/storage/storage.ui	(revision 7352)
+++ src/qt-console/storage/storage.ui	(working copy)
@@ -5,32 +5,20 @@
    <rect>
     <x>0</x>
     <y>0</y>
-    <width>467</width>
-    <height>383</height>
+    <width>525</width>
+    <height>391</height>
    </rect>
   </property>
   <property name="windowTitle" >
    <string>Storage Tree</string>
   </property>
   <layout class="QGridLayout" >
-   <property name="leftMargin" >
+   <property name="margin" >
     <number>9</number>
    </property>
-   <property name="topMargin" >
-    <number>9</number>
-   </property>
-   <property name="rightMargin" >
-    <number>9</number>
-   </property>
-   <property name="bottomMargin" >
-    <number>9</number>
-   </property>
-   <property name="horizontalSpacing" >
+   <property name="spacing" >
     <number>6</number>
    </property>
-   <property name="verticalSpacing" >
-    <number>6</number>
-   </property>
    <item row="0" column="0" >
     <widget class="QTreeWidget" name="mp_treeWidget" >
      <column>
Index: src/qt-console/main.ui
===================================================================
--- src/qt-console/main.ui	(revision 7352)
+++ src/qt-console/main.ui	(working copy)
@@ -6,7 +6,7 @@
    <rect>
     <x>0</x>
     <y>0</y>
-    <width>882</width>
+    <width>821</width>
     <height>689</height>
    </rect>
   </property>
@@ -70,8 +70,8 @@
     <rect>
      <x>0</x>
      <y>0</y>
-     <width>882</width>
-     <height>28</height>
+     <width>821</width>
+     <height>31</height>
     </rect>
    </property>
    <widget class="QMenu" name="menuEdit" >
@@ -120,8 +120,8 @@
   <widget class="QToolBar" name="toolBar" >
    <property name="minimumSize" >
     <size>
-     <width>51</width>
-     <height>39</height>
+     <width>50</width>
+     <height>38</height>
     </size>
    </property>
    <property name="toolTip" >
Index: src/qt-console/joblist/joblist.ui
===================================================================
--- src/qt-console/joblist/joblist.ui	(revision 7352)
+++ src/qt-console/joblist/joblist.ui	(working copy)
@@ -5,7 +5,7 @@
    <rect>
     <x>0</x>
     <y>0</y>
-    <width>739</width>
+    <width>714</width>
     <height>790</height>
    </rect>
   </property>
@@ -44,44 +44,20 @@
     <enum>QFrame::Raised</enum>
    </property>
    <layout class="QGridLayout" >
-    <property name="leftMargin" >
+    <property name="margin" >
      <number>9</number>
     </property>
-    <property name="topMargin" >
-     <number>9</number>
-    </property>
-    <property name="rightMargin" >
-     <number>9</number>
-    </property>
-    <property name="bottomMargin" >
-     <number>9</number>
-    </property>
-    <property name="horizontalSpacing" >
+    <property name="spacing" >
      <number>6</number>
     </property>
-    <property name="verticalSpacing" >
-     <number>6</number>
-    </property>
     <item row="0" column="4" >
      <layout class="QGridLayout" >
-      <property name="leftMargin" >
+      <property name="margin" >
        <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" >
+      <property name="spacing" >
        <number>6</number>
       </property>
-      <property name="verticalSpacing" >
-       <number>6</number>
-      </property>
       <item row="1" column="1" >
        <spacer>
         <property name="orientation" >
@@ -100,24 +76,12 @@
       </item>
       <item row="1" column="0" >
        <layout class="QGridLayout" >
-        <property name="leftMargin" >
-         <number>3</number>
+        <property name="margin" >
+         <number>0</number>
         </property>
-        <property name="topMargin" >
-         <number>3</number>
+        <property name="spacing" >
+         <number>6</number>
         </property>
-        <property name="rightMargin" >
-         <number>3</number>
-        </property>
-        <property name="bottomMargin" >
-         <number>3</number>
-        </property>
-        <property name="horizontalSpacing" >
-         <number>3</number>
-        </property>
-        <property name="verticalSpacing" >
-         <number>3</number>
-        </property>
         <item row="0" column="0" >
          <widget class="QPushButton" name="refreshButton" >
           <property name="text" >
@@ -142,21 +106,12 @@
       </item>
       <item row="0" column="0" colspan="2" >
        <layout class="QVBoxLayout" >
+        <property name="margin" >
+         <number>0</number>
+        </property>
         <property name="spacing" >
          <number>6</number>
         </property>
-        <property name="leftMargin" >
-         <number>3</number>
-        </property>
-        <property name="topMargin" >
-         <number>3</number>
-        </property>
-        <property name="rightMargin" >
-         <number>3</number>
-        </property>
-        <property name="bottomMargin" >
-         <number>3</number>
-        </property>
         <item>
          <widget class="QLabel" name="fileSetLabel" >
           <property name="maximumSize" >
@@ -179,38 +134,20 @@
     </item>
     <item row="0" column="3" >
      <layout class="QVBoxLayout" >
+      <property name="margin" >
+       <number>0</number>
+      </property>
       <property name="spacing" >
        <number>6</number>
       </property>
-      <property name="leftMargin" >
-       <number>3</number>
-      </property>
-      <property name="topMargin" >
-       <number>3</number>
-      </property>
-      <property name="rightMargin" >
-       <number>3</number>
-      </property>
-      <property name="bottomMargin" >
-       <number>3</number>
-      </property>
       <item>
        <layout class="QVBoxLayout" >
+        <property name="margin" >
+         <number>0</number>
+        </property>
         <property name="spacing" >
          <number>6</number>
         </property>
-        <property name="leftMargin" >
-         <number>3</number>
-        </property>
-        <property name="topMargin" >
-         <number>3</number>
-        </property>
-        <property name="rightMargin" >
-         <number>3</number>
-        </property>
-        <property name="bottomMargin" >
-         <number>3</number>
-        </property>
         <item>
          <widget class="QLabel" name="statusLabel" >
           <property name="text" >
@@ -225,21 +162,12 @@
       </item>
       <item>
        <layout class="QVBoxLayout" >
+        <property name="margin" >
+         <number>0</number>
+        </property>
         <property name="spacing" >
          <number>6</number>
         </property>
-        <property name="leftMargin" >
-         <number>3</number>
-        </property>
-        <property name="topMargin" >
-         <number>3</number>
-        </property>
-        <property name="rightMargin" >
-         <number>3</number>
-        </property>
-        <property name="bottomMargin" >
-         <number>3</number>
-        </property>
         <item>
          <widget class="QLabel" name="purgedLabel" >
           <property name="text" >
@@ -256,38 +184,20 @@
     </item>
     <item row="0" column="0" >
      <layout class="QVBoxLayout" >
+      <property name="margin" >
+       <number>0</number>
+      </property>
       <property name="spacing" >
        <number>6</number>
       </property>
-      <property name="leftMargin" >
-       <number>3</number>
-      </property>
-      <property name="topMargin" >
-       <number>3</number>
-      </property>
-      <property name="rightMargin" >
-       <number>3</number>
-      </property>
-      <property name="bottomMargin" >
-       <number>3</number>
-      </property>
       <item>
        <layout class="QVBoxLayout" >
+        <property name="margin" >
+         <number>0</number>
+        </property>
         <property name="spacing" >
          <number>6</number>
         </property>
-        <property name="leftMargin" >
-         <number>3</number>
-        </property>
-        <property name="topMargin" >
-         <number>3</number>
-        </property>
-        <property name="rightMargin" >
-         <number>3</number>
-        </property>
-        <property name="bottomMargin" >
-         <number>3</number>
-        </property>
         <item>
          <widget class="QCheckBox" name="limitCheckBox" >
           <property name="text" >
@@ -297,12 +207,12 @@
         </item>
         <item>
          <widget class="QSpinBox" name="limitSpinBox" >
-          <property name="minimum" >
-           <number>1</number>
-          </property>
           <property name="maximum" >
            <number>10000</number>
           </property>
+          <property name="minimum" >
+           <number>1</number>
+          </property>
           <property name="singleStep" >
            <number>25</number>
           </property>
@@ -312,21 +222,12 @@
       </item>
       <item>
        <layout class="QVBoxLayout" >
+        <property name="margin" >
+         <number>0</number>
+        </property>
         <property name="spacing" >
          <number>6</number>
         </property>
-        <property name="leftMargin" >
-         <number>3</number>
-        </property>
-        <property name="topMargin" >
-         <number>3</number>
-        </property>
-        <property name="rightMargin" >
-         <number>3</number>
-        </property>
-        <property name="bottomMargin" >
-         <number>3</number>
-        </property>
         <item>
          <widget class="QCheckBox" name="daysCheckBox" >
           <property name="text" >
@@ -347,38 +248,20 @@
     </item>
     <item row="0" column="1" >
      <layout class="QVBoxLayout" >
+      <property name="margin" >
+       <number>0</number>
+      </property>
       <property name="spacing" >
        <number>6</number>
       </property>
-      <property name="leftMargin" >
-       <number>3</number>
-      </property>
-      <property name="topMargin" >
-       <number>3</number>
-      </property>
-      <property name="rightMargin" >
-       <number>3</number>
-      </property>
-      <property name="bottomMargin" >
-       <number>3</number>
-      </property>
       <item>
        <layout class="QVBoxLayout" >
+        <property name="margin" >
+         <number>0</number>
+        </property>
         <property name="spacing" >
          <number>6</number>
         </property>
-        <property name="leftMargin" >
-         <number>3</number>
-        </property>
-        <property name="topMargin" >
-         <number>3</number>
-        </property>
-        <property name="rightMargin" >
-         <number>3</number>
-        </property>
-        <property name="bottomMargin" >
-         <number>3</number>
-        </property>
         <item>
          <widget class="QLabel" name="clientsLabel" >
           <property name="text" >
@@ -393,21 +276,12 @@
       </item>
       <item>
        <layout class="QVBoxLayout" >
+        <property name="margin" >
+         <number>0</number>
+        </property>
         <property name="spacing" >
          <number>6</number>
         </property>
-        <property name="leftMargin" >
-         <number>3</number>
-        </property>
-        <property name="topMargin" >
-         <number>3</number>
-        </property>
-        <property name="rightMargin" >
-         <number>3</number>
-        </property>
-        <property name="bottomMargin" >
-         <number>3</number>
-        </property>
         <item>
          <widget class="QLabel" name="volumeLabel" >
           <property name="text" >
@@ -424,38 +298,20 @@
     </item>
     <item row="0" column="2" >
      <layout class="QVBoxLayout" >
+      <property name="margin" >
+       <number>0</number>
+      </property>
       <property name="spacing" >
        <number>6</number>
       </property>
-      <property name="leftMargin" >
-       <number>3</number>
-      </property>
-      <property name="topMargin" >
-       <number>3</number>
-      </property>
-      <property name="rightMargin" >
-       <number>3</number>
-      </property>
-      <property name="bottomMargin" >
-       <number>3</number>
-      </property>
       <item>
        <layout class="QVBoxLayout" >
+        <property name="margin" >
+         <number>0</number>
+        </property>
         <property name="spacing" >
          <number>6</number>
         </property>
-        <property name="leftMargin" >
-         <number>3</number>
-        </property>
-        <property name="topMargin" >
-         <number>3</number>
-        </property>
-        <property name="rightMargin" >
-         <number>3</number>
-        </property>
-        <property name="bottomMargin" >
-         <number>3</number>
-        </property>
         <item>
          <widget class="QLabel" name="jobLabel" >
           <property name="text" >
@@ -470,21 +326,12 @@
       </item>
       <item>
        <layout class="QVBoxLayout" >
+        <property name="margin" >
+         <number>0</number>
+        </property>
         <property name="spacing" >
          <number>6</number>
         </property>
-        <property name="leftMargin" >
-         <number>3</number>
-        </property>
-        <property name="topMargin" >
-         <number>3</number>
-        </property>
-        <property name="rightMargin" >
-         <number>3</number>
-        </property>
-        <property name="bottomMargin" >
-         <number>3</number>
-        </property>
         <item>
          <widget class="QLabel" name="levelLabel" >
           <property name="text" >