diff --git a/src/frontends/qt2/ChangeLog b/src/frontends/qt2/ChangeLog
index dfcfc79163..91e3032c82 100644
--- a/src/frontends/qt2/ChangeLog
+++ b/src/frontends/qt2/ChangeLog
@@ -1,3 +1,14 @@
+2003-03-28  John Levon  <levon@movementarian.org>
+
+	* panelstack.C: make sure the first panel is visible
+
+	* QDocument.h:
+	* QDocument.C: add (unused) showPreamble
+
+	* QDocumentDialog.h:
+	* QDocumentDialog.C:
+	* ui/QDocumentDialog.ui: use PanelStack
+
 2003-03-28  John Levon  <levon@movementarian.org>
 
 	* Makefile.am:
diff --git a/src/frontends/qt2/Dialogs2.C b/src/frontends/qt2/Dialogs2.C
index 1f7475da80..a3f01a84a2 100644
--- a/src/frontends/qt2/Dialogs2.C
+++ b/src/frontends/qt2/Dialogs2.C
@@ -129,7 +129,9 @@ void Dialogs::showMathPanel()
 
 void Dialogs::showPreamble()
 {
-	// FIXME
+	pimpl_->document.controller().show();
+	// Oh Angus, won't you help a poor child ?
+	//pimpl_->document.view()->showPreamble();
 }
 
 
diff --git a/src/frontends/qt2/QDocument.C b/src/frontends/qt2/QDocument.C
index 10bea27566..e4ce2caff6 100644
--- a/src/frontends/qt2/QDocument.C
+++ b/src/frontends/qt2/QDocument.C
@@ -165,6 +165,12 @@ void QDocument::build_dialog()
 }
 
 
+void QDocument::showPreamble()
+{
+	dialog_->showPreamble();
+}
+
+
 void QDocument::apply()
 {
 	BufferParams & params = controller().params();
diff --git a/src/frontends/qt2/QDocument.h b/src/frontends/qt2/QDocument.h
index 95d2836e25..fe20ff8b5e 100644
--- a/src/frontends/qt2/QDocument.h
+++ b/src/frontends/qt2/QDocument.h
@@ -32,6 +32,9 @@ public:
 	friend class QDocumentDialog;
 
 	QDocument();
+
+	void showPreamble();
+
 private:
 	/// Apply changes
 	void apply();
diff --git a/src/frontends/qt2/QDocumentDialog.C b/src/frontends/qt2/QDocumentDialog.C
index 960167b63e..481a15091b 100644
--- a/src/frontends/qt2/QDocumentDialog.C
+++ b/src/frontends/qt2/QDocumentDialog.C
@@ -27,6 +27,7 @@
 #include "ui/NumberingModuleBase.h"
 #include "ui/MarginsModuleBase.h"
 #include "ui/PreambleModuleBase.h"
+#include "panelstack.h"
 
 #include "Spacing.h"
 #include "support/lstrings.h"
@@ -59,19 +60,6 @@ QDocumentDialog::QDocumentDialog(QDocument * form)
 	connect(restorePB, SIGNAL(clicked()),
 		form, SLOT(slotRestore()));
 
-	moduleLB->clear();
-	moduleLB->insertItem(qt_("Layout"), LAYOUT);
-	moduleLB->insertItem(qt_("Paper"), PAPER);
-	moduleLB->insertItem(qt_("Margins"), MARGINS);
-	moduleLB->insertItem(qt_("Language"), LANGUAGE);
-	moduleLB->insertItem(qt_("Bullets"), BULLETS);
-	moduleLB->insertItem(qt_("Numbering"), NUMBERING);
-	moduleLB->insertItem(qt_("Bibliography"), BIBLIOGRAPHY);
-	moduleLB->insertItem(qt_("Packages"), PACKAGES);
-	moduleLB->insertItem(qt_("Preamble"), PREAMBLE);
-	moduleLB->setCurrentItem(LAYOUT);
-	moduleLB->setMinimumSize(moduleLB->sizeHint());
-
 	layoutModule = new ClassModuleBase(this);
 	paperModule = new PaperModuleBase(this);
 	marginsModule = new MarginsModuleBase(this);
@@ -82,168 +70,92 @@ QDocumentDialog::QDocumentDialog(QDocument * form)
 	packagesModule = new PackagesModuleBase(this);
 	preambleModule = new PreambleModuleBase(this);
 
-	moduleStack->addWidget(layoutModule, LAYOUT);
-	moduleStack->addWidget(paperModule, PAPER);
-	moduleStack->addWidget(marginsModule, MARGINS);
-	moduleStack->addWidget(langModule, LANGUAGE);
-	moduleStack->addWidget(bulletsModule, BULLETS);
-	moduleStack->addWidget(numberingModule, NUMBERING);
-	moduleStack->addWidget(biblioModule, BIBLIOGRAPHY);
-	moduleStack->addWidget(packagesModule, PACKAGES);
-	moduleStack->addWidget(preambleModule, PREAMBLE);
-
-	moduleStack->raiseWidget(LAYOUT);
-
-
-	// take care of title
-	QFont f = titleL->font();
-	f.setWeight(QFont::Bold);
-	titleL->setFont(f);
-	setTitle(LAYOUT);
+	docPS->addPanel(layoutModule, _("Layout"));
+	docPS->addPanel(paperModule, _("Paper"));
+	docPS->addPanel(marginsModule, _("Margins"));
+	docPS->addPanel(langModule, _("Language"));
+	docPS->addPanel(numberingModule, _("Table of Contents"));
+	docPS->addPanel(biblioModule, _("Bibliography"));
+	docPS->addPanel(packagesModule, _("LaTeX packages"));
+	docPS->addPanel(bulletsModule, _("Bullets"));
+	docPS->addPanel(preambleModule, _("LaTeX Preamble"));
+	docPS->setCurrentPanel(_("Layout"));
 
 	// preamble
-	connect(preambleModule->preambleMLE, SIGNAL(textChanged()),
-		 this, SLOT(change_adaptor()));
+	connect(preambleModule->preambleMLE, SIGNAL(textChanged()), this, SLOT(change_adaptor()));
 	// biblio
-	connect(biblioModule->natbibCB, SIGNAL(toggled(bool)),
-		 this, SLOT(change_adaptor()));
-	connect(biblioModule->citeStyleCO, SIGNAL(activated(int)),
-		 this, SLOT(change_adaptor()));
+	connect(biblioModule->natbibCB, SIGNAL(toggled(bool)), this, SLOT(change_adaptor()));
+	connect(biblioModule->citeStyleCO, SIGNAL(activated(int)), this, SLOT(change_adaptor()));
 	// language & quote
-	connect(langModule->singleQuoteRB, SIGNAL(toggled(bool)),
-		 this, SLOT(change_adaptor()));
-	connect(langModule->doubleQuoteRB, SIGNAL(toggled(bool)),
-		 this, SLOT(change_adaptor()));
-	connect(langModule->languageCO, SIGNAL(activated(int)),
-		 this, SLOT(change_adaptor()));
-	connect(langModule->defaultencodingCB, SIGNAL(toggled(bool)),
-		 this, SLOT(change_adaptor()));
-	connect(langModule->encodingCO, SIGNAL(activated(int)),
-		 this, SLOT(change_adaptor()));
-	connect(langModule->quoteStyleCO, SIGNAL(activated(int)),
-		 this, SLOT(change_adaptor()));
+	connect(langModule->singleQuoteRB, SIGNAL(toggled(bool)), this, SLOT(change_adaptor()));
+	connect(langModule->doubleQuoteRB, SIGNAL(toggled(bool)), this, SLOT(change_adaptor()));
+	connect(langModule->languageCO, SIGNAL(activated(int)), this, SLOT(change_adaptor()));
+	connect(langModule->defaultencodingCB, SIGNAL(toggled(bool)), this, SLOT(change_adaptor()));
+	connect(langModule->encodingCO, SIGNAL(activated(int)), this, SLOT(change_adaptor()));
+	connect(langModule->quoteStyleCO, SIGNAL(activated(int)), this, SLOT(change_adaptor()));
 	// numbering
-	connect(numberingModule->sectionnrDepthSB,
-		 SIGNAL(valueChanged(int)),
-		 this, SLOT(change_adaptor()));
-	connect(numberingModule->tocDepthSB,
-		 SIGNAL(valueChanged(int)),
-		 this, SLOT(change_adaptor()));
+	connect(numberingModule->sectionnrDepthSB, SIGNAL(valueChanged(int)), this, SLOT(change_adaptor()));
+	connect(numberingModule->tocDepthSB, SIGNAL(valueChanged(int)), this, SLOT(change_adaptor()));
 	// packages
-	connect(packagesModule->amsCB, SIGNAL(toggled(bool)),
-		 this, SLOT(change_adaptor()));
-	connect(packagesModule->psdriverCO, SIGNAL(activated(int)),
-		 this, SLOT(change_adaptor()));
+	connect(packagesModule->amsCB, SIGNAL(toggled(bool)), this, SLOT(change_adaptor()));
+	connect(packagesModule->psdriverCO, SIGNAL(activated(int)), this, SLOT(change_adaptor()));
 	// layout
-	connect(layoutModule->classCO, SIGNAL(activated(int)),
-		 this, SLOT(change_adaptor()));
-	connect(layoutModule->optionsLE,
-		 SIGNAL(textChanged(const QString&)),
-		 this, SLOT(change_adaptor()));
-	connect(layoutModule->pagestyleCO, SIGNAL(activated(int)),
-		 this, SLOT(change_adaptor()));
-	connect(layoutModule->fontsCO, SIGNAL(activated(int)),
-		 this, SLOT(change_adaptor()));
-	connect(layoutModule->fontsizeCO, SIGNAL(activated(int)),
-		 this, SLOT(change_adaptor()));
-	connect(layoutModule->lspacingCO, SIGNAL(activated(int)),
-		 this, SLOT(change_adaptor()));
-	connect(layoutModule->lspacingCO, SIGNAL(activated(int)),
-		 this, SLOT(setLSpacing(int)));
-	connect(layoutModule->lspacingLE,
-		 SIGNAL(textChanged(const QString&)),
-		 this, SLOT(change_adaptor()));
-	connect(layoutModule->floatPlacementLE,
-		 SIGNAL(textChanged(const QString&)),
-		 this, SLOT(change_adaptor()));
-	connect(layoutModule->skipRB, SIGNAL(toggled(bool)),
-		 this, SLOT(change_adaptor()));
-	connect(layoutModule->indentRB, SIGNAL(toggled(bool)),
-		 this, SLOT(change_adaptor()));
-	connect(layoutModule->skipCO, SIGNAL(activated(int)),
-		 this, SLOT(change_adaptor()));
-	connect(layoutModule->skipLE,
-		 SIGNAL(textChanged(const QString&)),
-		 this, SLOT(change_adaptor()));
-	connect(layoutModule->skipLengthCO, SIGNAL(activated(int)),
-		 this, SLOT(change_adaptor()));
+	connect(layoutModule->classCO, SIGNAL(activated(int)), this, SLOT(change_adaptor()));
+	connect(layoutModule->optionsLE, SIGNAL(textChanged(const QString&)), this, SLOT(change_adaptor()));
+	connect(layoutModule->pagestyleCO, SIGNAL(activated(int)), this, SLOT(change_adaptor()));
+	connect(layoutModule->fontsCO, SIGNAL(activated(int)), this, SLOT(change_adaptor()));
+	connect(layoutModule->fontsizeCO, SIGNAL(activated(int)), this, SLOT(change_adaptor()));
+	connect(layoutModule->lspacingCO, SIGNAL(activated(int)), this, SLOT(change_adaptor()));
+	connect(layoutModule->lspacingCO, SIGNAL(activated(int)), this, SLOT(setLSpacing(int)));
+	connect(layoutModule->lspacingLE, SIGNAL(textChanged(const QString&)), this, SLOT(change_adaptor()));
+	connect(layoutModule->floatPlacementLE, SIGNAL(textChanged(const QString&)), this, SLOT(change_adaptor()));
+	connect(layoutModule->skipRB, SIGNAL(toggled(bool)), this, SLOT(change_adaptor()));
+	connect(layoutModule->indentRB, SIGNAL(toggled(bool)), this, SLOT(change_adaptor()));
+	connect(layoutModule->skipCO, SIGNAL(activated(int)), this, SLOT(change_adaptor()));
+	connect(layoutModule->skipLE, SIGNAL(textChanged(const QString&)), this, SLOT(change_adaptor()));
+	connect(layoutModule->skipLengthCO, SIGNAL(activated(int)), this, SLOT(change_adaptor()));
 
-	connect(layoutModule->classCO, SIGNAL(activated(int)),
-		 this, SLOT(classChanged()));
-	connect(layoutModule->skipCO, SIGNAL(activated(int)),
-		 this, SLOT(setSkip(int)));
-	connect(layoutModule->skipRB, SIGNAL(toggled(bool)),
-		 this, SLOT(enableSkip(bool)));
+	connect(layoutModule->classCO, SIGNAL(activated(int)), this, SLOT(classChanged()));
+	connect(layoutModule->skipCO, SIGNAL(activated(int)), this, SLOT(setSkip(int)));
+	connect(layoutModule->skipRB, SIGNAL(toggled(bool)), this, SLOT(enableSkip(bool)));
 
 	// margins
-	connect(marginsModule->marginCO, SIGNAL(activated(int)),
-		 this, SLOT(setCustomMargins(int)));
-
-	connect(marginsModule->marginCO, SIGNAL(activated(int)),
-		 this, SLOT(change_adaptor()));
-	connect(marginsModule->topLE, SIGNAL(textChanged(const QString&)),
-		 this, SLOT(change_adaptor()));
-	connect(marginsModule->topUnit, SIGNAL(activated(int)),
-		 this, SLOT(change_adaptor()));
-	connect(marginsModule->bottomLE, SIGNAL(textChanged(const QString&)),
-		 this, SLOT(change_adaptor()));
-	connect(marginsModule->bottomUnit, SIGNAL(activated(int)),
-		 this, SLOT(change_adaptor()));
-	connect(marginsModule->innerLE, SIGNAL(textChanged(const QString&)),
-		 this, SLOT(change_adaptor()));
-	connect(marginsModule->innerUnit, SIGNAL(activated(int)),
-		 this, SLOT(change_adaptor()));
-	connect(marginsModule->outerLE, SIGNAL(textChanged(const QString&)),
-		 this, SLOT(change_adaptor()));
-	connect(marginsModule->outerUnit, SIGNAL(activated(int)),
-		 this, SLOT(change_adaptor()));
-	connect(marginsModule->headheightLE, SIGNAL(textChanged(const QString&)),
-		 this, SLOT(change_adaptor()));
-	connect(marginsModule->headheightUnit, SIGNAL(activated(int)),
-		 this, SLOT(change_adaptor()));
-	connect(marginsModule->headsepLE, SIGNAL(textChanged(const QString&)),
-		 this, SLOT(change_adaptor()));
-	connect(marginsModule->headsepUnit, SIGNAL(activated(int)),
-		 this, SLOT(change_adaptor()));
-	connect(marginsModule->footskipLE, SIGNAL(textChanged(const QString&)),
-		 this, SLOT(change_adaptor()));
-	connect(marginsModule->footskipUnit, SIGNAL(activated(int)),
-		 this, SLOT(change_adaptor()));
+	connect(marginsModule->marginCO, SIGNAL(activated(int)), this, SLOT(setCustomMargins(int)));
+	connect(marginsModule->marginCO, SIGNAL(activated(int)), this, SLOT(change_adaptor()));
+	connect(marginsModule->topLE, SIGNAL(textChanged(const QString&)), this, SLOT(change_adaptor()));
+	connect(marginsModule->topUnit, SIGNAL(activated(int)), this, SLOT(change_adaptor()));
+	connect(marginsModule->bottomLE, SIGNAL(textChanged(const QString&)), this, SLOT(change_adaptor()));
+	connect(marginsModule->bottomUnit, SIGNAL(activated(int)), this, SLOT(change_adaptor()));
+	connect(marginsModule->innerLE, SIGNAL(textChanged(const QString&)), this, SLOT(change_adaptor()));
+	connect(marginsModule->innerUnit, SIGNAL(activated(int)), this, SLOT(change_adaptor()));
+	connect(marginsModule->outerLE, SIGNAL(textChanged(const QString&)), this, SLOT(change_adaptor()));
+	connect(marginsModule->outerUnit, SIGNAL(activated(int)), this, SLOT(change_adaptor()));
+	connect(marginsModule->headheightLE, SIGNAL(textChanged(const QString&)), this, SLOT(change_adaptor()));
+	connect(marginsModule->headheightUnit, SIGNAL(activated(int)), this, SLOT(change_adaptor()));
+	connect(marginsModule->headsepLE, SIGNAL(textChanged(const QString&)), this, SLOT(change_adaptor()));
+	connect(marginsModule->headsepUnit, SIGNAL(activated(int)), this, SLOT(change_adaptor()));
+	connect(marginsModule->footskipLE, SIGNAL(textChanged(const QString&)), this, SLOT(change_adaptor()));
+	connect(marginsModule->footskipUnit, SIGNAL(activated(int)), this, SLOT(change_adaptor()));
 
 	// paper
-	connect(paperModule->papersizeCO, SIGNAL(activated(int)),
-		 this, SLOT(setMargins(int)));
-	connect(paperModule->papersizeCO, SIGNAL(activated(int)),
-		 this, SLOT(setCustomPapersize(int)));
-	connect(paperModule->papersizeCO, SIGNAL(activated(int)),
-		 this, SLOT(setCustomPapersize(int)));
-	connect(paperModule->portraitRB, SIGNAL(toggled(bool)),
-		 this, SLOT(portraitChanged()));
+	connect(paperModule->papersizeCO, SIGNAL(activated(int)), this, SLOT(setMargins(int)));
+	connect(paperModule->papersizeCO, SIGNAL(activated(int)), this, SLOT(setCustomPapersize(int)));
+	connect(paperModule->papersizeCO, SIGNAL(activated(int)), this, SLOT(setCustomPapersize(int)));
+	connect(paperModule->portraitRB, SIGNAL(toggled(bool)), this, SLOT(portraitChanged()));
 
-	connect(paperModule->papersizeCO, SIGNAL(activated(int)),
-		 this, SLOT(change_adaptor()));
-	connect(paperModule->paperheightLE, SIGNAL(textChanged(const QString&)),
-		 this, SLOT(change_adaptor()));
-	connect(paperModule->paperwidthLE, SIGNAL(textChanged(const QString&)),
-		 this, SLOT(change_adaptor()));
-	connect(paperModule->paperwidthUnitCO, SIGNAL(activated(int)),
-		 this, SLOT(change_adaptor()));
-	connect(paperModule->paperheightUnitCO, SIGNAL(activated(int)),
-		 this, SLOT(change_adaptor()));
-	connect(paperModule->portraitRB, SIGNAL(toggled(bool)),
-		 this, SLOT(change_adaptor()));
-	connect(paperModule->landscapeRB, SIGNAL(toggled(bool)),
-		 this, SLOT(change_adaptor()));
-	connect(paperModule->twoColumnCB, SIGNAL(toggled(bool)),
-		 this, SLOT(change_adaptor()));
-	connect(paperModule->facingPagesCB, SIGNAL(toggled(bool)),
-		 this, SLOT(change_adaptor()));
+	connect(paperModule->papersizeCO, SIGNAL(activated(int)), this, SLOT(change_adaptor()));
+	connect(paperModule->paperheightLE, SIGNAL(textChanged(const QString&)), this, SLOT(change_adaptor()));
+	connect(paperModule->paperwidthLE, SIGNAL(textChanged(const QString&)), this, SLOT(change_adaptor()));
+	connect(paperModule->paperwidthUnitCO, SIGNAL(activated(int)), this, SLOT(change_adaptor()));
+	connect(paperModule->paperheightUnitCO, SIGNAL(activated(int)), this, SLOT(change_adaptor()));
+	connect(paperModule->portraitRB, SIGNAL(toggled(bool)), this, SLOT(change_adaptor()));
+	connect(paperModule->landscapeRB, SIGNAL(toggled(bool)), this, SLOT(change_adaptor()));
+	connect(paperModule->twoColumnCB, SIGNAL(toggled(bool)), this, SLOT(change_adaptor()));
+	connect(paperModule->facingPagesCB, SIGNAL(toggled(bool)), this, SLOT(change_adaptor()));
 
 	// bullets
-	connect(bulletsModule->bulletsizeCO, SIGNAL(activated(int)),
-		 this, SLOT(change_adaptor()));
-	connect(bulletsModule->bulletsLV, SIGNAL(selectionChanged()),
-		 this, SLOT(change_adaptor()));
+	connect(bulletsModule->bulletsizeCO, SIGNAL(activated(int)), this, SLOT(change_adaptor()));
+	connect(bulletsModule->bulletsLV, SIGNAL(selectionChanged()), this, SLOT(change_adaptor()));
 }
 
 
@@ -252,37 +164,9 @@ QDocumentDialog::~QDocumentDialog()
 }
 
 
-void QDocumentDialog::setTitle(int item)
+void QDocumentDialog::showPreamble()
 {
-	switch(item) {
-	case LAYOUT:
-		titleL->setText(qt_("Document Style"));
-		break;
-	case PAPER:
-		titleL->setText(qt_("Papersize and Orientation"));
-		break;
-	case MARGINS:
-		titleL->setText(qt_("Margins"));
-		break;
-	case LANGUAGE:
-		titleL->setText(qt_("Language Settings and Quote Style"));
-		break;
-	case BULLETS:
-		titleL->setText(qt_("Bullet Types"));
-		break;
-	case NUMBERING:
-		titleL->setText(qt_("Numbering"));
-		break;
-	case BIBLIOGRAPHY:
-		titleL->setText(qt_("Bibliography Settings"));
-		break;
-	case PACKAGES:
-		titleL->setText(qt_("LaTeX Packages and Options"));
-		break;
-	case PREAMBLE:
-		titleL->setText(qt_("LaTeX Preamble"));
-		break;
-	}
+	docPS->setCurrentPanel(_("LaTeX Preamble"));
 }
 
 
diff --git a/src/frontends/qt2/QDocumentDialog.h b/src/frontends/qt2/QDocumentDialog.h
index 2def6122cc..2e825d1d9f 100644
--- a/src/frontends/qt2/QDocumentDialog.h
+++ b/src/frontends/qt2/QDocumentDialog.h
@@ -41,8 +41,9 @@ public:
 	void updateFontsize(string const &, string const &);
 	void updatePagestyle(string const &, string const &);
 
+	void showPreamble();
+
 public slots:
-	void setTitle(int);
 	void change_adaptor();
 	void saveDefaultClicked();
 	void useDefaultsClicked();
@@ -61,18 +62,6 @@ protected:
 	void closeEvent(QCloseEvent * e);
 
 private:
-	enum Module {
-		LAYOUT,
-		PAPER,
-		MARGINS,
-		LANGUAGE,
-		BULLETS,
-		NUMBERING,
-		BIBLIOGRAPHY,
-		PACKAGES,
-		PREAMBLE
-	};
-
 	ClassModuleBase * layoutModule;
 	PaperModuleBase * paperModule;
 	MarginsModuleBase * marginsModule;
diff --git a/src/frontends/qt2/panelstack.C b/src/frontends/qt2/panelstack.C
index 112a41db94..cfb96a9e23 100644
--- a/src/frontends/qt2/panelstack.C
+++ b/src/frontends/qt2/panelstack.C
@@ -105,7 +105,11 @@ void PanelStack::setCurrentPanel(string const & name)
 	PanelMap::const_iterator cit = panel_map_.find(name);
 	lyx::Assert(cit != panel_map_.end());
 
-	switchPanel(cit->second);
+	// force on first set
+	if (list_->currentItem() ==  cit->second)
+		switchPanel(cit->second);
+
+	list_->setCurrentItem(cit->second);
 }
 
 
diff --git a/src/frontends/qt2/ui/QDocumentDialogBase.ui b/src/frontends/qt2/ui/QDocumentDialogBase.ui
index 232390fb63..02bd8267a0 100644
--- a/src/frontends/qt2/ui/QDocumentDialogBase.ui
+++ b/src/frontends/qt2/ui/QDocumentDialogBase.ui
@@ -13,8 +13,8 @@
         <rect>
             <x>0</x>
             <y>0</y>
-            <width>411</width>
-            <height>230</height>
+            <width>422</width>
+            <height>393</height>
         </rect>
     </property>
     <property stdset="1">
@@ -32,7 +32,7 @@
         <name>sizeGripEnabled</name>
         <bool>true</bool>
     </property>
-    <grid>
+    <vbox>
         <property stdset="1">
             <name>margin</name>
             <number>11</number>
@@ -41,7 +41,96 @@
             <name>spacing</name>
             <number>6</number>
         </property>
-        <widget row="2"  column="0"  rowspan="1"  colspan="2" >
+        <widget>
+            <class>PanelStack</class>
+            <property stdset="1">
+                <name>name</name>
+                <cstring>docPS</cstring>
+            </property>
+        </widget>
+        <widget>
+            <class>QLayoutWidget</class>
+            <property stdset="1">
+                <name>name</name>
+                <cstring>Layout4</cstring>
+            </property>
+            <hbox>
+                <property stdset="1">
+                    <name>margin</name>
+                    <number>0</number>
+                </property>
+                <property stdset="1">
+                    <name>spacing</name>
+                    <number>6</number>
+                </property>
+                <spacer>
+                    <property>
+                        <name>name</name>
+                        <cstring>Spacer3</cstring>
+                    </property>
+                    <property stdset="1">
+                        <name>orientation</name>
+                        <enum>Horizontal</enum>
+                    </property>
+                    <property stdset="1">
+                        <name>sizeType</name>
+                        <enum>Expanding</enum>
+                    </property>
+                    <property>
+                        <name>sizeHint</name>
+                        <size>
+                            <width>20</width>
+                            <height>20</height>
+                        </size>
+                    </property>
+                </spacer>
+                <widget>
+                    <class>QPushButton</class>
+                    <property stdset="1">
+                        <name>name</name>
+                        <cstring>defaultPB</cstring>
+                    </property>
+                    <property stdset="1">
+                        <name>sizePolicy</name>
+                        <sizepolicy>
+                            <hsizetype>3</hsizetype>
+                            <vsizetype>0</vsizetype>
+                        </sizepolicy>
+                    </property>
+                    <property stdset="1">
+                        <name>text</name>
+                        <string>Use Class Defaults</string>
+                    </property>
+                    <property>
+                        <name>toolTip</name>
+                        <string>Reset to  the default settings for the document class</string>
+                    </property>
+                </widget>
+                <widget>
+                    <class>QPushButton</class>
+                    <property stdset="1">
+                        <name>name</name>
+                        <cstring>savePB</cstring>
+                    </property>
+                    <property stdset="1">
+                        <name>sizePolicy</name>
+                        <sizepolicy>
+                            <hsizetype>3</hsizetype>
+                            <vsizetype>0</vsizetype>
+                        </sizepolicy>
+                    </property>
+                    <property stdset="1">
+                        <name>text</name>
+                        <string>Save as Document Defaults</string>
+                    </property>
+                    <property>
+                        <name>toolTip</name>
+                        <string>Save settings as LyX's default document settings</string>
+                    </property>
+                </widget>
+            </hbox>
+        </widget>
+        <widget>
             <class>QLayoutWidget</class>
             <property stdset="1">
                 <name>name</name>
@@ -131,194 +220,22 @@
                 </widget>
             </hbox>
         </widget>
-        <widget row="0"  column="1" >
-            <class>QLayoutWidget</class>
-            <property stdset="1">
-                <name>name</name>
-                <cstring>Layout4</cstring>
-            </property>
-            <grid>
-                <property stdset="1">
-                    <name>margin</name>
-                    <number>0</number>
-                </property>
-                <property stdset="1">
-                    <name>spacing</name>
-                    <number>6</number>
-                </property>
-                <widget row="2"  column="0" >
-                    <class>QWidgetStack</class>
-                    <property stdset="1">
-                        <name>name</name>
-                        <cstring>moduleStack</cstring>
-                    </property>
-                    <property stdset="1">
-                        <name>sizePolicy</name>
-                        <sizepolicy>
-                            <hsizetype>5</hsizetype>
-                            <vsizetype>7</vsizetype>
-                        </sizepolicy>
-                    </property>
-                </widget>
-                <widget row="0"  column="0" >
-                    <class>QLabel</class>
-                    <property stdset="1">
-                        <name>name</name>
-                        <cstring>titleL</cstring>
-                    </property>
-                    <property stdset="1">
-                        <name>sizePolicy</name>
-                        <sizepolicy>
-                            <hsizetype>5</hsizetype>
-                            <vsizetype>0</vsizetype>
-                        </sizepolicy>
-                    </property>
-                    <property stdset="1">
-                        <name>text</name>
-                        <string>title here</string>
-                    </property>
-                </widget>
-                <widget row="1"  column="0" >
-                    <class>Line</class>
-                    <property stdset="1">
-                        <name>name</name>
-                        <cstring>Line1</cstring>
-                    </property>
-                    <property stdset="1">
-                        <name>sizePolicy</name>
-                        <sizepolicy>
-                            <hsizetype>1</hsizetype>
-                            <vsizetype>0</vsizetype>
-                        </sizepolicy>
-                    </property>
-                    <property stdset="1">
-                        <name>orientation</name>
-                        <enum>Horizontal</enum>
-                    </property>
-                </widget>
-            </grid>
-        </widget>
-        <widget row="0"  column="0" >
-            <class>QListBox</class>
-            <property stdset="1">
-                <name>name</name>
-                <cstring>moduleLB</cstring>
-            </property>
-            <property stdset="1">
-                <name>sizePolicy</name>
-                <sizepolicy>
-                    <hsizetype>5</hsizetype>
-                    <vsizetype>7</vsizetype>
-                </sizepolicy>
-            </property>
-            <property stdset="1">
-                <name>vScrollBarMode</name>
-                <enum>AlwaysOff</enum>
-            </property>
-            <property stdset="1">
-                <name>variableWidth</name>
-                <bool>false</bool>
-            </property>
-        </widget>
-        <widget row="1"  column="0"  rowspan="1"  colspan="2" >
-            <class>QLayoutWidget</class>
-            <property stdset="1">
-                <name>name</name>
-                <cstring>Layout4</cstring>
-            </property>
-            <hbox>
-                <property stdset="1">
-                    <name>margin</name>
-                    <number>0</number>
-                </property>
-                <property stdset="1">
-                    <name>spacing</name>
-                    <number>6</number>
-                </property>
-                <spacer>
-                    <property>
-                        <name>name</name>
-                        <cstring>Spacer3</cstring>
-                    </property>
-                    <property stdset="1">
-                        <name>orientation</name>
-                        <enum>Horizontal</enum>
-                    </property>
-                    <property stdset="1">
-                        <name>sizeType</name>
-                        <enum>Expanding</enum>
-                    </property>
-                    <property>
-                        <name>sizeHint</name>
-                        <size>
-                            <width>20</width>
-                            <height>20</height>
-                        </size>
-                    </property>
-                </spacer>
-                <widget>
-                    <class>QPushButton</class>
-                    <property stdset="1">
-                        <name>name</name>
-                        <cstring>defaultPB</cstring>
-                    </property>
-                    <property stdset="1">
-                        <name>sizePolicy</name>
-                        <sizepolicy>
-                            <hsizetype>3</hsizetype>
-                            <vsizetype>0</vsizetype>
-                        </sizepolicy>
-                    </property>
-                    <property stdset="1">
-                        <name>text</name>
-                        <string>Use Class Defaults</string>
-                    </property>
-                    <property>
-                        <name>toolTip</name>
-                        <string>Reset default params of the current class</string>
-                    </property>
-                </widget>
-                <widget>
-                    <class>QPushButton</class>
-                    <property stdset="1">
-                        <name>name</name>
-                        <cstring>savePB</cstring>
-                    </property>
-                    <property stdset="1">
-                        <name>sizePolicy</name>
-                        <sizepolicy>
-                            <hsizetype>3</hsizetype>
-                            <vsizetype>0</vsizetype>
-                        </sizepolicy>
-                    </property>
-                    <property stdset="1">
-                        <name>text</name>
-                        <string>Save as Document Defaults</string>
-                    </property>
-                    <property>
-                        <name>toolTip</name>
-                        <string>Save settings as LyX's default template</string>
-                    </property>
-                </widget>
-            </hbox>
-        </widget>
-    </grid>
+    </vbox>
 </widget>
 <customwidgets>
     <customwidget>
-        <class>QWidgetStack</class>
-        <header location="global">qwidgetstack.h</header>
+        <class>PanelStack</class>
+        <header location="local">panelstack.h</header>
         <sizehint>
-            <width>0</width>
+            <width>-1</width>
             <height>-1</height>
         </sizehint>
-        <container>0</container>
+        <container>1</container>
         <sizepolicy>
             <hordata>7</hordata>
             <verdata>7</verdata>
         </sizepolicy>
         <pixmap>image0</pixmap>
-        <slot access="public">raiseWidget(int)</slot>
     </customwidget>
 </customwidgets>
 <images>
@@ -328,18 +245,6 @@
     </image>
 </images>
 <connections>
-    <connection>
-        <sender>moduleLB</sender>
-        <signal>highlighted(int)</signal>
-        <receiver>moduleStack</receiver>
-        <slot>raiseWidget(int)</slot>
-    </connection>
-    <connection>
-        <sender>moduleLB</sender>
-        <signal>highlighted(int)</signal>
-        <receiver>QDocumentDialogBase</receiver>
-        <slot>setTitle(int)</slot>
-    </connection>
     <connection>
         <sender>savePB</sender>
         <signal>clicked()</signal>
@@ -353,8 +258,7 @@
         <slot>useDefaultsClicked()</slot>
     </connection>
     <slot access="public">change_adaptor()</slot>
-    <slot access="protected">useDefaultsClicked()</slot>
     <slot access="protected">saveDefaultClicked()</slot>
-    <slot access="public">setTitle(int)</slot>
+    <slot access="protected">useDefaultsClicked()</slot>
 </connections>
 </UI>
diff --git a/src/frontends/qt2/ui/QPrefsDialogBase.ui b/src/frontends/qt2/ui/QPrefsDialogBase.ui
index a5ce0acb73..162f0b61ba 100644
--- a/src/frontends/qt2/ui/QPrefsDialogBase.ui
+++ b/src/frontends/qt2/ui/QPrefsDialogBase.ui
@@ -13,7 +13,7 @@
         <rect>
             <x>0</x>
             <y>0</y>
-            <width>437</width>
+            <width>433</width>
             <height>352</height>
         </rect>
     </property>