diff --git a/ankiqt/ui/main.py b/ankiqt/ui/main.py
index 3e6fc3edb..5853d06cf 100644
--- a/ankiqt/ui/main.py
+++ b/ankiqt/ui/main.py
@@ -939,13 +939,15 @@ To upgrade an old deck, download Anki 0.9.8.7."""))
             ankiqt.appWiki + "StudyOptions")))
 
     def showStudyScreen(self):
-        self.switchToStudyScreen()
         self.mainWin.optionsButton.setChecked(self.config['showStudyOptions'])
         self.mainWin.optionsBox.setShown(self.config['showStudyOptions'])
+        self.switchToStudyScreen()
         initial = self.deck.sessionStartTime == 0
-        if initial or not self.deck.sessionLimitReached():
+        if initial:
             # deck just opened, or screen triggered manually
-            top = _("<h1>Welcome back!</h1>")
+            top = _("<h1>Welcome Back!</h1>")
+        elif not self.deck.sessionLimitReached():
+            top = _("<h1>Study Options</h1>")
         else:
             top = _("<h1>Well done!</h1>")
         # top label
diff --git a/designer/deckproperties.ui b/designer/deckproperties.ui
index ba74e14c5..1fc210a3c 100644
--- a/designer/deckproperties.ui
+++ b/designer/deckproperties.ui
@@ -8,7 +8,7 @@
    <rect>
     <x>0</x>
     <y>0</y>
-    <width>335</width>
+    <width>391</width>
     <height>400</height>
    </rect>
   </property>
@@ -29,7 +29,7 @@
        <rect>
         <x>0</x>
         <y>0</y>
-        <width>319</width>
+        <width>375</width>
         <height>334</height>
        </rect>
       </property>
diff --git a/designer/main.ui b/designer/main.ui
index b092fab4c..3c8655805 100644
--- a/designer/main.ui
+++ b/designer/main.ui
@@ -164,8 +164,8 @@
            <rect>
             <x>0</x>
             <y>0</y>
-            <width>550</width>
-            <height>413</height>
+            <width>542</width>
+            <height>504</height>
            </rect>
           </property>
           <layout class="QVBoxLayout" name="verticalLayout_5" >
@@ -186,8 +186,8 @@
            <rect>
             <x>0</x>
             <y>0</y>
-            <width>550</width>
-            <height>413</height>
+            <width>542</width>
+            <height>504</height>
            </rect>
           </property>
           <layout class="QVBoxLayout" name="verticalLayout_2" >
@@ -216,6 +216,9 @@
             <layout class="QHBoxLayout" name="horizontalLayout_4" >
              <item>
               <layout class="QVBoxLayout" name="verticalLayout_11" >
+               <property name="topMargin" >
+                <number>4</number>
+               </property>
                <item>
                 <widget class="QLabel" name="optionsLabel" >
                  <property name="text" >
@@ -229,7 +232,7 @@
                   <enum>Qt::Vertical</enum>
                  </property>
                  <property name="sizeType" >
-                  <enum>QSizePolicy::Preferred</enum>
+                  <enum>QSizePolicy::Fixed</enum>
                  </property>
                  <property name="sizeHint" stdset="0" >
                   <size>
@@ -246,7 +249,7 @@
                    <item>
                     <widget class="QPushButton" name="optionsButton" >
                      <property name="text" >
-                      <string>Review &amp;Options>></string>
+                      <string>Options>></string>
                      </property>
                      <property name="checkable" >
                       <bool>true</bool>
@@ -308,7 +311,7 @@
                         </property>
                        </widget>
                       </item>
-                      <item row="1" column="1" >
+                      <item row="1" column="2" >
                        <widget class="QLineEdit" name="minuteLimit" >
                         <property name="sizePolicy" >
                          <sizepolicy vsizetype="Fixed" hsizetype="Maximum" >
@@ -331,7 +334,7 @@
                         </property>
                        </widget>
                       </item>
-                      <item row="2" column="1" >
+                      <item row="2" column="2" >
                        <widget class="QLineEdit" name="questionLimit" >
                         <property name="sizePolicy" >
                          <sizepolicy vsizetype="Fixed" hsizetype="Preferred" >
@@ -347,7 +350,7 @@
                         </property>
                        </widget>
                       </item>
-                      <item row="1" column="2" >
+                      <item row="1" column="3" >
                        <spacer name="horizontalSpacer_3" >
                         <property name="orientation" >
                          <enum>Qt::Horizontal</enum>
@@ -373,7 +376,7 @@
                         </property>
                        </widget>
                       </item>
-                      <item row="0" column="1" >
+                      <item row="0" column="2" >
                        <widget class="QLineEdit" name="newPerDay" >
                         <property name="sizePolicy" >
                          <sizepolicy vsizetype="Fixed" hsizetype="Preferred" >
@@ -389,6 +392,22 @@
                         </property>
                        </widget>
                       </item>
+                      <item row="0" column="1" >
+                       <spacer name="horizontalSpacer_5" >
+                        <property name="orientation" >
+                         <enum>Qt::Horizontal</enum>
+                        </property>
+                        <property name="sizeType" >
+                         <enum>QSizePolicy::Preferred</enum>
+                        </property>
+                        <property name="sizeHint" stdset="0" >
+                         <size>
+                          <width>10</width>
+                          <height>20</height>
+                         </size>
+                        </property>
+                       </spacer>
+                      </item>
                      </layout>
                     </item>
                     <item>
@@ -1673,7 +1692,7 @@
      <normaloff>:/icons/chronometer.png</normaloff>:/icons/chronometer.png</iconset>
    </property>
    <property name="text" >
-    <string>&amp;Study Options</string>
+    <string>&amp;Study Options...</string>
    </property>
   </action>
  </widget>