diff --git a/ankiqt/ui/main.py b/ankiqt/ui/main.py
index 25bc01f4e..4dc15dee5 100644
--- a/ankiqt/ui/main.py
+++ b/ankiqt/ui/main.py
@@ -309,14 +309,14 @@ An error occurred. Please copy the following message into a bug report.\n\n""" +
     ##########################################################################
 
     def showWelcomeScreen(self):
-        self.mainWin.mainStack.setCurrentIndex(0)
+        self.mainWin.mainStack.setCurrentIndex(1)
         self.hideButtons()
 
     def showEditScreen(self):
-        self.mainWin.mainStack.setCurrentIndex(1)
+        self.mainWin.mainStack.setCurrentIndex(2)
 
     def showReviewScreen(self):
-        self.mainWin.mainStack.setCurrentIndex(2)
+        self.mainWin.mainStack.setCurrentIndex(3)
 
     # Buttons
     ##########################################################################
@@ -815,7 +815,7 @@ To upgrade an old deck, download Anki 0.9.8.7."""))
 
     def showEditor(self):
         self.showSaveEditorButton()
-        self.mainWin.mainStack.setCurrentIndex(1)
+        self.showEditScreen()
         self.editor.setFact(self.currentCard.fact)
 
     def onFactValid(self, fact):
diff --git a/designer/main.ui b/designer/main.ui
index 400270320..ac4fafd85 100644
--- a/designer/main.ui
+++ b/designer/main.ui
@@ -23,14 +23,6 @@
     <normaloff>:/icons/anki.png</normaloff>:/icons/anki.png</iconset>
   </property>
   <widget class="QWidget" name="centralwidget" >
-   <property name="geometry" >
-    <rect>
-     <x>0</x>
-     <y>69</y>
-     <width>655</width>
-     <height>398</height>
-    </rect>
-   </property>
    <property name="sizePolicy" >
     <sizepolicy vsizetype="Expanding" hsizetype="Expanding" >
      <horstretch>1</horstretch>
@@ -147,17 +139,10 @@
           </sizepolicy>
          </property>
          <property name="currentIndex" >
-          <number>1</number>
+          <number>0</number>
          </property>
-         <widget class="QWidget" name="page" >
-          <property name="geometry" >
-           <rect>
-            <x>0</x>
-            <y>0</y>
-            <width>378</width>
-            <height>342</height>
-           </rect>
-          </property>
+         <widget class="QWidget" name="blankPage" />
+         <widget class="QWidget" name="welcomePage" >
           <layout class="QVBoxLayout" name="verticalLayout_5" >
            <item>
             <widget class="QTextBrowser" name="welcomeText" >
@@ -171,15 +156,7 @@
            </item>
           </layout>
          </widget>
-         <widget class="QWidget" name="page_2" >
-          <property name="geometry" >
-           <rect>
-            <x>0</x>
-            <y>0</y>
-            <width>370</width>
-            <height>343</height>
-           </rect>
-          </property>
+         <widget class="QWidget" name="editPage" >
           <layout class="QVBoxLayout" name="verticalLayout_2" >
            <property name="spacing" >
             <number>0</number>
@@ -200,14 +177,6 @@
           <number>0</number>
          </property>
          <widget class="QWidget" name="page1" >
-          <property name="geometry" >
-           <rect>
-            <x>0</x>
-            <y>0</y>
-            <width>370</width>
-            <height>49</height>
-           </rect>
-          </property>
           <layout class="QVBoxLayout" name="verticalLayout" >
            <item>
             <spacer name="verticalSpacer" >
@@ -232,14 +201,6 @@
           </layout>
          </widget>
          <widget class="QWidget" name="page2" >
-          <property name="geometry" >
-           <rect>
-            <x>0</x>
-            <y>0</y>
-            <width>378</width>
-            <height>50</height>
-           </rect>
-          </property>
           <layout class="QVBoxLayout" name="verticalLayout_3" >
            <property name="spacing" >
             <number>0</number>
@@ -370,14 +331,6 @@
           </layout>
          </widget>
          <widget class="QWidget" name="page3" >
-          <property name="geometry" >
-           <rect>
-            <x>0</x>
-            <y>0</y>
-            <width>370</width>
-            <height>44</height>
-           </rect>
-          </property>
           <layout class="QVBoxLayout" name="verticalLayout_4" >
            <item>
             <spacer name="verticalSpacer_2" >
@@ -598,7 +551,7 @@
      <x>0</x>
      <y>0</y>
      <width>655</width>
-     <height>23</height>
+     <height>25</height>
     </rect>
    </property>
    <widget class="QMenu" name="menuHelp" >
@@ -731,28 +684,11 @@
    <addaction name="menuAdvanced" />
    <addaction name="menuHelp" />
   </widget>
-  <widget class="QStatusBar" name="statusbar" >
-   <property name="geometry" >
-    <rect>
-     <x>0</x>
-     <y>467</y>
-     <width>655</width>
-     <height>20</height>
-    </rect>
-   </property>
-  </widget>
+  <widget class="QStatusBar" name="statusbar" />
   <widget class="QToolBar" name="toolBar" >
    <property name="enabled" >
     <bool>true</bool>
    </property>
-   <property name="geometry" >
-    <rect>
-     <x>0</x>
-     <y>23</y>
-     <width>655</width>
-     <height>46</height>
-    </rect>
-   </property>
    <property name="orientation" >
     <enum>Qt::Horizontal</enum>
    </property>