diff --git a/openlp/core/ui/mainwindow.py b/openlp/core/ui/mainwindow.py
index d08a66bec..6d39f1254 100644
--- a/openlp/core/ui/mainwindow.py
+++ b/openlp/core/ui/mainwindow.py
@@ -92,8 +92,7 @@ class MainWindow(object):
         self.ControlSplitter = QtGui.QSplitter(self.MainContent)
         self.ControlSplitter.setOrientation(QtCore.Qt.Horizontal)
         self.ControlSplitter.setObjectName("ControlSplitter")
-        # TODO: need some way to make this geometry work properly!
-        self.ControlSplitter.setGeometry(self.main_window.geometry())
+        self.MainContentLayout.addWidget(self.ControlSplitter)
         self.PreviewController = SlideController(self.ControlSplitter)
         self.LiveController = SlideController(self.ControlSplitter)
         self.MenuBar = QtGui.QMenuBar(self.main_window)
diff --git a/openlp/plugins/bibles/lib/biblemediaitem.py b/openlp/plugins/bibles/lib/biblemediaitem.py
index b33a675b9..a34f88d2d 100644
--- a/openlp/plugins/bibles/lib/biblemediaitem.py
+++ b/openlp/plugins/bibles/lib/biblemediaitem.py
@@ -74,21 +74,21 @@ class BibleMediaItem(MediaManagerItem):
         self.QuickTab = QtGui.QWidget()
         self.QuickTab.setObjectName('QuickTab')
         self.QuickLayout = QtGui.QGridLayout(self.QuickTab)
+        self.QuickLayout.setMargin(8)
+        self.QuickLayout.setSpacing(8)
         self.QuickLayout.setObjectName('QuickLayout')
-        self.QuickVersionComboBox = QtGui.QComboBox(self.QuickTab)
-        self.QuickVersionComboBox.setObjectName('VersionComboBox')
-        self.QuickLayout.addWidget(self.QuickVersionComboBox, 0, 1, 1, 2)
         self.QuickVersionLabel = QtGui.QLabel(self.QuickTab)
         self.QuickVersionLabel.setObjectName('QuickVersionLabel')
         self.QuickLayout.addWidget(self.QuickVersionLabel, 0, 0, 1, 1)
-
-        self.QuickSearchComboBox = QtGui.QComboBox(self.QuickTab)
-        self.QuickSearchComboBox.setObjectName('SearchComboBox')
-        self.QuickLayout.addWidget(self.QuickSearchComboBox, 1, 1, 1, 2)
+        self.QuickVersionComboBox = QtGui.QComboBox(self.QuickTab)
+        self.QuickVersionComboBox.setObjectName('VersionComboBox')
+        self.QuickLayout.addWidget(self.QuickVersionComboBox, 0, 1, 1, 2)
         self.QuickSearchLabel = QtGui.QLabel(self.QuickTab)
         self.QuickSearchLabel.setObjectName('QuickSearchLabel')
         self.QuickLayout.addWidget(self.QuickSearchLabel, 1, 0, 1, 1)
-
+        self.QuickSearchComboBox = QtGui.QComboBox(self.QuickTab)
+        self.QuickSearchComboBox.setObjectName('SearchComboBox')
+        self.QuickLayout.addWidget(self.QuickSearchComboBox, 1, 1, 1, 2)
         self.QuickSearchLabel = QtGui.QLabel(self.QuickTab)
         self.QuickSearchLabel.setObjectName('QuickSearchLabel')
         self.QuickLayout.addWidget(self.QuickSearchLabel, 2, 0, 1, 1)
@@ -98,7 +98,6 @@ class BibleMediaItem(MediaManagerItem):
         self.QuickSearchButton = QtGui.QPushButton(self.QuickTab)
         self.QuickSearchButton.setObjectName('QuickSearchButton')
         self.QuickLayout.addWidget(self.QuickSearchButton, 3, 2, 1, 1)
-
         self.QuickClearLabel = QtGui.QLabel(self.QuickTab)
         self.QuickClearLabel.setObjectName('QuickSearchLabel')
         self.QuickLayout.addWidget(self.QuickClearLabel, 3, 0, 1, 1)
@@ -113,6 +112,8 @@ class BibleMediaItem(MediaManagerItem):
         self.AdvancedTab = QtGui.QWidget()
         self.AdvancedTab.setObjectName('AdvancedTab')
         self.AdvancedLayout = QtGui.QGridLayout(self.AdvancedTab)
+        self.AdvancedLayout.setMargin(8)
+        self.AdvancedLayout.setSpacing(8)
         self.AdvancedLayout.setObjectName('AdvancedLayout')
         self.AdvancedVersionLabel = QtGui.QLabel(self.AdvancedTab)
         self.AdvancedVersionLabel.setObjectName('AdvancedVersionLabel')