diff --git a/src/mainwindow.cpp b/src/mainwindow.cpp
index 40886c3..a989178 100644
--- a/src/mainwindow.cpp
+++ b/src/mainwindow.cpp
@@ -80,9 +80,9 @@ DanbooruMainWindow::DanbooruMainWindow(QWidget *parent)
 
     loadSettings();
 
-    // TODO Configurable
     m_cache = new KImageCache(qApp->applicationName(), DanbooruSettings::self()->cacheSize());
     m_service->setImageCache(m_cache);
+    m_tableView->setModel(m_poolModel);
 
     // Set up declarative bindings for the QQuickWidget
 
@@ -92,7 +92,7 @@ DanbooruMainWindow::DanbooruMainWindow(QWidget *parent)
     declarative.setupBindings();
 
     auto qmlViewPath = QStandardPaths::locate(QStandardPaths::GenericDataLocation,
-                                              qApp->applicationName() + QChar('/') +                                             QLatin1Literal("danbooruimageview.qml"));
+                                              qApp->applicationName() +                                             QLatin1String("/danbooruimageview.qml"));
 
     QQmlContext *ctxt = m_view->rootContext();
     ctxt->setContextProperty("danbooruModel", m_model);
@@ -110,10 +110,6 @@ DanbooruMainWindow::DanbooruMainWindow(QWidget *parent)
 
     // then, setup our actions
     setupActions();
-
-    // add a status bar
-    statusBar()->show();
-
     setupGUI(KXmlGuiWindow::ToolBar|Keys|Save|Create|StatusBar, "danbooru-clientui.rc");
 
     // connections
@@ -138,6 +134,7 @@ DanbooruMainWindow::DanbooruMainWindow(QWidget *parent)
             m_service->getPostList();
         }
         m_connectWidget->hide();
+        statusBar()->hide();
 
     });
 
@@ -275,11 +272,12 @@ void DanbooruMainWindow::setupActions()
 void DanbooruMainWindow::setupDockWidgets() {
 
     // Set up PoolWidget
-    m_tableView->setModel(m_poolModel);
+
     QDockWidget* poolDockWidget = new QDockWidget(i18n("Pools"), this);
     poolDockWidget->setAllowedAreas(Qt::BottomDockWidgetArea);
     poolDockWidget->setWidget(m_tableView);
     poolDockWidget->setObjectName("PoolView");
+
     // Prevent the use of winId() when detached, leads to QQuickWidget bugs
     poolDockWidget->setFeatures(QDockWidget::DockWidgetClosable);
     addDockWidget(Qt::BottomDockWidgetArea, poolDockWidget);
@@ -291,12 +289,15 @@ void DanbooruMainWindow::setupDockWidgets() {
     searchDockWidget->setAllowedAreas(Qt::TopDockWidgetArea);
     searchDockWidget->setWidget(m_searchWidget);
     searchDockWidget->setObjectName("SearchView");
-    // FIXME: Get rid of the close button in the widget
+
     searchDockWidget->setFeatures(QDockWidget::NoDockWidgetFeatures);
     addDockWidget(Qt::TopDockWidgetArea, searchDockWidget);
+    // No title wanted
+    searchDockWidget->setTitleBarWidget(new QWidget(this));
+
     searchDockWidget->hide();
     m_searchWidget->hide();
-    searchDockWidget->setTitleBarWidget(new QWidget(this));
+
 
     // Connections