diff --git a/devices/trackorganiser.cpp b/devices/trackorganiser.cpp
index eeec45a0c..394451b67 100644
--- a/devices/trackorganiser.cpp
+++ b/devices/trackorganiser.cpp
@@ -47,10 +47,6 @@ TrackOrganiser::TrackOrganiser(QWidget *parent)
     setMainWidget(mainWidet);
     configFilename->setIcon(QIcon::fromTheme("configure"));
     setButtonGuiItem(Ok, KGuiItem(i18n("Rename"), "edit-rename"));
-
-    // TODO: Move to UI!
-    files->setRootIsDecorated(false);
-    files->setAllColumnsShowFocus(true);
     connect(this, SIGNAL(update()), MPDConnection::self(), SLOT(update()));
 }
 
@@ -163,7 +159,6 @@ void TrackOrganiser::updateView()
 
 void TrackOrganiser::startRename()
 {
-    //TODO: Save options - either mpd or device...
     optionsBox->setEnabled(false);
     enableButtonOk(false);
     index=0;
diff --git a/devices/trackorganiser.ui b/devices/trackorganiser.ui
index 7863ec87e..f8ed503ab 100644
--- a/devices/trackorganiser.ui
+++ b/devices/trackorganiser.ui
@@ -130,6 +130,15 @@
    </item>
    <item>
     <widget class="QTreeWidget" name="files">
+     <property name="rootIsDecorated">
+      <bool>false</bool>
+     </property>
+     <property name="uniformRowHeights">
+      <bool>true</bool>
+     </property>
+     <property name="allColumnsShowFocus">
+      <bool>true</bool>
+     </property>
      <column>
       <property name="text">
        <string>Orignal Name</string>
@@ -151,6 +160,15 @@
    <header>lineedit.h</header>
   </customwidget>
  </customwidgets>
+ <tabstops>
+  <tabstop>vfatSafe</tabstop>
+  <tabstop>asciiOnly</tabstop>
+  <tabstop>replaceSpaces</tabstop>
+  <tabstop>ignoreThe</tabstop>
+  <tabstop>filenameScheme</tabstop>
+  <tabstop>configFilename</tabstop>
+  <tabstop>files</tabstop>
+ </tabstops>
  <resources/>
  <connections/>
 </ui>