diff --git a/lib/doc/UserGuide.lyx b/lib/doc/UserGuide.lyx
index 3ec8cde0ff..ac15b55ccf 100644
--- a/lib/doc/UserGuide.lyx
+++ b/lib/doc/UserGuide.lyx
@@ -1,5 +1,5 @@
-#LyX 1.6.1svn created this file. For more info see http://www.lyx.org/
-\lyxformat 345
+#LyX 2.0.0svn created this file. For more info see http://www.lyx.org/
+\lyxformat 346
 \begin_document
 \begin_header
 \textclass scrbook
@@ -38398,8 +38398,8 @@ Document Class
 \end_layout
 
 \begin_layout Standard
-Here you set the document class, class options, a Postscript driver, and
- a master document.
+Here you set the document class, class options, a graphics driver, and a
+ master document.
  Document classes are described in section
 \begin_inset space ~
 \end_inset
@@ -38420,13 +38420,14 @@ Predefined
  and you can decide to use them or not.
  If you don't exactly know what the default class options are for, it is
  recommended not to touch them.
- The Postscript driver is used for LaTeX's color and graphics packages.
+ The graphics driver is used for LaTeX's graphics, color and page layout
+ packages.
  When using 
 \family sans
 Default
 \family default
 , the default driver for the LaTeX-packages are used.
- It is recommended to use the default unless your know what you are doing.
+ It is recommended to use the default unless you know what you are doing.
 \begin_inset Foot
 status collapsed
 
diff --git a/src/frontends/qt4/ui/LaTeXUi.ui b/src/frontends/qt4/ui/LaTeXUi.ui
index 0c12b684ad..140a44c9f9 100644
--- a/src/frontends/qt4/ui/LaTeXUi.ui
+++ b/src/frontends/qt4/ui/LaTeXUi.ui
@@ -12,13 +12,25 @@
   <property name="windowTitle" >
    <string/>
   </property>
-  <layout class="QGridLayout" name="gridLayout" >
+  <layout class="QGridLayout" >
+   <property name="margin" >
+    <number>9</number>
+   </property>
+   <property name="spacing" >
+    <number>6</number>
+   </property>
    <item row="0" column="0" colspan="3" >
     <widget class="QGroupBox" name="groupBox" >
      <property name="title" >
       <string>Document &amp;class</string>
      </property>
-     <layout class="QGridLayout" name="gridLayout_2" >
+     <layout class="QGridLayout" >
+      <property name="margin" >
+       <number>9</number>
+      </property>
+      <property name="spacing" >
+       <number>6</number>
+      </property>
       <item row="0" column="0" >
        <widget class="QComboBox" name="classCO" >
         <property name="maxVisibleItems" >
@@ -29,7 +41,9 @@
       <item row="0" column="1" >
        <widget class="QPushButton" name="layoutPB" >
         <property name="sizePolicy" >
-         <sizepolicy vsizetype="Minimum" hsizetype="Fixed" >
+         <sizepolicy>
+          <hsizetype>0</hsizetype>
+          <vsizetype>0</vsizetype>
           <horstretch>0</horstretch>
           <verstretch>0</verstretch>
          </sizepolicy>
@@ -59,12 +73,12 @@
       </property>
       <item rowspan="2" row="0" column="1" >
        <layout class="QVBoxLayout" >
-        <property name="spacing" >
-         <number>6</number>
-        </property>
         <property name="margin" >
          <number>0</number>
         </property>
+        <property name="spacing" >
+         <number>6</number>
+        </property>
         <item>
          <widget class="QLineEdit" name="defaultOptionsLE" >
           <property name="toolTip" >
@@ -101,15 +115,12 @@
        </widget>
       </item>
      </layout>
-     <zorder>defaultOptionsCB</zorder>
-     <zorder>optionsL</zorder>
-     <zorder>groupBox</zorder>
     </widget>
    </item>
    <item row="2" column="0" >
     <widget class="QLabel" name="psdriverL" >
      <property name="text" >
-      <string>&amp;Postscript driver:</string>
+      <string>&amp;Graphics driver:</string>
      </property>
      <property name="buddy" >
       <cstring>psdriverCO</cstring>
@@ -128,7 +139,7 @@
      <property name="orientation" >
       <enum>Qt::Horizontal</enum>
      </property>
-     <property name="sizeHint" stdset="0" >
+     <property name="sizeHint" >
       <size>
        <width>261</width>
        <height>22</height>
@@ -185,11 +196,11 @@
     </widget>
    </item>
    <item row="4" column="0" >
-    <spacer name="verticalSpacer" >
+    <spacer>
      <property name="orientation" >
       <enum>Qt::Vertical</enum>
      </property>
-     <property name="sizeHint" stdset="0" >
+     <property name="sizeHint" >
       <size>
        <width>20</width>
        <height>2</height>