diff --git a/aqt/browser.py b/aqt/browser.py
index 3f9626cbb..dc42426aa 100644
--- a/aqt/browser.py
+++ b/aqt/browser.py
@@ -229,10 +229,8 @@ class DataModel(QAbstractTableModel):
             if c.type == 0:
                 return _("(new)")
             return "%d%%" % (c.factor/10)
-        elif type == "cardGroup":
-            return self.browser.mw.col.groups.name(c.gid)
-        elif type == "noteGroup":
-            return self.browser.mw.col.groups.name(c.note().gid)
+        elif type == "deck":
+            return self.browser.mw.col.decks.name(c.did)
 
     def question(self, c):
         return self.formatQA(c.a())
@@ -310,9 +308,9 @@ class Browser(QMainWindow):
         restoreGeom(self, "editor", 38)
         restoreState(self, "editor")
         restoreSplitter(self.form.splitter_2, "editor2")
-        restoreSplitter(self.form.splitter_3, "editor3")
+        restoreSplitter(self.form.splitter, "editor3")
         self.form.splitter_2.setChildrenCollapsible(False)
-        self.form.splitter_3.setChildrenCollapsible(False)
+        self.form.splitter.setChildrenCollapsible(False)
         self.setupColumns()
         self.setupToolbar()
         self.setupTable()
@@ -377,7 +375,7 @@ class Browser(QMainWindow):
 
     def closeEvent(self, evt):
         saveSplitter(self.form.splitter_2, "editor2")
-        saveSplitter(self.form.splitter_3, "editor3")
+        saveSplitter(self.form.splitter, "editor3")
         self.editor.saveNow()
         self.editor.setNote(None)
         saveGeom(self, "editor")
@@ -404,8 +402,7 @@ class Browser(QMainWindow):
             ('question', _("Question")),
             ('answer', _("Answer")),
             ('template', _("Card")),
-            ('cardGroup', _("C.Group")),
-            ('noteGroup', _("I.Group")),
+            ('deck', _("Deck")),
             ('noteFld', _("Sort Field")),
             ('noteCrt', _("Created")),
             ('noteMod', _("Edited")),
@@ -647,8 +644,8 @@ class Browser(QMainWindow):
 
     def _systemTagTree(self, root):
         tags = (
-            (_("All cards"), "stock_new_template", ""),
-            (_("Current Deck"), "stock_new_template", "deck:current"),
+            (_("Whole Collection"), "anki", ""),
+            (_("Current Deck"), "stock_group", "deck:current"),
             (_("New"), "plus-circle.png", "is:new"),
             (_("Learning"), "stock_new_template_red.png", "is:learn"),
             (_("Review"), "clock-icon.png", "is:review"),
diff --git a/aqt/stats.py b/aqt/stats.py
index 8f082c259..3cc77c49f 100644
--- a/aqt/stats.py
+++ b/aqt/stats.py
@@ -23,7 +23,7 @@ class CardStats(object):
 
     def show(self):
         if not self.shown:
-            self.web = AnkiWebView(self.mw)
+            self.web = AnkiWebView()
             self.web.setMaximumWidth(400)
             self.shown = self.mw.addDockable(_("Card Info"), self.web)
             self.shown.connect(self.shown, SIGNAL("visibilityChanged(bool)"),
diff --git a/designer/browser.ui b/designer/browser.ui
index d42bfa18f..6cc843acd 100644
--- a/designer/browser.ui
+++ b/designer/browser.ui
@@ -6,8 +6,8 @@
    <rect>
     <x>0</x>
     <y>0</y>
-    <width>612</width>
-    <height>455</height>
+    <width>717</width>
+    <height>474</height>
    </rect>
   </property>
   <property name="windowTitle">
@@ -18,83 +18,71 @@
     <normaloff>:/icons/find.png</normaloff>:/icons/find.png</iconset>
   </property>
   <widget class="QWidget" name="centralwidget">
-   <layout class="QHBoxLayout" name="horizontalLayout">
-    <property name="spacing">
-     <number>0</number>
-    </property>
+   <layout class="QVBoxLayout" name="verticalLayout">
     <property name="margin">
      <number>0</number>
     </property>
     <item>
-     <widget class="QSplitter" name="splitter_3">
+     <widget class="QSplitter" name="splitter_2">
       <property name="orientation">
-       <enum>Qt::Horizontal</enum>
+       <enum>Qt::Vertical</enum>
       </property>
-      <property name="handleWidth">
-       <number>3</number>
-      </property>
-      <widget class="QTreeWidget" name="tree">
-       <attribute name="headerVisible">
-        <bool>false</bool>
-       </attribute>
-       <column>
-        <property name="text">
-         <string notr="true">1</string>
-        </property>
-       </column>
-      </widget>
-      <widget class="QWidget" name="widget" native="true">
-       <layout class="QVBoxLayout" name="verticalLayout">
-        <property name="spacing">
-         <number>0</number>
-        </property>
-        <property name="leftMargin">
-         <number>0</number>
-        </property>
-        <property name="topMargin">
-         <number>0</number>
-        </property>
-        <property name="rightMargin">
-         <number>0</number>
-        </property>
-        <property name="bottomMargin">
-         <number>3</number>
-        </property>
-        <item>
-         <layout class="QGridLayout" name="gridLayout">
-          <property name="leftMargin">
-           <number>6</number>
-          </property>
-          <property name="topMargin">
-           <number>6</number>
-          </property>
-          <property name="rightMargin">
-           <number>6</number>
-          </property>
-          <property name="spacing">
-           <number>6</number>
-          </property>
-          <item row="0" column="0">
-           <widget class="QLineEdit" name="searchEdit">
-            <property name="text">
-             <string/>
-            </property>
-           </widget>
-          </item>
-          <item row="0" column="1">
-           <widget class="QPushButton" name="searchButton">
-            <property name="text">
-             <string>Search</string>
-            </property>
-           </widget>
-          </item>
-         </layout>
-        </item>
-        <item>
-         <widget class="QSplitter" name="splitter_2">
-          <property name="orientation">
-           <enum>Qt::Vertical</enum>
-          </property>
+      <widget class="QSplitter" name="splitter">
+       <property name="orientation">
+        <enum>Qt::Horizontal</enum>
+       </property>
+       <widget class="QTreeWidget" name="tree">
+        <attribute name="headerVisible">
+         <bool>false</bool>
+        </attribute>
+        <column>
+         <property name="text">
+          <string notr="true">1</string>
+         </property>
+        </column>
+       </widget>
+       <widget class="QWidget" name="widget" native="true">
+        <layout class="QVBoxLayout" name="verticalLayout_2">
+         <property name="spacing">
+          <number>0</number>
+         </property>
+         <property name="margin">
+          <number>0</number>
+         </property>
+         <item>
+          <layout class="QGridLayout" name="gridLayout">
+           <property name="horizontalSpacing">
+            <number>6</number>
+           </property>
+           <property name="verticalSpacing">
+            <number>0</number>
+           </property>
+           <property name="leftMargin">
+            <number>0</number>
+           </property>
+           <property name="topMargin">
+            <number>0</number>
+           </property>
+           <property name="rightMargin">
+            <number>0</number>
+           </property>
+           <item row="0" column="0">
+            <widget class="QLineEdit" name="searchEdit">
+             <property name="text">
+              <string/>
+             </property>
+            </widget>
+           </item>
+           <item row="0" column="1">
+            <widget class="QPushButton" name="searchButton">
+             <property name="text">
+              <string>Search</string>
+             </property>
+            </widget>
+           </item>
+          </layout>
+         </item>
+         <item>
           <widget class="QTableView" name="tableView">
            <property name="sizePolicy">
             <sizepolicy hsizetype="Expanding" vsizetype="Expanding">
@@ -139,39 +127,39 @@
             <bool>true</bool>
            </attribute>
           </widget>
-          <widget class="QWidget" name="lowerWidget">
-           <layout class="QHBoxLayout" name="horizontalLayout2">
-            <property name="spacing">
-             <number>0</number>
-            </property>
-            <item>
-             <widget class="QWidget" name="fieldsArea" native="true">
-              <property name="sizePolicy">
-               <sizepolicy hsizetype="Preferred" vsizetype="Expanding">
-                <horstretch>7</horstretch>
-                <verstretch>0</verstretch>
-               </sizepolicy>
-              </property>
-              <property name="minimumSize">
-               <size>
-                <width>50</width>
-                <height>50</height>
-               </size>
-              </property>
-             </widget>
-            </item>
-            <item>
-             <widget class="QLabel" name="cardLabel">
-              <property name="alignment">
-               <set>Qt::AlignLeading|Qt::AlignLeft|Qt::AlignTop</set>
-              </property>
-              <property name="margin">
-               <number>6</number>
-              </property>
-             </widget>
-            </item>
-           </layout>
-          </widget>
+         </item>
+        </layout>
+       </widget>
+      </widget>
+      <widget class="QWidget" name="lowerWidget">
+       <layout class="QHBoxLayout" name="horizontalLayout2">
+        <property name="spacing">
+         <number>0</number>
+        </property>
+        <item>
+         <widget class="QWidget" name="fieldsArea" native="true">
+          <property name="sizePolicy">
+           <sizepolicy hsizetype="Preferred" vsizetype="Expanding">
+            <horstretch>7</horstretch>
+            <verstretch>0</verstretch>
+           </sizepolicy>
+          </property>
+          <property name="minimumSize">
+           <size>
+            <width>50</width>
+            <height>50</height>
+           </size>
+          </property>
+         </widget>
+        </item>
+        <item>
+         <widget class="QLabel" name="cardLabel">
+          <property name="alignment">
+           <set>Qt::AlignLeading|Qt::AlignLeft|Qt::AlignTop</set>
+          </property>
+          <property name="margin">
+           <number>6</number>
+          </property>
          </widget>
         </item>
        </layout>
@@ -185,7 +173,7 @@
     <rect>
      <x>0</x>
      <y>0</y>
-     <width>612</width>
+     <width>717</width>
      <height>22</height>
     </rect>
    </property>