diff --git a/openlp/core/lib/plugin.py b/openlp/core/lib/plugin.py
index e4359f6b0..a6cc5df63 100644
--- a/openlp/core/lib/plugin.py
+++ b/openlp/core/lib/plugin.py
@@ -290,8 +290,6 @@ class Plugin(QtCore.QObject):
         if self.mediaItem:
             self.mediaItem.initialise()
             self.mediadock.insert_dock(self.mediaItem, self.icon, self.weight)
-        if self.settings_tab:
-            self.settingsForm.insertTab(self.settings_tab, self.weight)
 
     def finalise(self):
         """
@@ -299,8 +297,6 @@ class Plugin(QtCore.QObject):
         """
         if self.mediaItem:
             self.mediadock.remove_dock(self.mediaItem)
-        if self.settings_tab:
-            self.settingsForm.removeTab(self.settings_tab)
 
     def usesTheme(self, theme):
         """
diff --git a/openlp/core/lib/pluginmanager.py b/openlp/core/lib/pluginmanager.py
index 6f1222276..0fddc75c4 100644
--- a/openlp/core/lib/pluginmanager.py
+++ b/openlp/core/lib/pluginmanager.py
@@ -137,7 +137,7 @@ class PluginManager(object):
             if plugin.status is not PluginStatus.Disabled:
                 plugin.mediaItem = plugin.getMediaManagerItem()
 
-    def hook_settings_tabs(self, settingsform=None):
+    def hook_settings_tabs(self, settings_form=None):
         """
         Loop through all the plugins. If a plugin has a valid settings tab
         item, add it to the settings tab.
@@ -148,15 +148,8 @@ class PluginManager(object):
         """
         for plugin in self.plugins:
             if plugin.status is not PluginStatus.Disabled:
-                plugin.settings_tab = plugin.getSettingsTab(settingsform)
-                visible_title = plugin.getString(StringContent.VisibleName)
-                if plugin.settings_tab and plugin.isActive():
-                    log.debug(u'Inserting settings tab item from %s' %
-                        visible_title[u'title'])
-                    settingsform.insertTab(plugin.settings_tab, plugin.weight)
-                else:
-                    log.debug(
-                        u'No tab settings in %s' % visible_title[u'title'])
+                plugin.settings_tab = plugin.getSettingsTab(settings_form)
+        settings_form.plugins = self.plugins
 
     def hook_import_menu(self, import_menu):
         """
diff --git a/openlp/core/ui/settingsform.py b/openlp/core/ui/settingsform.py
index 72e1b7fa4..6d1680b53 100644
--- a/openlp/core/ui/settingsform.py
+++ b/openlp/core/ui/settingsform.py
@@ -30,7 +30,7 @@ import logging
 
 from PyQt4 import QtGui, QtCore
 
-from openlp.core.lib import Receiver, build_icon
+from openlp.core.lib import Receiver, build_icon, PluginStatus
 from openlp.core.ui import AdvancedTab, GeneralTab, ThemesTab
 from settingsdialog import Ui_SettingsDialog
 
@@ -47,53 +47,42 @@ class SettingsForm(QtGui.QDialog, Ui_SettingsDialog):
         QtGui.QDialog.__init__(self, parent)
         self.setupUi(self)
         # General tab
-        generalTab = GeneralTab(self, screens)
-        self.insertTab(generalTab, 1)
+        self.generalTab = GeneralTab(self, screens)
         # Themes tab
-        themesTab = ThemesTab(self, mainWindow)
-        self.insertTab(themesTab, 2)
+        self.themesTab = ThemesTab(self, mainWindow)
         # Advanced tab
-        advancedTab = AdvancedTab(self, )
-        self.insertTab(advancedTab, 3)
+        self.advancedTab = AdvancedTab(self)
 
     def exec_(self):
         # load all the settings
-        for tabIndex in range(0, self.stackedLayout.count()):
-            self.stackedLayout.widget(tabIndex).load()
+        self.settingListWidget.clear()
+        for tabIndex in range(0, self.stackedLayout.count() + 1):
+            # take at 0 and the rest shuffell up.
+            self.stackedLayout.takeAt(0)
+        self.insertTab(self.generalTab, 0, PluginStatus.Active)
+        self.insertTab(self.themesTab, 1, PluginStatus.Active)
+        self.insertTab(self.advancedTab, 2, PluginStatus.Active)
+        count = 3
+        for plugin in self.plugins:
+            if plugin.settings_tab:
+                self.insertTab(plugin.settings_tab, count, plugin.status)
+                count += 1
         self.settingListWidget.setCurrentRow(0)
         return QtGui.QDialog.exec_(self)
 
-    def insertTab(self, tab, location):
+    def insertTab(self, tab, location, is_active):
         """
         Add a tab to the form at a specific location
         """
         log.debug(u'Inserting %s tab' % tab.tabTitle)
-        # 14 : There are 3 tables currently and locations starts at -10
-        match = False
-        for tabIndex in range(0, self.stackedLayout.count()):
-            if self.stackedLayout.widget(tabIndex):
-                if self.stackedLayout.widget(tabIndex).tabTitleVisible == \
-                    tab.tabTitleVisible:
-                    self.stackedLayout.widget(tabIndex).setHidden(False)
-                    match = True
-                    break
-        if not match:
-            pos = self.stackedLayout.addWidget(tab)
+        pos = self.stackedLayout.addWidget(tab)
+        if is_active:
             item_name = QtGui.QListWidgetItem(tab.tabTitleVisible)
             icon = build_icon(tab.icon_path)
             item_name.setIcon(icon)
-            self.settingListWidget.insertItem(14 + location, item_name)
-
-    def removeTab(self, tab):
-        """
-        Remove a tab from the form
-        """
-        log.debug(u'remove %s tab' % tab.tabTitleVisible)
-        for tabIndex in range(0, self.stackedLayout.count()):
-            if self.stackedLayout.widget(tabIndex):
-                if self.stackedLayout.widget(tabIndex).tabTitleVisible == \
-                    tab.tabTitleVisible:
-                    self.settingListWidget.item(tabIndex).setHidden(True)
+            self.settingListWidget.insertItem(location, item_name)
+        else:
+            self.stackedLayout.takeAt(location)
 
     def accept(self):
         """
diff --git a/openlp/plugins/bibles/lib/mediaitem.py b/openlp/plugins/bibles/lib/mediaitem.py
index b3ffff87c..736d3d82e 100644
--- a/openlp/plugins/bibles/lib/mediaitem.py
+++ b/openlp/plugins/bibles/lib/mediaitem.py
@@ -836,6 +836,9 @@ class BibleMediaItem(MediaManagerItem):
         return u'{su}%s{/su}' % verse_text
 
     def onlayoutStyleComboBoxChanged(self):
+        self.settings.layout_style = self.quickLayoutComboBox.currentIndex()
+        self.settings.layoutStyleComboBox.setCurrentIndex(
+            self.settings.layout_style)
         QtCore.QSettings().setValue(
             self.settingsSection + u'/verse layout style',
             QtCore.QVariant(self.settings.layout_style))