diff --git a/scribus/ui/prefs_documentsetupbase.ui b/scribus/ui/prefs_documentsetupbase.ui
--- a/scribus/ui/prefs_documentsetupbase.ui
+++ b/scribus/ui/prefs_documentsetupbase.ui
@@ -11,7 +11,7 @@
    </rect>
   </property>
   <property name="windowTitle">
-   <string notr="true">Form</string>
+   <string notr="true"/>
   </property>
   <layout class="QVBoxLayout" name="verticalLayout_2">
    <item>
@@ -46,34 +46,24 @@
       </attribute>
       <layout class="QVBoxLayout" name="verticalLayout_4">
        <item>
-        <layout class="QHBoxLayout" name="horizontalLayout_3">
-         <item>
-          <widget class="QLabel" name="label_3">
+        <layout class="QFormLayout" name="languageForm">
+         <property name="fieldGrowthPolicy">
+          <enum>QFormLayout::FieldsStayAtSizeHint</enum>
+         </property>
+         <item row="0" column="0">
+          <widget class="QLabel" name="languageComboLabel">
            <property name="text">
             <string>Language:</string>
            </property>
           </widget>
          </item>
-         <item>
+         <item row="0" column="1">
           <widget class="QComboBox" name="languageComboBox"/>
          </item>
-         <item>
-          <spacer name="horizontalSpacer_3">
-           <property name="orientation">
-            <enum>Qt::Horizontal</enum>
-           </property>
-           <property name="sizeHint" stdset="0">
-            <size>
-             <width>40</width>
-             <height>20</height>
-            </size>
-           </property>
-          </spacer>
-         </item>
         </layout>
        </item>
        <item>
-        <spacer name="verticalSpacer">
+        <spacer name="languageSpacer">
          <property name="orientation">
           <enum>Qt::Vertical</enum>
          </property>
@@ -102,7 +92,7 @@
         </widget>
        </item>
        <item>
-        <widget class="Line" name="line_2">
+        <widget class="Line" name="pageSizeLine">
          <property name="orientation">
           <enum>Qt::Horizontal</enum>
          </property>
@@ -109,7 +99,10 @@
         </widget>
        </item>
        <item>
-        <layout class="QFormLayout" name="formLayout">
+        <layout class="QFormLayout" name="pageSizeForm">
+         <property name="fieldGrowthPolicy">
+          <enum>QFormLayout::FieldsStayAtSizeHint</enum>
+         </property>
          <item row="0" column="0">
           <widget class="QLabel" name="pageSizeLabel">
            <property name="text">
@@ -138,7 +131,7 @@
           </layout>
          </item>
          <item row="1" column="0">
-          <widget class="QLabel" name="pageOrientatioLabel">
+          <widget class="QLabel" name="pageOrientationLabel">
            <property name="text">
             <string>Orientation:</string>
            </property>
@@ -206,7 +199,7 @@
         </widget>
        </item>
        <item>
-        <spacer name="verticalSpacer_5">
+        <spacer name="pageSizeSpacer">
          <property name="orientation">
           <enum>Qt::Vertical</enum>
          </property>
@@ -239,7 +232,7 @@
         </widget>
        </item>
        <item>
-        <widget class="Line" name="line_3">
+        <widget class="Line" name="pageLayoutLine">
          <property name="orientation">
           <enum>Qt::Horizontal</enum>
          </property>
@@ -247,6 +240,9 @@
        </item>
        <item>
         <layout class="QFormLayout" name="pageLayoutLayout">
+         <property name="fieldGrowthPolicy">
+          <enum>QFormLayout::FieldsStayAtSizeHint</enum>
+         </property>
          <item row="4" column="0">
           <widget class="QLabel" name="layoutFirstPageIsLabel">
            <property name="text">
@@ -259,6 +255,12 @@
          </item>
          <item row="4" column="1">
           <widget class="QComboBox" name="layoutFirstPageIsComboBox">
+           <property name="minimumSize">
+            <size>
+             <width>140</width>
+             <height>0</height>
+            </size>
+           </property>
            <property name="sizeAdjustPolicy">
             <enum>QComboBox::AdjustToContents</enum>
            </property>
@@ -310,7 +312,7 @@
         </layout>
        </item>
        <item>
-        <spacer name="verticalSpacer_8">
+        <spacer name="pageLayoutSpacer">
          <property name="orientation">
           <enum>Qt::Vertical</enum>
          </property>
@@ -348,8 +350,8 @@
            <rect>
             <x>0</x>
             <y>0</y>
-            <width>458</width>
-            <height>540</height>
+            <width>428</width>
+            <height>525</height>
            </rect>
           </property>
           <layout class="QVBoxLayout" name="verticalLayout_5">
@@ -379,7 +381,7 @@
             </widget>
            </item>
            <item>
-            <widget class="Line" name="line_5">
+            <widget class="Line" name="marginsLine">
              <property name="orientation">
               <enum>Qt::Horizontal</enum>
              </property>
@@ -386,7 +388,7 @@
             </widget>
            </item>
            <item>
-            <layout class="QHBoxLayout" name="horizontalLayout_6">
+            <layout class="QHBoxLayout" name="marginsLayout">
              <property name="leftMargin">
               <number>5</number>
              </property>
@@ -403,7 +405,7 @@
               <widget class="NewMarginWidget" name="marginsWidget" native="true"/>
              </item>
              <item>
-              <spacer name="horizontalSpacer_6">
+              <spacer name="marginsSpacer_2">
                <property name="orientation">
                 <enum>Qt::Horizontal</enum>
                </property>
@@ -432,7 +434,7 @@
             </widget>
            </item>
            <item>
-            <spacer name="verticalSpacer_3">
+            <spacer name="marginsSpacer">
              <property name="orientation">
               <enum>Qt::Vertical</enum>
              </property>
@@ -461,7 +463,7 @@
             </widget>
            </item>
            <item>
-            <widget class="Line" name="line_4">
+            <widget class="Line" name="bleedsLine">
              <property name="orientation">
               <enum>Qt::Horizontal</enum>
              </property>
@@ -468,7 +470,7 @@
             </widget>
            </item>
            <item>
-            <layout class="QHBoxLayout" name="horizontalLayout_7">
+            <layout class="QHBoxLayout" name="bleedsLayout">
              <property name="leftMargin">
               <number>5</number>
              </property>
@@ -485,7 +487,7 @@
               <widget class="NewMarginWidget" name="bleedsWidget" native="true"/>
              </item>
              <item>
-              <spacer name="horizontalSpacer_7">
+              <spacer name="bleedsSpacer_2">
                <property name="orientation">
                 <enum>Qt::Horizontal</enum>
                </property>
@@ -500,7 +502,7 @@
             </layout>
            </item>
            <item>
-            <spacer name="verticalSpacer_4">
+            <spacer name="bleedsSpacer">
              <property name="orientation">
               <enum>Qt::Vertical</enum>
              </property>
@@ -567,7 +569,7 @@
         </widget>
        </item>
        <item>
-        <widget class="Line" name="line_6">
+        <widget class="Line" name="autosaveLine">
          <property name="orientation">
           <enum>Qt::Horizontal</enum>
          </property>
@@ -581,55 +583,44 @@
         </widget>
        </item>
        <item>
-        <layout class="QHBoxLayout" name="horizontalLayout">
-         <item>
-          <layout class="QGridLayout" name="gridLayout">
-           <item row="0" column="0">
-            <widget class="QLabel" name="label">
-             <property name="text">
-              <string>Interval:</string>
-             </property>
-            </widget>
-           </item>
-           <item row="0" column="1">
-            <widget class="QSpinBox" name="autosaveIntervalSpinBox">
-             <property name="suffix">
-              <string> min</string>
-             </property>
-             <property name="minimum">
-              <number>1</number>
-             </property>
-            </widget>
-           </item>
-           <item row="1" column="0">
-            <widget class="QLabel" name="label_2">
-             <property name="text">
-              <string>Number of files to keep:</string>
-             </property>
-            </widget>
-           </item>
-           <item row="1" column="1">
-            <widget class="QSpinBox" name="autosaveCountSpinBox">
-             <property name="minimum">
-              <number>1</number>
-             </property>
-            </widget>
-           </item>
-          </layout>
+        <layout class="QFormLayout" name="formLayout">
+         <property name="fieldGrowthPolicy">
+          <enum>QFormLayout::FieldsStayAtSizeHint</enum>
+         </property>
+         <item row="0" column="0">
+          <widget class="QLabel" name="autosaveIntervalLabel">
+           <property name="text">
+            <string>Interval:</string>
+           </property>
+          </widget>
          </item>
-         <item>
-          <spacer name="horizontalSpacer_2">
-           <property name="orientation">
-            <enum>Qt::Horizontal</enum>
+         <item row="0" column="1">
+          <widget class="QSpinBox" name="autosaveIntervalSpinBox">
+           <property name="suffix">
+            <string> min</string>
            </property>
-           <property name="sizeHint" stdset="0">
-            <size>
-             <width>40</width>
-             <height>20</height>
-            </size>
+           <property name="minimum">
+            <number>1</number>
            </property>
-          </spacer>
+          </widget>
          </item>
+         <item row="1" column="0">
+          <widget class="QLabel" name="autosaveCountLabel">
+           <property name="text">
+            <string>Files to Keep:</string>
+           </property>
+          </widget>
+         </item>
+         <item row="1" column="1">
+          <widget class="QSpinBox" name="autosaveCountSpinBox">
+           <property name="toolTip">
+            <string>Number of files to keep</string>
+           </property>
+           <property name="minimum">
+            <number>1</number>
+           </property>
+          </widget>
+         </item>
         </layout>
        </item>
        <item>
@@ -681,7 +672,7 @@
         </widget>
        </item>
        <item>
-        <spacer name="verticalSpacer_7">
+        <spacer name="autosaveSpacer">
          <property name="orientation">
           <enum>Qt::Vertical</enum>
          </property>
@@ -710,7 +701,7 @@
         </widget>
        </item>
        <item>
-        <widget class="Line" name="line_7">
+        <widget class="Line" name="undoLine">
          <property name="orientation">
           <enum>Qt::Horizontal</enum>
          </property>
@@ -724,8 +715,11 @@
         </widget>
        </item>
        <item>
-        <layout class="QHBoxLayout" name="horizontalLayout_2">
-         <item>
+        <layout class="QFormLayout" name="formLayout_2">
+         <property name="fieldGrowthPolicy">
+          <enum>QFormLayout::FieldsStayAtSizeHint</enum>
+         </property>
+         <item row="0" column="0">
           <widget class="QLabel" name="undoLengthLabel">
            <property name="text">
             <string>Action History Length:</string>
@@ -732,26 +726,13 @@
            </property>
           </widget>
          </item>
-         <item>
+         <item row="0" column="1">
           <widget class="QSpinBox" name="undoLengthSpinBox"/>
          </item>
-         <item>
-          <spacer name="horizontalSpacer">
-           <property name="orientation">
-            <enum>Qt::Horizontal</enum>
-           </property>
-           <property name="sizeHint" stdset="0">
-            <size>
-             <width>40</width>
-             <height>20</height>
-            </size>
-           </property>
-          </spacer>
-         </item>
         </layout>
        </item>
        <item>
-        <spacer name="verticalSpacer_2">
+        <spacer name="undoSpacer">
          <property name="orientation">
           <enum>Qt::Vertical</enum>
          </property>