diff --git a/ankiqt/ui/deckproperties.py b/ankiqt/ui/deckproperties.py
index fc4266778..ca821ec40 100644
--- a/ankiqt/ui/deckproperties.py
+++ b/ankiqt/ui/deckproperties.py
@@ -27,12 +27,6 @@ class DeckProperties(QDialog):
         self.origMod = self.d.modified
         self.dialog = ankiqt.forms.deckproperties.Ui_DeckProperties()
         self.dialog.setupUi(self)
-        self.dialog.newCardOrder.insertItems(
-            0, QStringList(newCardOrderLabels().values()))
-        self.dialog.newCardScheduling.insertItems(
-            0, QStringList(newCardSchedulingLabels().values()))
-        self.dialog.revCardOrder.insertItems(
-            0, QStringList(revCardOrderLabels().values()))
         self.readData()
         self.connect(self.dialog.modelsAdd, SIGNAL("clicked()"), self.onAdd)
         self.connect(self.dialog.modelsEdit, SIGNAL("clicked()"), self.onEdit)
@@ -69,10 +63,6 @@ class DeckProperties(QDialog):
         self.dialog.collapse.setCheckState(self.d.collapseTime
                                            and Qt.Checked or Qt.Unchecked)
         self.dialog.failedCardMax.setText(unicode(self.d.failedCardMax))
-        self.dialog.newCardsPerDay.setText(unicode(self.d.newCardsPerDay))
-        self.dialog.newCardOrder.setCurrentIndex(self.d.newCardOrder)
-        self.dialog.newCardScheduling.setCurrentIndex(self.d.newCardSpacing)
-        self.dialog.revCardOrder.setCurrentIndex(self.d.revCardOrder)
         # sources
         self.sources = self.d.s.all("select id, name from sources")
         self.sourcesToRemove = []
@@ -240,8 +230,6 @@ class DeckProperties(QDialog):
             self.updateField(self.d, 'delay2', v)
             v = int(self.dialog.failedCardMax.text())
             self.updateField(self.d, 'failedCardMax', max(v, 5))
-            v = int(self.dialog.newCardsPerDay.text())
-            self.updateField(self.d, 'newCardsPerDay', v)
         except ValueError:
             pass
         # hour shift
@@ -265,13 +253,6 @@ class DeckProperties(QDialog):
         self.updateField(self.d,
                          "suspended",
                          unicode(self.dialog.postponing.text()))
-        # new card order
-        self.updateField(self.d, "newCardOrder",
-                         self.dialog.newCardOrder.currentIndex())
-        self.updateField(self.d, "newCardSpacing",
-                         self.dialog.newCardScheduling.currentIndex())
-        self.updateField(self.d, "revCardOrder",
-                         self.dialog.revCardOrder.currentIndex())
         # sources
         d = {}
         d.update(self.sources)
diff --git a/designer/deckproperties.ui b/designer/deckproperties.ui
index 762fed3be..ba74e14c5 100644
--- a/designer/deckproperties.ui
+++ b/designer/deckproperties.ui
@@ -8,7 +8,7 @@
    <rect>
     <x>0</x>
     <y>0</y>
-    <width>394</width>
+    <width>335</width>
     <height>400</height>
    </rect>
   </property>
@@ -29,79 +29,22 @@
        <rect>
         <x>0</x>
         <y>0</y>
-        <width>378</width>
+        <width>319</width>
         <height>334</height>
        </rect>
       </property>
       <attribute name="title" >
-       <string>Scheduling</string>
+       <string>Models &amp;&amp; Scheduling</string>
       </attribute>
       <layout class="QGridLayout" name="gridLayout_6" >
-       <item row="0" column="0" >
-        <layout class="QGridLayout" name="gridLayout_2" >
-         <item row="3" column="1" >
-          <widget class="QLabel" name="label_15" >
-           <property name="sizePolicy" >
-            <sizepolicy vsizetype="Preferred" hsizetype="Preferred" >
-             <horstretch>0</horstretch>
-             <verstretch>0</verstretch>
-            </sizepolicy>
-           </property>
-           <property name="text" >
-            <string>&lt;h1>Basic Scheduling&lt;/h1></string>
-           </property>
-          </widget>
-         </item>
-         <item row="4" column="1" >
-          <layout class="QGridLayout" name="gridLayout_3" >
-           <item row="0" column="1" >
-            <spacer name="horizontalSpacer" >
-             <property name="orientation" >
-              <enum>Qt::Horizontal</enum>
-             </property>
-             <property name="sizeHint" stdset="0" >
-              <size>
-               <width>40</width>
-               <height>20</height>
-              </size>
-             </property>
-            </spacer>
-           </item>
-           <item row="0" column="2" >
-            <widget class="QLineEdit" name="newCardsPerDay" >
-             <property name="sizePolicy" >
-              <sizepolicy vsizetype="Fixed" hsizetype="Fixed" >
-               <horstretch>0</horstretch>
-               <verstretch>0</verstretch>
-              </sizepolicy>
-             </property>
-            </widget>
-           </item>
-           <item row="0" column="0" >
-            <widget class="QLabel" name="label_11" >
-             <property name="text" >
-              <string>&lt;b>Number of new cards per day</string>
-             </property>
-            </widget>
-           </item>
-          </layout>
-         </item>
-        </layout>
-       </item>
-       <item row="1" column="0" >
-        <widget class="QComboBox" name="newCardOrder" />
-       </item>
-       <item row="3" column="0" >
-        <widget class="QComboBox" name="newCardScheduling" />
-       </item>
-       <item row="8" column="0" >
+       <item row="4" column="0" >
         <widget class="QLabel" name="label_16" >
          <property name="text" >
           <string>&lt;h1>Priorities&lt;/h1></string>
          </property>
         </widget>
        </item>
-       <item row="9" column="0" >
+       <item row="5" column="0" >
         <layout class="QGridLayout" name="gridLayout_4" >
          <item row="0" column="0" >
           <widget class="QLabel" name="label_21" >
@@ -157,7 +100,7 @@
          </item>
         </layout>
        </item>
-       <item row="10" column="0" >
+       <item row="6" column="0" >
         <spacer name="verticalSpacer_2" >
          <property name="orientation" >
           <enum>Qt::Vertical</enum>
@@ -170,41 +113,49 @@
          </property>
         </spacer>
        </item>
-       <item row="4" column="0" >
-        <widget class="QComboBox" name="revCardOrder" />
-       </item>
-       <item row="6" column="0" >
-        <widget class="Line" name="line_2" >
-         <property name="orientation" >
-          <enum>Qt::Horizontal</enum>
+       <item row="1" column="0" >
+        <widget class="QLabel" name="label_14" >
+         <property name="text" >
+          <string>&lt;h1>Models&lt;/h1></string>
+         </property>
+         <property name="wordWrap" >
+          <bool>true</bool>
          </property>
         </widget>
        </item>
-       <item row="5" column="0" >
-        <spacer name="verticalSpacer_3" >
-         <property name="orientation" >
-          <enum>Qt::Vertical</enum>
-         </property>
-         <property name="sizeHint" stdset="0" >
-          <size>
-           <width>20</width>
-           <height>40</height>
-          </size>
-         </property>
-        </spacer>
+       <item row="2" column="0" >
+        <widget class="QListWidget" name="modelsList" />
        </item>
-       <item row="7" column="0" >
-        <spacer name="verticalSpacer_5" >
-         <property name="orientation" >
-          <enum>Qt::Vertical</enum>
+       <item row="3" column="0" >
+        <layout class="QHBoxLayout" name="_2" >
+         <property name="spacing" >
+          <number>6</number>
          </property>
-         <property name="sizeHint" stdset="0" >
-          <size>
-           <width>20</width>
-           <height>40</height>
-          </size>
+         <property name="margin" >
+          <number>0</number>
          </property>
-        </spacer>
+         <item>
+          <widget class="QPushButton" name="modelsAdd" >
+           <property name="text" >
+            <string>&amp;Add</string>
+           </property>
+          </widget>
+         </item>
+         <item>
+          <widget class="QPushButton" name="modelsEdit" >
+           <property name="text" >
+            <string>&amp;Edit</string>
+           </property>
+          </widget>
+         </item>
+         <item>
+          <widget class="QPushButton" name="modelsDelete" >
+           <property name="text" >
+            <string>&amp;Delete</string>
+           </property>
+          </widget>
+         </item>
+        </layout>
        </item>
       </layout>
      </widget>
@@ -213,8 +164,8 @@
        <rect>
         <x>0</x>
         <y>0</y>
-        <width>378</width>
-        <height>334</height>
+        <width>346</width>
+        <height>356</height>
        </rect>
       </property>
       <attribute name="title" >
@@ -348,78 +299,13 @@ p, li { white-space: pre-wrap; }
        </item>
       </layout>
      </widget>
-     <widget class="QWidget" name="tab_3" >
-      <property name="geometry" >
-       <rect>
-        <x>0</x>
-        <y>0</y>
-        <width>378</width>
-        <height>334</height>
-       </rect>
-      </property>
-      <attribute name="title" >
-       <string>Models</string>
-      </attribute>
-      <layout class="QVBoxLayout" >
-       <property name="spacing" >
-        <number>6</number>
-       </property>
-       <property name="margin" >
-        <number>6</number>
-       </property>
-       <item>
-        <widget class="QLabel" name="label_14" >
-         <property name="text" >
-          <string>&lt;h1>Models&lt;/h1></string>
-         </property>
-         <property name="wordWrap" >
-          <bool>true</bool>
-         </property>
-        </widget>
-       </item>
-       <item>
-        <widget class="QListWidget" name="modelsList" />
-       </item>
-       <item>
-        <layout class="QHBoxLayout" >
-         <property name="spacing" >
-          <number>6</number>
-         </property>
-         <property name="margin" >
-          <number>0</number>
-         </property>
-         <item>
-          <widget class="QPushButton" name="modelsAdd" >
-           <property name="text" >
-            <string>&amp;Add</string>
-           </property>
-          </widget>
-         </item>
-         <item>
-          <widget class="QPushButton" name="modelsEdit" >
-           <property name="text" >
-            <string>&amp;Edit</string>
-           </property>
-          </widget>
-         </item>
-         <item>
-          <widget class="QPushButton" name="modelsDelete" >
-           <property name="text" >
-            <string>&amp;Delete</string>
-           </property>
-          </widget>
-         </item>
-        </layout>
-       </item>
-      </layout>
-     </widget>
      <widget class="QWidget" name="tab_4" >
       <property name="geometry" >
        <rect>
         <x>0</x>
         <y>0</y>
-        <width>378</width>
-        <height>334</height>
+        <width>346</width>
+        <height>356</height>
        </rect>
       </property>
       <attribute name="title" >
@@ -743,10 +629,10 @@ p, li { white-space: pre-wrap; }
  </widget>
  <tabstops>
   <tabstop>qtabwidget</tabstop>
-  <tabstop>newCardsPerDay</tabstop>
-  <tabstop>newCardOrder</tabstop>
-  <tabstop>newCardScheduling</tabstop>
-  <tabstop>revCardOrder</tabstop>
+  <tabstop>modelsList</tabstop>
+  <tabstop>modelsAdd</tabstop>
+  <tabstop>modelsEdit</tabstop>
+  <tabstop>modelsDelete</tabstop>
   <tabstop>highPriority</tabstop>
   <tabstop>medPriority</tabstop>
   <tabstop>lowPriority</tabstop>
@@ -756,10 +642,6 @@ p, li { white-space: pre-wrap; }
   <tabstop>sourcesTable</tabstop>
   <tabstop>addSource</tabstop>
   <tabstop>deleteSource</tabstop>
-  <tabstop>modelsList</tabstop>
-  <tabstop>modelsAdd</tabstop>
-  <tabstop>modelsEdit</tabstop>
-  <tabstop>modelsDelete</tabstop>
   <tabstop>delay0</tabstop>
   <tabstop>delay1</tabstop>
   <tabstop>delay2</tabstop>