diff --git a/src/frontends/qt4/ui/LaTeXUi.ui b/src/frontends/qt4/ui/LaTeXUi.ui
index f13889328f..ee08c1dc9b 100644
--- a/src/frontends/qt4/ui/LaTeXUi.ui
+++ b/src/frontends/qt4/ui/LaTeXUi.ui
@@ -1,15 +1,12 @@
 <ui version="4.0" >
- <author></author>
- <comment></comment>
- <exportmacro></exportmacro>
  <class>LaTeXUi</class>
  <widget class="QWidget" name="LaTeXUi" >
   <property name="geometry" >
    <rect>
     <x>0</x>
     <y>0</y>
-    <width>428</width>
-    <height>465</height>
+    <width>384</width>
+    <height>371</height>
    </rect>
   </property>
   <property name="windowTitle" >
@@ -22,20 +19,117 @@
    <property name="spacing" >
     <number>6</number>
    </property>
-   <item row="5" column="2" colspan="2" >
-    <spacer>
-     <property name="orientation" >
-      <enum>Qt::Vertical</enum>
+   <item row="3" column="0" colspan="3" >
+    <widget class="QGroupBox" name="modulesGB" >
+     <property name="title" >
+      <string>Modules</string>
      </property>
-     <property name="sizeHint" >
-      <size>
-       <width>84</width>
-       <height>41</height>
-      </size>
-     </property>
-    </spacer>
+     <layout class="QGridLayout" >
+      <property name="margin" >
+       <number>9</number>
+      </property>
+      <property name="spacing" >
+       <number>6</number>
+      </property>
+      <item row="6" column="0" colspan="3" >
+       <widget class="QTextBrowser" name="infoML" />
+      </item>
+      <item row="5" column="1" >
+       <spacer>
+        <property name="orientation" >
+         <enum>Qt::Vertical</enum>
+        </property>
+        <property name="sizeHint" >
+         <size>
+          <width>80</width>
+          <height>16</height>
+         </size>
+        </property>
+       </spacer>
+      </item>
+      <item row="4" column="1" >
+       <widget class="QPushButton" name="downPB" >
+        <property name="text" >
+         <string>&amp;Down</string>
+        </property>
+       </widget>
+      </item>
+      <item row="3" column="1" >
+       <widget class="QPushButton" name="upPB" >
+        <property name="text" >
+         <string>&amp;Up</string>
+        </property>
+       </widget>
+      </item>
+      <item row="2" column="1" >
+       <widget class="QPushButton" name="deletePB" >
+        <property name="text" >
+         <string>&amp;Delete</string>
+        </property>
+       </widget>
+      </item>
+      <item rowspan="5" row="1" column="2" >
+       <widget class="QListView" name="selectedLV" >
+        <property name="editTriggers" >
+         <set>QAbstractItemView::NoEditTriggers</set>
+        </property>
+       </widget>
+      </item>
+      <item row="1" column="1" >
+       <widget class="QPushButton" name="addPB" >
+        <property name="text" >
+         <string>&amp;Add</string>
+        </property>
+       </widget>
+      </item>
+      <item rowspan="5" row="1" column="0" >
+       <widget class="QListView" name="availableLV" >
+        <property name="editTriggers" >
+         <set>QAbstractItemView::NoEditTriggers</set>
+        </property>
+       </widget>
+      </item>
+      <item row="0" column="2" >
+       <widget class="QLabel" name="selmodL" >
+        <property name="text" >
+         <string>S&amp;elected:</string>
+        </property>
+        <property name="buddy" >
+         <cstring>selectedLV</cstring>
+        </property>
+       </widget>
+      </item>
+      <item row="0" column="0" >
+       <widget class="QLabel" name="availmodL" >
+        <property name="text" >
+         <string>A&amp;vailable:</string>
+        </property>
+        <property name="buddy" >
+         <cstring>availableLV</cstring>
+        </property>
+       </widget>
+      </item>
+     </layout>
+    </widget>
    </item>
-   <item row="4" column="3" >
+   <item row="2" column="1" >
+    <widget class="QComboBox" name="psdriverCO" >
+     <property name="duplicatesEnabled" >
+      <bool>false</bool>
+     </property>
+    </widget>
+   </item>
+   <item row="2" column="0" >
+    <widget class="QLabel" name="psdriverL" >
+     <property name="text" >
+      <string>&amp;Postscript driver:</string>
+     </property>
+     <property name="buddy" >
+      <cstring>psdriverCO</cstring>
+     </property>
+    </widget>
+   </item>
+   <item row="2" column="2" >
     <spacer>
      <property name="orientation" >
       <enum>Qt::Horizontal</enum>
@@ -48,125 +142,18 @@
      </property>
     </spacer>
    </item>
-   <item row="4" column="2" >
-    <widget class="QComboBox" name="psdriverCO" >
-     <property name="duplicatesEnabled" >
-      <bool>false</bool>
+   <item row="4" column="1" colspan="2" >
+    <spacer>
+     <property name="orientation" >
+      <enum>Qt::Vertical</enum>
      </property>
-    </widget>
-   </item>
-   <item row="4" column="0" colspan="2" >
-    <widget class="QLabel" name="psdriverL" >
-     <property name="text" >
-      <string>Postscript &amp;driver:</string>
+     <property name="sizeHint" >
+      <size>
+       <width>84</width>
+       <height>41</height>
+      </size>
      </property>
-     <property name="buddy" >
-      <cstring>psdriverCO</cstring>
-     </property>
-    </widget>
-   </item>
-   <item row="3" column="0" colspan="4" >
-    <widget class="QTextBrowser" name="infoML" />
-   </item>
-   <item row="2" column="0" colspan="4" >
-    <widget class="QGroupBox" name="modulesGB" >
-     <property name="title" >
-      <string>Modules</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="QLabel" name="availmodL" >
-        <property name="text" >
-         <string>Available Modules</string>
-        </property>
-       </widget>
-      </item>
-      <item row="0" column="2" >
-       <widget class="QLabel" name="selmodL" >
-        <property name="text" >
-         <string>Selected Modules</string>
-        </property>
-       </widget>
-      </item>
-      <item rowspan="5" row="1" column="0" >
-       <widget class="QListView" name="availableLV" >
-        <property name="editTriggers" >
-         <set>QAbstractItemView::NoEditTriggers</set>
-        </property>
-       </widget>
-      </item>
-      <item row="1" column="1" >
-       <widget class="QPushButton" name="addPB" >
-        <property name="text" >
-         <string>Add</string>
-        </property>
-       </widget>
-      </item>
-      <item rowspan="5" row="1" column="2" >
-       <widget class="QListView" name="selectedLV" >
-        <property name="editTriggers" >
-         <set>QAbstractItemView::NoEditTriggers</set>
-        </property>
-       </widget>
-      </item>
-      <item row="2" column="1" >
-       <widget class="QPushButton" name="deletePB" >
-        <property name="text" >
-         <string>Delete</string>
-        </property>
-       </widget>
-      </item>
-      <item row="3" column="1" >
-       <widget class="QPushButton" name="upPB" >
-        <property name="text" >
-         <string>Up</string>
-        </property>
-       </widget>
-      </item>
-      <item row="4" column="1" >
-       <widget class="QPushButton" name="downPB" >
-        <property name="text" >
-         <string>Down</string>
-        </property>
-       </widget>
-      </item>
-      <item row="5" column="1" >
-       <spacer>
-        <property name="orientation" >
-         <enum>Qt::Vertical</enum>
-        </property>
-        <property name="sizeHint" >
-         <size>
-          <width>80</width>
-          <height>46</height>
-         </size>
-        </property>
-       </spacer>
-      </item>
-     </layout>
-    </widget>
-   </item>
-   <item row="1" column="1" colspan="3" >
-    <widget class="QLineEdit" name="optionsLE" />
-   </item>
-   <item row="1" column="0" >
-    <widget class="QLabel" name="optionsL" >
-     <property name="text" >
-      <string>&amp;Options:</string>
-     </property>
-     <property name="buddy" >
-      <cstring>optionsLE</cstring>
-     </property>
-    </widget>
-   </item>
-   <item row="0" column="1" colspan="3" >
-    <widget class="QComboBox" name="classCO" />
+    </spacer>
    </item>
    <item row="0" column="0" >
     <widget class="QLabel" name="classL" >
@@ -178,12 +165,28 @@
      </property>
     </widget>
    </item>
+   <item row="0" column="1" colspan="2" >
+    <widget class="QComboBox" name="classCO" />
+   </item>
+   <item row="1" column="0" >
+    <widget class="QLabel" name="optionsL" >
+     <property name="text" >
+      <string>&amp;Options:</string>
+     </property>
+     <property name="buddy" >
+      <cstring>optionsLE</cstring>
+     </property>
+    </widget>
+   </item>
+   <item row="1" column="1" colspan="2" >
+    <widget class="QLineEdit" name="optionsLE" />
+   </item>
   </layout>
  </widget>
- <pixmapfunction></pixmapfunction>
  <tabstops>
   <tabstop>classCO</tabstop>
   <tabstop>optionsLE</tabstop>
+  <tabstop>psdriverCO</tabstop>
   <tabstop>availableLV</tabstop>
   <tabstop>addPB</tabstop>
   <tabstop>deletePB</tabstop>
@@ -191,7 +194,6 @@
   <tabstop>downPB</tabstop>
   <tabstop>selectedLV</tabstop>
   <tabstop>infoML</tabstop>
-  <tabstop>psdriverCO</tabstop>
  </tabstops>
  <includes>
   <include location="local" >qt_helpers.h</include>
diff --git a/src/frontends/qt4/ui/PrefColorsUi.ui b/src/frontends/qt4/ui/PrefColorsUi.ui
index 5ae88236bb..f01c3f7235 100644
--- a/src/frontends/qt4/ui/PrefColorsUi.ui
+++ b/src/frontends/qt4/ui/PrefColorsUi.ui
@@ -5,74 +5,66 @@
    <rect>
     <x>0</x>
     <y>0</y>
-    <width>359</width>
-    <height>351</height>
+    <width>199</width>
+    <height>226</height>
    </rect>
   </property>
   <property name="windowTitle" >
    <string/>
   </property>
-   <layout class="QVBoxLayout" >
-    <property name="margin" >
-     <number>0</number>
-    </property>
-    <property name="spacing" >
-     <number>6</number>
-    </property>
-    <item>
-     <widget class="QLabel" name="lyxObjectsLA" >
-      <property name="text" >
-       <string>&amp;Colors</string>
-      </property>
-      <property name="buddy" >
-       <cstring>lyxObjectsLW</cstring>
-      </property>
-     </widget>
-    </item>
-    <item>
-     <layout class="QHBoxLayout" >
-      <property name="margin" >
-       <number>0</number>
-      </property>
-      <property name="spacing" >
-       <number>6</number>
-      </property>
-      <item>
-       <widget class="QListWidget" name="lyxObjectsLW" />
-      </item>
-      <item>
-       <layout class="QVBoxLayout" >
-        <property name="margin" >
-         <number>0</number>
-        </property>
-        <property name="spacing" >
-         <number>6</number>
-        </property>
-        <item>
-         <widget class="QPushButton" name="colorChangePB" >
-          <property name="text" >
-           <string>&amp;Alter...</string>
-          </property>
-         </widget>
-        </item>
-        <item>
-         <spacer>
-          <property name="orientation" >
-           <enum>Qt::Vertical</enum>
-          </property>
-          <property name="sizeHint" >
-           <size>
-            <width>20</width>
-            <height>40</height>
-           </size>
-          </property>
-         </spacer>
-        </item>
-       </layout>
-      </item>
-     </layout>
-    </item>
-   </layout>
+  <layout class="QGridLayout" >
+   <property name="margin" >
+    <number>9</number>
+   </property>
+   <property name="spacing" >
+    <number>6</number>
+   </property>
+   <item rowspan="2" row="0" column="0" >
+    <widget class="QListWidget" name="lyxObjectsLW" >
+     <property name="sizePolicy" >
+      <sizepolicy>
+       <hsizetype>5</hsizetype>
+       <vsizetype>7</vsizetype>
+       <horstretch>0</horstretch>
+       <verstretch>0</verstretch>
+      </sizepolicy>
+     </property>
+    </widget>
+   </item>
+   <item row="1" column="1" >
+    <spacer>
+     <property name="orientation" >
+      <enum>Qt::Vertical</enum>
+     </property>
+     <property name="sizeHint" >
+      <size>
+       <width>20</width>
+       <height>40</height>
+      </size>
+     </property>
+    </spacer>
+   </item>
+   <item row="0" column="1" >
+    <widget class="QPushButton" name="colorChangePB" >
+     <property name="text" >
+      <string>&amp;Alter...</string>
+     </property>
+    </widget>
+   </item>
+   <item row="0" column="2" >
+    <spacer>
+     <property name="orientation" >
+      <enum>Qt::Horizontal</enum>
+     </property>
+     <property name="sizeHint" >
+      <size>
+       <width>40</width>
+       <height>20</height>
+      </size>
+     </property>
+    </spacer>
+   </item>
+  </layout>
  </widget>
  <includes>
   <include location="local" >qt_helpers.h</include>
diff --git a/src/frontends/qt4/ui/PrefDisplayUi.ui b/src/frontends/qt4/ui/PrefDisplayUi.ui
index 6ac03eff35..9108197b19 100644
--- a/src/frontends/qt4/ui/PrefDisplayUi.ui
+++ b/src/frontends/qt4/ui/PrefDisplayUi.ui
@@ -5,7 +5,7 @@
    <rect>
     <x>0</x>
     <y>0</y>
-    <width>264</width>
+    <width>340</width>
     <height>133</height>
    </rect>
   </property>
@@ -14,85 +14,88 @@
   </property>
   <layout class="QGridLayout" >
    <property name="margin" >
-    <number>11</number>
+    <number>9</number>
    </property>
    <property name="spacing" >
     <number>6</number>
    </property>
+   <item rowspan="2" row="0" column="2" >
+    <spacer>
+     <property name="orientation" >
+      <enum>Qt::Horizontal</enum>
+     </property>
+     <property name="sizeHint" >
+      <size>
+       <width>40</width>
+       <height>20</height>
+      </size>
+     </property>
+    </spacer>
+   </item>
+   <item row="1" column="1" >
+    <widget class="QComboBox" name="instantPreviewCO" >
+     <item>
+      <property name="text" >
+       <string>Off</string>
+      </property>
+     </item>
+     <item>
+      <property name="text" >
+       <string>No math</string>
+      </property>
+     </item>
+     <item>
+      <property name="text" >
+       <string>On</string>
+      </property>
+     </item>
+    </widget>
+   </item>
+   <item row="0" column="1" >
+    <widget class="QComboBox" name="displayGraphicsCO" >
+     <item>
+      <property name="text" >
+       <string>Monochrome</string>
+      </property>
+     </item>
+     <item>
+      <property name="text" >
+       <string>Grayscale</string>
+      </property>
+     </item>
+     <item>
+      <property name="text" >
+       <string>Color</string>
+      </property>
+     </item>
+     <item>
+      <property name="text" >
+       <string>Do not display</string>
+      </property>
+     </item>
+    </widget>
+   </item>
    <item row="0" column="0" >
-    <layout class="QGridLayout" >
-     <property name="margin" >
-      <number>0</number>
+    <widget class="QLabel" name="displayGraphicsLA" >
+     <property name="text" >
+      <string>Display &amp;Graphics:</string>
      </property>
-     <property name="spacing" >
-      <number>6</number>
+     <property name="buddy" >
+      <cstring>displayGraphicsCO</cstring>
      </property>
-     <item row="0" column="0" >
-      <widget class="QLabel" name="displayGraphicsLA" >
-       <property name="text" >
-        <string>Display &amp;Graphics:</string>
-       </property>
-       <property name="buddy" >
-        <cstring>displayGraphicsCO</cstring>
-       </property>
-      </widget>
-     </item>
-     <item row="1" column="1" >
-      <widget class="QComboBox" name="instantPreviewCO" >
-       <item>
-        <property name="text" >
-         <string>Off</string>
-        </property>
-       </item>
-       <item>
-        <property name="text" >
-         <string>No math</string>
-        </property>
-       </item>
-       <item>
-        <property name="text" >
-         <string>On</string>
-        </property>
-       </item>
-      </widget>
-     </item>
-     <item row="0" column="1" >
-      <widget class="QComboBox" name="displayGraphicsCO" >
-       <item>
-        <property name="text" >
-         <string>Monochrome</string>
-        </property>
-       </item>
-       <item>
-        <property name="text" >
-         <string>Grayscale</string>
-        </property>
-       </item>
-       <item>
-        <property name="text" >
-         <string>Color</string>
-        </property>
-       </item>
-       <item>
-        <property name="text" >
-         <string>Do not display</string>
-        </property>
-       </item>
-      </widget>
-     </item>
-     <item row="1" column="0" >
-      <widget class="QLabel" name="instantPreviewLA" >
-       <property name="text" >
-        <string>Instant &amp;Preview:</string>
-       </property>
-       <property name="buddy" >
-        <cstring>instantPreviewCO</cstring>
-       </property>
-      </widget>
-     </item>
-    </layout>
+    </widget>
    </item>
    <item row="1" column="0" >
+    <widget class="QLabel" name="instantPreviewLA" >
+     <property name="text" >
+      <string>Instant &amp;Preview:</string>
+     </property>
+     <property name="buddy" >
+      <cstring>instantPreviewCO</cstring>
+     </property>
+    </widget>
+   </item>
+   <item row="2" column="0" colspan="2" >
     <spacer>
      <property name="orientation" >
       <enum>Qt::Vertical</enum>
@@ -110,14 +113,13 @@
    </item>
   </layout>
  </widget>
- <pixmapfunction></pixmapfunction>
- <includes>
-  <include location="local" >qt_helpers.h</include>
- </includes>
  <tabstops>
   <tabstop>displayGraphicsCO</tabstop>
   <tabstop>instantPreviewCO</tabstop>
  </tabstops>
+ <includes>
+  <include location="local" >qt_helpers.h</include>
+ </includes>
  <resources/>
  <connections/>
 </ui>
diff --git a/src/frontends/qt4/ui/PrefLanguageUi.ui b/src/frontends/qt4/ui/PrefLanguageUi.ui
index e2df16b99f..7fc209311b 100644
--- a/src/frontends/qt4/ui/PrefLanguageUi.ui
+++ b/src/frontends/qt4/ui/PrefLanguageUi.ui
@@ -5,8 +5,8 @@
    <rect>
     <x>0</x>
     <y>0</y>
-    <width>360</width>
-    <height>323</height>
+    <width>329</width>
+    <height>300</height>
    </rect>
   </property>
   <property name="windowTitle" >
@@ -14,50 +14,79 @@
   </property>
   <layout class="QGridLayout" >
    <property name="margin" >
-    <number>11</number>
+    <number>9</number>
    </property>
    <property name="spacing" >
     <number>6</number>
    </property>
-   <item row="2" column="0" >
-    <widget class="QLabel" name="startCommandLA" >
-     <property name="text" >
-      <string>Command s&amp;tart:</string>
+   <item row="1" column="2" >
+    <spacer>
+     <property name="orientation" >
+      <enum>Qt::Horizontal</enum>
      </property>
-     <property name="buddy" >
-      <cstring>startCommandED</cstring>
+     <property name="sizeHint" >
+      <size>
+       <width>40</width>
+       <height>20</height>
+      </size>
+     </property>
+    </spacer>
+   </item>
+   <item row="4" column="0" >
+    <widget class="QCheckBox" name="useBabelCB" >
+     <property name="text" >
+      <string>Use b&amp;abel</string>
      </property>
     </widget>
    </item>
-   <item row="3" column="1" >
-    <widget class="QLineEdit" name="endCommandED" />
-   </item>
-   <item row="2" column="1" >
-    <widget class="QLineEdit" name="startCommandED" />
-   </item>
-   <item row="1" column="1" >
-    <widget class="QLineEdit" name="languagePackageED" />
-   </item>
-   <item row="0" column="1" >
-    <widget class="QComboBox" name="defaultLanguageCO" />
-   </item>
-   <item row="0" column="0" >
-    <widget class="QLabel" name="defaultLanguageLA" >
+   <item row="8" column="0" colspan="2" >
+    <widget class="QCheckBox" name="markForeignCB" >
      <property name="text" >
-      <string>&amp;Default language:</string>
-     </property>
-     <property name="buddy" >
-      <cstring>defaultLanguageCO</cstring>
+      <string>Mark &amp;foreign languages</string>
      </property>
     </widget>
    </item>
-   <item row="3" column="0" >
-    <widget class="QLabel" name="endCommandLA" >
-     <property name="text" >
-      <string>Command e&amp;nd:</string>
+   <item row="10" column="0" colspan="2" >
+    <spacer>
+     <property name="orientation" >
+      <enum>Qt::Vertical</enum>
      </property>
-     <property name="buddy" >
-      <cstring>endCommandED</cstring>
+     <property name="sizeType" >
+      <enum>QSizePolicy::Expanding</enum>
+     </property>
+     <property name="sizeHint" >
+      <size>
+       <width>20</width>
+       <height>20</height>
+      </size>
+     </property>
+    </spacer>
+   </item>
+   <item row="7" column="0" >
+    <widget class="QCheckBox" name="autoEndCB" >
+     <property name="text" >
+      <string>Auto &amp;end</string>
+     </property>
+    </widget>
+   </item>
+   <item row="9" column="0" colspan="2" >
+    <widget class="QCheckBox" name="rtlCB" >
+     <property name="text" >
+      <string>&amp;Right-to-left language support</string>
+     </property>
+    </widget>
+   </item>
+   <item row="5" column="0" >
+    <widget class="QCheckBox" name="globalCB" >
+     <property name="text" >
+      <string>&amp;Global</string>
+     </property>
+    </widget>
+   </item>
+   <item row="6" column="0" >
+    <widget class="QCheckBox" name="autoBeginCB" >
+     <property name="text" >
+      <string>Auto &amp;begin</string>
      </property>
     </widget>
    </item>
@@ -71,102 +100,50 @@
      </property>
     </widget>
    </item>
-   <item row="6" column="0" >
-    <widget class="QCheckBox" name="autoBeginCB" >
+   <item row="3" column="0" >
+    <widget class="QLabel" name="endCommandLA" >
      <property name="text" >
-      <string>Auto &amp;begin</string>
+      <string>Command e&amp;nd:</string>
+     </property>
+     <property name="buddy" >
+      <cstring>endCommandED</cstring>
      </property>
     </widget>
    </item>
-   <item row="4" column="0" >
-    <widget class="QCheckBox" name="useBabelCB" >
+   <item row="0" column="0" >
+    <widget class="QLabel" name="defaultLanguageLA" >
      <property name="text" >
-      <string>Use b&amp;abel</string>
+      <string>&amp;Default language:</string>
+     </property>
+     <property name="buddy" >
+      <cstring>defaultLanguageCO</cstring>
      </property>
     </widget>
    </item>
-   <item rowspan="2" row="6" column="1" >
-    <spacer>
-     <property name="orientation" >
-      <enum>Qt::Horizontal</enum>
-     </property>
-     <property name="sizeType" >
-      <enum>QSizePolicy::Expanding</enum>
-     </property>
-     <property name="sizeHint" >
-      <size>
-       <width>20</width>
-       <height>20</height>
-      </size>
-     </property>
-    </spacer>
+   <item row="0" column="1" >
+    <widget class="QComboBox" name="defaultLanguageCO" />
    </item>
-   <item row="5" column="0" >
-    <widget class="QCheckBox" name="globalCB" >
+   <item row="1" column="1" >
+    <widget class="QLineEdit" name="languagePackageED" />
+   </item>
+   <item row="2" column="1" >
+    <widget class="QLineEdit" name="startCommandED" />
+   </item>
+   <item row="3" column="1" >
+    <widget class="QLineEdit" name="endCommandED" />
+   </item>
+   <item row="2" column="0" >
+    <widget class="QLabel" name="startCommandLA" >
      <property name="text" >
-      <string>&amp;Global</string>
+      <string>Command s&amp;tart:</string>
+     </property>
+     <property name="buddy" >
+      <cstring>startCommandED</cstring>
      </property>
     </widget>
    </item>
-   <item row="5" column="1" >
-    <widget class="QCheckBox" name="rtlCB" >
-     <property name="text" >
-      <string>&amp;Right-to-left language support</string>
-     </property>
-    </widget>
-   </item>
-   <item row="7" column="0" >
-    <widget class="QCheckBox" name="autoEndCB" >
-     <property name="text" >
-      <string>Auto &amp;end</string>
-     </property>
-    </widget>
-   </item>
-   <item row="4" column="1" >
-    <widget class="QCheckBox" name="markForeignCB" >
-     <property name="text" >
-      <string>Mark &amp;foreign languages</string>
-     </property>
-    </widget>
-   </item>
-   <item row="8" column="0" >
-    <spacer>
-     <property name="orientation" >
-      <enum>Qt::Vertical</enum>
-     </property>
-     <property name="sizeType" >
-      <enum>QSizePolicy::Expanding</enum>
-     </property>
-     <property name="sizeHint" >
-      <size>
-       <width>20</width>
-       <height>20</height>
-      </size>
-     </property>
-    </spacer>
-   </item>
-   <item row="8" column="1" >
-    <spacer>
-     <property name="orientation" >
-      <enum>Qt::Vertical</enum>
-     </property>
-     <property name="sizeType" >
-      <enum>QSizePolicy::Expanding</enum>
-     </property>
-     <property name="sizeHint" >
-      <size>
-       <width>20</width>
-       <height>20</height>
-      </size>
-     </property>
-    </spacer>
-   </item>
   </layout>
  </widget>
- <pixmapfunction></pixmapfunction>
- <includes>
-  <include location="local" >qt_helpers.h</include>
- </includes>
  <tabstops>
   <tabstop>defaultLanguageCO</tabstop>
   <tabstop>languagePackageED</tabstop>
@@ -179,6 +156,9 @@
   <tabstop>markForeignCB</tabstop>
   <tabstop>rtlCB</tabstop>
  </tabstops>
+ <includes>
+  <include location="local" >qt_helpers.h</include>
+ </includes>
  <resources/>
  <connections/>
 </ui>
diff --git a/src/frontends/qt4/ui/PrefPlaintextUi.ui b/src/frontends/qt4/ui/PrefPlaintextUi.ui
index 6b3ceca853..af89076cd7 100644
--- a/src/frontends/qt4/ui/PrefPlaintextUi.ui
+++ b/src/frontends/qt4/ui/PrefPlaintextUi.ui
@@ -12,87 +12,14 @@
   <property name="windowTitle" >
    <string/>
   </property>
-  <layout class="QVBoxLayout" >
+  <layout class="QGridLayout" >
    <property name="margin" >
-    <number>11</number>
+    <number>9</number>
    </property>
    <property name="spacing" >
     <number>6</number>
    </property>
-   <item>
-    <layout class="QGridLayout" >
-     <property name="margin" >
-      <number>0</number>
-     </property>
-     <property name="spacing" >
-      <number>6</number>
-     </property>
-     <item row="1" column="0" >
-      <widget class="QLabel" name="plaintextRoffLA" >
-       <property name="text" >
-        <string>&amp;roff command:</string>
-       </property>
-       <property name="buddy" >
-        <cstring>plaintextRoffED</cstring>
-       </property>
-      </widget>
-     </item>
-     <item row="0" column="1" >
-      <layout class="QHBoxLayout" >
-       <property name="margin" >
-        <number>0</number>
-       </property>
-       <property name="spacing" >
-        <number>6</number>
-       </property>
-       <item>
-        <widget class="QSpinBox" name="plaintextLinelengthSB" >
-         <property name="toolTip" >
-          <string>The maximum line length of exported plain text/LaTeX/SGML files. If set to 0, paragraphs are output in a single line; if the line length is > 0, paragraphs are separated by a blank line.</string>
-         </property>
-         <property name="maximum" >
-          <number>120</number>
-         </property>
-        </widget>
-       </item>
-       <item>
-        <spacer>
-         <property name="orientation" >
-          <enum>Qt::Horizontal</enum>
-         </property>
-         <property name="sizeType" >
-          <enum>QSizePolicy::Expanding</enum>
-         </property>
-         <property name="sizeHint" >
-          <size>
-           <width>20</width>
-           <height>20</height>
-          </size>
-         </property>
-        </spacer>
-       </item>
-      </layout>
-     </item>
-     <item row="0" column="0" >
-      <widget class="QLabel" name="plaintextLinelengthLA" >
-       <property name="text" >
-        <string>Output &amp;line length:</string>
-       </property>
-       <property name="buddy" >
-        <cstring>plaintextLinelengthSB</cstring>
-       </property>
-      </widget>
-     </item>
-     <item row="1" column="1" >
-      <widget class="QLineEdit" name="plaintextRoffED" >
-       <property name="toolTip" >
-        <string>External app for formating tables in plain text output</string>
-       </property>
-      </widget>
-     </item>
-    </layout>
-   </item>
-   <item>
+   <item row="2" column="0" colspan="3" >
     <spacer>
      <property name="orientation" >
       <enum>Qt::Vertical</enum>
@@ -108,9 +35,61 @@
      </property>
     </spacer>
    </item>
+   <item row="0" column="2" >
+    <spacer>
+     <property name="orientation" >
+      <enum>Qt::Horizontal</enum>
+     </property>
+     <property name="sizeType" >
+      <enum>QSizePolicy::Expanding</enum>
+     </property>
+     <property name="sizeHint" >
+      <size>
+       <width>20</width>
+       <height>20</height>
+      </size>
+     </property>
+    </spacer>
+   </item>
+   <item row="0" column="1" >
+    <widget class="QSpinBox" name="plaintextLinelengthSB" >
+     <property name="toolTip" >
+      <string>The maximum line length of exported plain text/LaTeX/SGML files. If set to 0, paragraphs are output in a single line; if the line length is > 0, paragraphs are separated by a blank line.</string>
+     </property>
+     <property name="maximum" >
+      <number>120</number>
+     </property>
+    </widget>
+   </item>
+   <item row="0" column="0" >
+    <widget class="QLabel" name="plaintextLinelengthLA" >
+     <property name="text" >
+      <string>Output &amp;line length:</string>
+     </property>
+     <property name="buddy" >
+      <cstring>plaintextLinelengthSB</cstring>
+     </property>
+    </widget>
+   </item>
+   <item row="1" column="0" >
+    <widget class="QLabel" name="plaintextRoffLA" >
+     <property name="text" >
+      <string>&amp;roff command:</string>
+     </property>
+     <property name="buddy" >
+      <cstring>plaintextRoffED</cstring>
+     </property>
+    </widget>
+   </item>
+   <item row="1" column="1" colspan="2" >
+    <widget class="QLineEdit" name="plaintextRoffED" >
+     <property name="toolTip" >
+      <string>External app for formating tables in plain text output</string>
+     </property>
+    </widget>
+   </item>
   </layout>
  </widget>
- <pixmapfunction></pixmapfunction>
  <includes>
   <include location="local" >qt_helpers.h</include>
  </includes>
diff --git a/src/frontends/qt4/ui/PrefPrinterUi.ui b/src/frontends/qt4/ui/PrefPrinterUi.ui
index 085caca58e..3aa604d9b9 100644
--- a/src/frontends/qt4/ui/PrefPrinterUi.ui
+++ b/src/frontends/qt4/ui/PrefPrinterUi.ui
@@ -5,8 +5,8 @@
    <rect>
     <x>0</x>
     <y>0</y>
-    <width>567</width>
-    <height>466</height>
+    <width>380</width>
+    <height>445</height>
    </rect>
   </property>
   <property name="windowTitle" >
@@ -19,7 +19,23 @@
    <property name="spacing" >
     <number>6</number>
    </property>
-   <item row="3" column="0" colspan="2" >
+   <item row="4" column="0" colspan="2" >
+    <spacer>
+     <property name="orientation" >
+      <enum>Qt::Vertical</enum>
+     </property>
+     <property name="sizeType" >
+      <enum>QSizePolicy::Expanding</enum>
+     </property>
+     <property name="sizeHint" >
+      <size>
+       <width>323</width>
+       <height>41</height>
+      </size>
+     </property>
+    </spacer>
+   </item>
+   <item row="2" column="0" colspan="2" >
     <widget class="QGroupBox" name="GroupBox1" >
      <property name="title" >
       <string>Printer Command Options</string>
@@ -41,19 +57,6 @@
       <item row="6" column="1" >
        <widget class="QLineEdit" name="printerExtraED" />
       </item>
-      <item row="6" column="2" colspan="2" >
-       <spacer>
-        <property name="orientation" >
-         <enum>Qt::Horizontal</enum>
-        </property>
-        <property name="sizeHint" >
-         <size>
-          <width>231</width>
-          <height>20</height>
-         </size>
-        </property>
-       </spacer>
-      </item>
       <item row="3" column="3" >
        <widget class="QLineEdit" name="printerToPrinterED" />
       </item>
@@ -237,9 +240,6 @@
       <item row="0" column="3" >
        <widget class="QLineEdit" name="printerOddED" />
       </item>
-      <item row="0" column="1" >
-       <widget class="QLineEdit" name="printerEvenED" />
-      </item>
       <item row="0" column="0" >
        <widget class="QLabel" name="printerEvenLA" >
         <property name="text" >
@@ -286,23 +286,13 @@
         </property>
        </widget>
       </item>
+      <item row="0" column="1" >
+       <widget class="QLineEdit" name="printerEvenED" />
+      </item>
      </layout>
     </widget>
    </item>
-   <item row="1" column="1" >
-    <spacer>
-     <property name="orientation" >
-      <enum>Qt::Horizontal</enum>
-     </property>
-     <property name="sizeHint" >
-      <size>
-       <width>361</width>
-       <height>20</height>
-      </size>
-     </property>
-    </spacer>
-   </item>
-   <item row="1" column="0" >
+   <item row="3" column="0" colspan="2" >
     <widget class="QCheckBox" name="printerAdaptCB" >
      <property name="toolTip" >
       <string>Customizes output to a given printer. Expert option.</string>
@@ -315,71 +305,35 @@
      </property>
     </widget>
    </item>
-   <item row="0" column="0" colspan="2" >
-    <layout class="QHBoxLayout" >
-     <property name="margin" >
-      <number>0</number>
+   <item row="0" column="1" >
+    <widget class="QLineEdit" name="printerNameED" >
+     <property name="toolTip" >
+      <string>Name of the default printer</string>
      </property>
-     <property name="spacing" >
-      <number>6</number>
-     </property>
-     <item>
-      <widget class="QLabel" name="printerNameLA" >
-       <property name="text" >
-        <string>Default &amp;printer:</string>
-       </property>
-       <property name="buddy" >
-        <cstring>printerNameED</cstring>
-       </property>
-      </widget>
-     </item>
-     <item>
-      <widget class="QLineEdit" name="printerNameED" >
-       <property name="toolTip" >
-        <string>Name of the default printer</string>
-       </property>
-      </widget>
-     </item>
-    </layout>
+    </widget>
    </item>
-   <item row="2" column="0" colspan="2" >
-    <layout class="QHBoxLayout" >
-     <property name="margin" >
-      <number>0</number>
+   <item row="0" column="0" >
+    <widget class="QLabel" name="printerNameLA" >
+     <property name="text" >
+      <string>Default &amp;printer:</string>
      </property>
-     <property name="spacing" >
-      <number>6</number>
+     <property name="buddy" >
+      <cstring>printerNameED</cstring>
      </property>
-     <item>
-      <widget class="QLabel" name="printerCommandLA" >
-       <property name="text" >
-        <string>Printer co&amp;mmand:</string>
-       </property>
-       <property name="buddy" >
-        <cstring>printerCommandED</cstring>
-       </property>
-      </widget>
-     </item>
-     <item>
-      <widget class="QLineEdit" name="printerCommandED" />
-     </item>
-    </layout>
+    </widget>
    </item>
-   <item row="4" column="1" >
-    <spacer>
-     <property name="orientation" >
-      <enum>Qt::Vertical</enum>
+   <item row="1" column="1" >
+    <widget class="QLineEdit" name="printerCommandED" />
+   </item>
+   <item row="1" column="0" >
+    <widget class="QLabel" name="printerCommandLA" >
+     <property name="text" >
+      <string>Printer co&amp;mmand:</string>
      </property>
-     <property name="sizeType" >
-      <enum>QSizePolicy::Expanding</enum>
+     <property name="buddy" >
+      <cstring>printerCommandED</cstring>
      </property>
-     <property name="sizeHint" >
-      <size>
-       <width>20</width>
-       <height>31</height>
-      </size>
-     </property>
-    </spacer>
+    </widget>
    </item>
   </layout>
  </widget>
diff --git a/src/frontends/qt4/ui/PrefSpellcheckerUi.ui b/src/frontends/qt4/ui/PrefSpellcheckerUi.ui
index 8f757e311d..d75b646fc9 100644
--- a/src/frontends/qt4/ui/PrefSpellcheckerUi.ui
+++ b/src/frontends/qt4/ui/PrefSpellcheckerUi.ui
@@ -5,163 +5,21 @@
    <rect>
     <x>0</x>
     <y>0</y>
-    <width>386</width>
-    <height>268</height>
+    <width>319</width>
+    <height>198</height>
    </rect>
   </property>
   <property name="windowTitle" >
    <string/>
   </property>
-  <layout class="QVBoxLayout" >
+  <layout class="QGridLayout" >
    <property name="margin" >
-    <number>11</number>
+    <number>9</number>
    </property>
    <property name="spacing" >
     <number>6</number>
    </property>
-   <item>
-    <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="spellCommandLA" >
-       <property name="text" >
-        <string>Spellchec&amp;ker executable:</string>
-       </property>
-       <property name="buddy" >
-        <cstring>spellCommandCO</cstring>
-       </property>
-      </widget>
-     </item>
-     <item row="2" column="1" >
-      <widget class="QLineEdit" name="escapeCharactersED" />
-     </item>
-     <item row="0" column="2" >
-      <spacer>
-       <property name="orientation" >
-        <enum>Qt::Horizontal</enum>
-       </property>
-       <property name="sizeType" >
-        <enum>QSizePolicy::Expanding</enum>
-       </property>
-       <property name="sizeHint" >
-        <size>
-         <width>20</width>
-         <height>20</height>
-        </size>
-       </property>
-      </spacer>
-     </item>
-     <item row="1" column="1" >
-      <widget class="QLineEdit" name="altLanguageED" >
-       <property name="toolTip" >
-        <string>Override the language used for the spellchecker</string>
-       </property>
-      </widget>
-     </item>
-     <item row="1" column="0" >
-      <widget class="QLabel" name="altLanguageLA" >
-       <property name="text" >
-        <string>Al&amp;ternative language:</string>
-       </property>
-       <property name="buddy" >
-        <cstring>altLanguageED</cstring>
-       </property>
-      </widget>
-     </item>
-     <item row="3" column="2" >
-      <widget class="QPushButton" name="persDictionaryPB" >
-       <property name="text" >
-        <string>Br&amp;owse...</string>
-       </property>
-      </widget>
-     </item>
-     <item row="2" column="0" >
-      <widget class="QLabel" name="escapeCharactersLA" >
-       <property name="text" >
-        <string>Escape cha&amp;racters:</string>
-       </property>
-       <property name="buddy" >
-        <cstring>escapeCharactersED</cstring>
-       </property>
-      </widget>
-     </item>
-     <item row="2" column="2" >
-      <spacer>
-       <property name="orientation" >
-        <enum>Qt::Horizontal</enum>
-       </property>
-       <property name="sizeType" >
-        <enum>QSizePolicy::Expanding</enum>
-       </property>
-       <property name="sizeHint" >
-        <size>
-         <width>20</width>
-         <height>20</height>
-        </size>
-       </property>
-      </spacer>
-     </item>
-     <item row="3" column="1" >
-      <widget class="QLineEdit" name="persDictionaryED" >
-       <property name="toolTip" >
-        <string>Specify a personal dictionary file other than the default</string>
-       </property>
-      </widget>
-     </item>
-     <item row="3" column="0" >
-      <widget class="QLabel" name="persDictionaryLA" >
-       <property name="text" >
-        <string>Personal &amp;dictionary:</string>
-       </property>
-       <property name="buddy" >
-        <cstring>persDictionaryED</cstring>
-       </property>
-      </widget>
-     </item>
-     <item row="0" column="1" >
-      <widget class="QComboBox" name="spellCommandCO" />
-     </item>
-     <item row="1" column="2" >
-      <spacer>
-       <property name="orientation" >
-        <enum>Qt::Horizontal</enum>
-       </property>
-       <property name="sizeType" >
-        <enum>QSizePolicy::Expanding</enum>
-       </property>
-       <property name="sizeHint" >
-        <size>
-         <width>20</width>
-         <height>20</height>
-        </size>
-       </property>
-      </spacer>
-     </item>
-    </layout>
-   </item>
-   <item>
-    <widget class="QCheckBox" name="compoundWordCB" >
-     <property name="toolTip" >
-      <string>Accept words such as "diskdrive"</string>
-     </property>
-     <property name="text" >
-      <string>Accept compound &amp;words</string>
-     </property>
-    </widget>
-   </item>
-   <item>
-    <widget class="QCheckBox" name="inputEncodingCB" >
-     <property name="text" >
-      <string>Use input encod&amp;ing</string>
-     </property>
-    </widget>
-   </item>
-   <item>
+   <item row="6" column="0" colspan="3" >
     <spacer>
      <property name="orientation" >
       <enum>Qt::Vertical</enum>
@@ -177,12 +35,108 @@
      </property>
     </spacer>
    </item>
+   <item row="3" column="3" >
+    <spacer>
+     <property name="orientation" >
+      <enum>Qt::Horizontal</enum>
+     </property>
+     <property name="sizeType" >
+      <enum>QSizePolicy::Expanding</enum>
+     </property>
+     <property name="sizeHint" >
+      <size>
+       <width>41</width>
+       <height>22</height>
+      </size>
+     </property>
+    </spacer>
+   </item>
+   <item row="3" column="2" >
+    <widget class="QPushButton" name="persDictionaryPB" >
+     <property name="text" >
+      <string>Br&amp;owse...</string>
+     </property>
+    </widget>
+   </item>
+   <item row="1" column="0" >
+    <widget class="QLabel" name="altLanguageLA" >
+     <property name="text" >
+      <string>Al&amp;ternative language:</string>
+     </property>
+     <property name="buddy" >
+      <cstring>altLanguageED</cstring>
+     </property>
+    </widget>
+   </item>
+   <item row="2" column="1" >
+    <widget class="QLineEdit" name="escapeCharactersED" />
+   </item>
+   <item row="3" column="1" >
+    <widget class="QLineEdit" name="persDictionaryED" >
+     <property name="toolTip" >
+      <string>Specify a personal dictionary file other than the default</string>
+     </property>
+    </widget>
+   </item>
+   <item row="0" column="1" >
+    <widget class="QComboBox" name="spellCommandCO" />
+   </item>
+   <item row="3" column="0" >
+    <widget class="QLabel" name="persDictionaryLA" >
+     <property name="text" >
+      <string>Personal &amp;dictionary:</string>
+     </property>
+     <property name="buddy" >
+      <cstring>persDictionaryED</cstring>
+     </property>
+    </widget>
+   </item>
+   <item row="2" column="0" >
+    <widget class="QLabel" name="escapeCharactersLA" >
+     <property name="text" >
+      <string>Escape cha&amp;racters:</string>
+     </property>
+     <property name="buddy" >
+      <cstring>escapeCharactersED</cstring>
+     </property>
+    </widget>
+   </item>
+   <item row="0" column="0" >
+    <widget class="QLabel" name="spellCommandLA" >
+     <property name="text" >
+      <string>Spellchec&amp;ker executable:</string>
+     </property>
+     <property name="buddy" >
+      <cstring>spellCommandCO</cstring>
+     </property>
+    </widget>
+   </item>
+   <item row="1" column="1" >
+    <widget class="QLineEdit" name="altLanguageED" >
+     <property name="toolTip" >
+      <string>Override the language used for the spellchecker</string>
+     </property>
+    </widget>
+   </item>
+   <item row="5" column="0" colspan="3" >
+    <widget class="QCheckBox" name="inputEncodingCB" >
+     <property name="text" >
+      <string>Use input encod&amp;ing</string>
+     </property>
+    </widget>
+   </item>
+   <item row="4" column="0" colspan="3" >
+    <widget class="QCheckBox" name="compoundWordCB" >
+     <property name="toolTip" >
+      <string>Accept words such as "diskdrive"</string>
+     </property>
+     <property name="text" >
+      <string>Accept compound &amp;words</string>
+     </property>
+    </widget>
+   </item>
   </layout>
  </widget>
- <pixmapfunction></pixmapfunction>
- <includes>
-  <include location="local" >qt_helpers.h</include>
- </includes>
  <tabstops>
   <tabstop>spellCommandCO</tabstop>
   <tabstop>altLanguageED</tabstop>
@@ -192,6 +146,9 @@
   <tabstop>compoundWordCB</tabstop>
   <tabstop>inputEncodingCB</tabstop>
  </tabstops>
+ <includes>
+  <include location="local" >qt_helpers.h</include>
+ </includes>
  <resources/>
  <connections/>
 </ui>
diff --git a/src/frontends/qt4/ui/PrefUi.ui b/src/frontends/qt4/ui/PrefUi.ui
index 7dad6d6d3d..6fdd3a6fb7 100644
--- a/src/frontends/qt4/ui/PrefUi.ui
+++ b/src/frontends/qt4/ui/PrefUi.ui
@@ -5,8 +5,8 @@
    <rect>
     <x>0</x>
     <y>0</y>
-    <width>459</width>
-    <height>425</height>
+    <width>398</width>
+    <height>418</height>
    </rect>
   </property>
   <property name="sizePolicy" >
@@ -27,45 +27,7 @@
    <property name="spacing" >
     <number>6</number>
    </property>
-   <item row="3" column="2" colspan="2" >
-    <widget class="QGroupBox" name="scrollGB" >
-     <property name="title" >
-      <string>Scrolling</string>
-     </property>
-     <property name="alignment" >
-      <set>Qt::AlignLeading|Qt::AlignLeft|Qt::AlignTop</set>
-     </property>
-     <layout class="QVBoxLayout" >
-      <property name="margin" >
-       <number>11</number>
-      </property>
-      <property name="spacing" >
-       <number>6</number>
-      </property>
-      <item>
-       <widget class="QCheckBox" name="cursorFollowsCB" >
-        <property name="text" >
-         <string>Cursor follows &amp;scrollbar</string>
-        </property>
-       </widget>
-      </item>
-      <item>
-       <spacer>
-        <property name="orientation" >
-         <enum>Qt::Vertical</enum>
-        </property>
-        <property name="sizeHint" >
-         <size>
-          <width>20</width>
-          <height>40</height>
-         </size>
-        </property>
-       </spacer>
-      </item>
-     </layout>
-    </widget>
-   </item>
-   <item row="4" column="1" >
+   <item row="5" column="1" >
     <spacer>
      <property name="orientation" >
       <enum>Qt::Vertical</enum>
@@ -78,7 +40,130 @@
      </property>
     </spacer>
    </item>
-   <item row="1" column="3" >
+   <item row="4" column="0" colspan="3" >
+    <widget class="QGroupBox" name="scrollGB" >
+     <property name="title" >
+      <string>Scrolling</string>
+     </property>
+     <property name="alignment" >
+      <set>Qt::AlignLeading|Qt::AlignLeft|Qt::AlignTop</set>
+     </property>
+     <property name="flat" >
+      <bool>true</bool>
+     </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="QCheckBox" name="cursorFollowsCB" >
+        <property name="text" >
+         <string>Cursor follows &amp;scrollbar</string>
+        </property>
+       </widget>
+      </item>
+     </layout>
+    </widget>
+   </item>
+   <item row="3" column="0" colspan="3" >
+    <widget class="QGroupBox" name="documentsGB" >
+     <property name="title" >
+      <string>Documents</string>
+     </property>
+     <property name="flat" >
+      <bool>true</bool>
+     </property>
+     <layout class="QGridLayout" >
+      <property name="margin" >
+       <number>9</number>
+      </property>
+      <property name="spacing" >
+       <number>6</number>
+      </property>
+      <item row="0" column="1" >
+       <widget class="QSpinBox" name="autoSaveSB" >
+        <property name="maximum" >
+         <number>300</number>
+        </property>
+        <property name="minimum" >
+         <number>1</number>
+        </property>
+       </widget>
+      </item>
+      <item row="0" column="0" >
+       <widget class="QCheckBox" name="autoSaveCB" >
+        <property name="text" >
+         <string>B&amp;ackup documents, every</string>
+        </property>
+       </widget>
+      </item>
+      <item row="0" column="2" >
+       <widget class="QLabel" name="TextLabel1" >
+        <property name="text" >
+         <string>minutes</string>
+        </property>
+       </widget>
+      </item>
+      <item row="0" column="3" >
+       <spacer>
+        <property name="orientation" >
+         <enum>Qt::Horizontal</enum>
+        </property>
+        <property name="sizeHint" >
+         <size>
+          <width>40</width>
+          <height>20</height>
+         </size>
+        </property>
+       </spacer>
+      </item>
+      <item row="1" column="0" colspan="4" >
+       <layout class="QHBoxLayout" >
+        <property name="margin" >
+         <number>0</number>
+        </property>
+        <property name="spacing" >
+         <number>6</number>
+        </property>
+        <item>
+         <widget class="QLabel" name="lastfilesLA" >
+          <property name="text" >
+           <string>&amp;Maximum last files:</string>
+          </property>
+          <property name="buddy" >
+           <cstring>lastfilesSB</cstring>
+          </property>
+         </widget>
+        </item>
+        <item>
+         <widget class="QSpinBox" name="lastfilesSB" >
+          <property name="maximum" >
+           <number>9</number>
+          </property>
+         </widget>
+        </item>
+        <item>
+         <spacer>
+          <property name="orientation" >
+           <enum>Qt::Horizontal</enum>
+          </property>
+          <property name="sizeHint" >
+           <size>
+            <width>40</width>
+            <height>20</height>
+           </size>
+          </property>
+         </spacer>
+        </item>
+       </layout>
+      </item>
+     </layout>
+    </widget>
+   </item>
+   <item row="1" column="2" >
     <widget class="QPushButton" name="bindFilePB" >
      <property name="text" >
       <string>B&amp;rowse...</string>
@@ -105,20 +190,20 @@
      </property>
     </widget>
    </item>
-   <item row="0" column="1" colspan="2" >
+   <item row="0" column="1" >
     <widget class="QLineEdit" name="uiFileED" />
    </item>
-   <item row="0" column="3" >
+   <item row="0" column="2" >
     <widget class="QPushButton" name="uiFilePB" >
      <property name="text" >
       <string>Bro&amp;wse...</string>
      </property>
     </widget>
    </item>
-   <item row="1" column="1" colspan="2" >
+   <item row="1" column="1" >
     <widget class="QLineEdit" name="bindFileED" />
    </item>
-   <item row="2" column="0" colspan="4" >
+   <item row="2" column="0" colspan="3" >
     <widget class="QGroupBox" name="GeometryGB" >
      <property name="sizePolicy" >
       <sizepolicy>
@@ -131,6 +216,9 @@
      <property name="title" >
       <string>Session</string>
      </property>
+     <property name="flat" >
+      <bool>true</bool>
+     </property>
      <layout class="QGridLayout" >
       <property name="margin" >
        <number>9</number>
@@ -285,108 +373,6 @@
      </layout>
     </widget>
    </item>
-   <item row="3" column="0" colspan="2" >
-    <widget class="QGroupBox" name="documentsGB" >
-     <property name="title" >
-      <string>Documents</string>
-     </property>
-     <layout class="QVBoxLayout" >
-      <property name="margin" >
-       <number>11</number>
-      </property>
-      <property name="spacing" >
-       <number>6</number>
-      </property>
-      <item>
-       <widget class="QCheckBox" name="autoSaveCB" >
-        <property name="text" >
-         <string>B&amp;ackup documents </string>
-        </property>
-       </widget>
-      </item>
-      <item>
-       <layout class="QHBoxLayout" >
-        <property name="margin" >
-         <number>0</number>
-        </property>
-        <property name="spacing" >
-         <number>6</number>
-        </property>
-        <item>
-         <spacer>
-          <property name="orientation" >
-           <enum>Qt::Horizontal</enum>
-          </property>
-          <property name="sizeType" >
-           <enum>QSizePolicy::Fixed</enum>
-          </property>
-          <property name="sizeHint" >
-           <size>
-            <width>21</width>
-            <height>20</height>
-           </size>
-          </property>
-         </spacer>
-        </item>
-        <item>
-         <widget class="QLabel" name="autoSaveLA" >
-          <property name="text" >
-           <string> every</string>
-          </property>
-          <property name="buddy" >
-           <cstring>autoSaveSB</cstring>
-          </property>
-         </widget>
-        </item>
-        <item>
-         <widget class="QSpinBox" name="autoSaveSB" >
-          <property name="maximum" >
-           <number>300</number>
-          </property>
-          <property name="minimum" >
-           <number>1</number>
-          </property>
-         </widget>
-        </item>
-        <item>
-         <widget class="QLabel" name="TextLabel1" >
-          <property name="text" >
-           <string>minutes</string>
-          </property>
-         </widget>
-        </item>
-       </layout>
-      </item>
-      <item>
-       <layout class="QHBoxLayout" >
-        <property name="margin" >
-         <number>0</number>
-        </property>
-        <property name="spacing" >
-         <number>6</number>
-        </property>
-        <item>
-         <widget class="QLabel" name="lastfilesLA" >
-          <property name="text" >
-           <string>&amp;Maximum last files:</string>
-          </property>
-          <property name="buddy" >
-           <cstring>lastfilesSB</cstring>
-          </property>
-         </widget>
-        </item>
-        <item>
-         <widget class="QSpinBox" name="lastfilesSB" >
-          <property name="maximum" >
-           <number>9</number>
-          </property>
-         </widget>
-        </item>
-       </layout>
-      </item>
-     </layout>
-    </widget>
-   </item>
   </layout>
  </widget>
  <tabstops>