diff --git a/src/playlist/playlistcontainer.h b/src/playlist/playlistcontainer.h
index ee25c8034..20a602fd4 100644
--- a/src/playlist/playlistcontainer.h
+++ b/src/playlist/playlistcontainer.h
@@ -21,8 +21,6 @@
 #include <QWidget>
 #include <QSettings>
 
-#include "playlist.h"
-
 class Ui_PlaylistContainer;
 
 class LineEditInterface;
diff --git a/src/playlist/playlistcontainer.ui b/src/playlist/playlistcontainer.ui
index 49bb0649c..7956a5b13 100644
--- a/src/playlist/playlistcontainer.ui
+++ b/src/playlist/playlistcontainer.ui
@@ -24,16 +24,7 @@
    <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">
+   <property name="margin">
     <number>0</number>
    </property>
    <item>
@@ -45,16 +36,7 @@
       <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">
+      <property name="margin">
        <number>0</number>
       </property>
       <item>
@@ -122,36 +104,6 @@
         </property>
        </widget>
       </item>
-      <item>
-       <widget class="Line" name="line">
-        <property name="orientation">
-         <enum>Qt::Vertical</enum>
-        </property>
-       </widget>
-      </item>
-      <item>
-       <widget class="QLabel" name="file_path_label">
-        <property name="sizePolicy">
-         <sizepolicy hsizetype="Fixed" vsizetype="Fixed">
-          <horstretch>0</horstretch>
-          <verstretch>0</verstretch>
-         </sizepolicy>
-        </property>
-        <property name="text">
-         <string>File Paths:</string>
-        </property>
-       </widget>
-      </item>
-      <item>
-       <widget class="QComboBox" name="file_path_box">
-        <property name="sizePolicy">
-         <sizepolicy hsizetype="Fixed" vsizetype="Fixed">
-          <horstretch>0</horstretch>
-          <verstretch>0</verstretch>
-         </sizepolicy>
-        </property>
-       </widget>
-      </item>
       <item>
        <widget class="Line" name="line_2">
         <property name="orientation">
diff --git a/src/ui/behavioursettingspage.ui b/src/ui/behavioursettingspage.ui
index e983ee023..a875bcfdd 100644
--- a/src/ui/behavioursettingspage.ui
+++ b/src/ui/behavioursettingspage.ui
@@ -281,13 +281,6 @@
         </property>
        </spacer>
       </item>
-      <item>
-       <widget class="QCheckBox" name="b_quickchange_menu">
-        <property name="text">
-         <string>Show quick change menu</string>
-        </property>
-       </widget>
-      </item>
       <item>
        <widget class="QCheckBox" name="b_write_metadata">
         <property name="text">