diff --git a/src/calibre/gui2/dialogs/config.py b/src/calibre/gui2/dialogs/config.py
index e328ce641d..1dd6cc061e 100644
--- a/src/calibre/gui2/dialogs/config.py
+++ b/src/calibre/gui2/dialogs/config.py
@@ -3,7 +3,8 @@ __copyright__ = '2008, Kovid Goyal <kovid at kovidgoyal.net>'
 import os, re, time
 
 from PyQt4.QtGui import QDialog, QMessageBox, QListWidgetItem, QIcon, \
-                        QDesktopServices, QVBoxLayout, QLabel, QPlainTextEdit
+                        QDesktopServices, QVBoxLayout, QLabel, QPlainTextEdit, \
+                        QStringListModel
 from PyQt4.QtCore import SIGNAL, QTimer, Qt, QSize, QVariant, QUrl
 
 from calibre.constants import islinux, iswindows
@@ -17,6 +18,22 @@ from calibre.ebooks import BOOK_EXTENSIONS
 from calibre.ebooks.epub.iterator import is_supported
 from calibre.library import server_config
 
+class CategoryModel(QStringListModel):
+    
+    def __init__(self, *args):
+        QStringListModel.__init__(self, *args)
+        self.setStringList([_('General'), _('Interface'), _('Advanced'), 
+                            _('Content\nServer')])
+        self.icons = list(map(QVariant, map(QIcon, 
+            [':/images/dialog_information.svg', ':/images/lookfeel.svg', 
+             ':/images/view.svg', ':/images/network-server.svg'])))
+    
+    def data(self, index, role):
+        if role == Qt.DecorationRole:
+            return self.icons[index.row()]
+        return QStringListModel.data(self, index, role)
+            
+
 class ConfigDialog(QDialog, Ui_Dialog):
 
     def __init__(self, window, db, server=None):
@@ -24,10 +41,10 @@ class ConfigDialog(QDialog, Ui_Dialog):
         Ui_Dialog.__init__(self)
         self.ICON_SIZES = {0:QSize(48, 48), 1:QSize(32,32), 2:QSize(24,24)}
         self.setupUi(self)
-        self.item1 = QListWidgetItem(QIcon(':/images/metadata.svg'), _('General'), self.category_list)
-        self.item2 = QListWidgetItem(QIcon(':/images/lookfeel.svg'), _('Interface'), self.category_list)
-        self.item3 = QListWidgetItem(QIcon(':/images/view.svg'), _('Advanced'), self.category_list)
-        self.item4 = QListWidgetItem(QIcon(':/images/network-server.svg'), _('Content\nServer'), self.category_list)
+        self._category_model = CategoryModel()
+        
+        self.connect(self.category_view, SIGNAL('activated(QModelIndex)'), lambda i: self.stackedWidget.setCurrentIndex(i.row()))
+        self.category_view.setModel(self._category_model)
         self.db = db
         self.server = server
         path = prefs['library_path']
@@ -120,6 +137,7 @@ class ConfigDialog(QDialog, Ui_Dialog):
         self.priority.setCurrentIndex(p)
         self.priority.setVisible(iswindows)
         self.priority_label.setVisible(iswindows)
+        self.category_view.setCurrentIndex(self._category_model.index(0))
     
     def up_column(self):
         idx = self.columns.currentRow()
diff --git a/src/calibre/gui2/dialogs/config.ui b/src/calibre/gui2/dialogs/config.ui
index 55c52a5fd3..cf7562d73f 100644
--- a/src/calibre/gui2/dialogs/config.ui
+++ b/src/calibre/gui2/dialogs/config.ui
@@ -6,7 +6,7 @@
    <rect>
     <x>0</x>
     <y>0</y>
-    <width>709</width>
+    <width>800</width>
     <height>563</height>
    </rect>
   </property>
@@ -21,12 +21,12 @@
    <item row="0" column="0" >
     <layout class="QHBoxLayout" >
      <item>
-      <widget class="QListWidget" name="category_list" >
-       <property name="maximumSize" >
-        <size>
-         <width>140</width>
-         <height>16777215</height>
-        </size>
+      <widget class="QListView" name="category_view" >
+       <property name="sizePolicy" >
+        <sizepolicy vsizetype="Expanding" hsizetype="MinimumExpanding" >
+         <horstretch>1</horstretch>
+         <verstretch>0</verstretch>
+        </sizepolicy>
        </property>
        <property name="font" >
         <font>
@@ -34,43 +34,43 @@
          <bold>true</bold>
         </font>
        </property>
-       <property name="mouseTracking" >
-        <bool>true</bool>
-       </property>
-       <property name="verticalScrollBarPolicy" >
-        <enum>Qt::ScrollBarAlwaysOff</enum>
-       </property>
-       <property name="horizontalScrollBarPolicy" >
-        <enum>Qt::ScrollBarAlwaysOff</enum>
-       </property>
        <property name="tabKeyNavigation" >
         <bool>true</bool>
        </property>
+       <property name="showDropIndicator" stdset="0" >
+        <bool>false</bool>
+       </property>
        <property name="iconSize" >
         <size>
          <width>48</width>
          <height>48</height>
         </size>
        </property>
-       <property name="movement" >
-        <enum>QListView::Static</enum>
+       <property name="verticalScrollMode" >
+        <enum>QAbstractItemView::ScrollPerItem</enum>
+       </property>
+       <property name="horizontalScrollMode" >
+        <enum>QAbstractItemView::ScrollPerPixel</enum>
        </property>
        <property name="flow" >
         <enum>QListView::TopToBottom</enum>
        </property>
-       <property name="isWrapping" stdset="0" >
-        <bool>false</bool>
-       </property>
        <property name="spacing" >
-        <number>25</number>
+        <number>20</number>
        </property>
        <property name="viewMode" >
-        <enum>QListView::IconMode</enum>
+        <enum>QListView::ListMode</enum>
        </property>
       </widget>
      </item>
      <item>
       <widget class="QStackedWidget" name="stackedWidget" >
+       <property name="sizePolicy" >
+        <sizepolicy vsizetype="Preferred" hsizetype="Expanding" >
+         <horstretch>100</horstretch>
+         <verstretch>0</verstretch>
+        </sizepolicy>
+       </property>
        <property name="currentIndex" >
         <number>0</number>
        </property>
@@ -801,8 +801,8 @@
    <slot>accept()</slot>
    <hints>
     <hint type="sourcelabel" >
-     <x>235</x>
-     <y>671</y>
+     <x>239</x>
+     <y>558</y>
     </hint>
     <hint type="destinationlabel" >
      <x>157</x>
@@ -817,8 +817,8 @@
    <slot>reject()</slot>
    <hints>
     <hint type="sourcelabel" >
-     <x>303</x>
-     <y>671</y>
+     <x>307</x>
+     <y>558</y>
     </hint>
     <hint type="destinationlabel" >
      <x>286</x>
@@ -826,21 +826,5 @@
     </hint>
    </hints>
   </connection>
-  <connection>
-   <sender>category_list</sender>
-   <signal>currentRowChanged(int)</signal>
-   <receiver>stackedWidget</receiver>
-   <slot>setCurrentIndex(int)</slot>
-   <hints>
-    <hint type="sourcelabel" >
-     <x>142</x>
-     <y>117</y>
-    </hint>
-    <hint type="destinationlabel" >
-     <x>256</x>
-     <y>7</y>
-    </hint>
-   </hints>
-  </connection>
  </connections>
 </ui>
diff --git a/src/calibre/gui2/main.py b/src/calibre/gui2/main.py
index 0386e7875c..91c608c7af 100644
--- a/src/calibre/gui2/main.py
+++ b/src/calibre/gui2/main.py
@@ -332,7 +332,7 @@ class Main(MainWindow, Ui_MainWindow):
         self.scheduler = Scheduler(self)
         self.action_news.setMenu(self.scheduler.news_menu)
         self.connect(self.action_news, SIGNAL('triggered(bool)'), self.scheduler.show_dialog)
-        
+        self.location_view.setCurrentIndex(self.location_view.model().index(0))
         
     def test_server(self, *args):
         if self.content_server.exception is not None:
diff --git a/src/calibre/library/database2.py b/src/calibre/library/database2.py
index c9984032e6..96293a2270 100644
--- a/src/calibre/library/database2.py
+++ b/src/calibre/library/database2.py
@@ -1055,7 +1055,7 @@ class LibraryDatabase2(LibraryDatabase):
                               (mi.title, mi.authors[0]))
         id = obj.lastrowid
         self.data.books_added([id], self.conn)
-        self.set_path(id, True)
+        self.set_path(id, index_is_id=True)
         self.conn.commit()
         self.set_metadata(id, mi)