diff --git a/openlp/core/common/registryproperties.py b/openlp/core/common/registryproperties.py
index 8cf8a6930..f180ed1a0 100644
--- a/openlp/core/common/registryproperties.py
+++ b/openlp/core/common/registryproperties.py
@@ -95,7 +95,7 @@ class RegistryProperties(object):
 
     def _get_preview_controller(self):
         """
-        Adds the live controller to the class dynamically
+        Adds the preview controller to the class dynamically
         """
         if not hasattr(self, '_preview_controller') or not self._preview_controller:
             self._preview_controller = Registry().get('preview_controller')
diff --git a/openlp/core/ui/mainwindow.py b/openlp/core/ui/mainwindow.py
index 664b1ec6d..29213c2af 100644
--- a/openlp/core/ui/mainwindow.py
+++ b/openlp/core/ui/mainwindow.py
@@ -460,7 +460,7 @@ class Ui_MainWindow(object):
         self.mode_live_item.setStatusTip(translate('OpenLP.MainWindow', 'Set the view mode to Live.'))
 
 
-class MainWindow(RegistryProperties, QtGui.QMainWindow, Ui_MainWindow):
+class MainWindow(QtGui.QMainWindow, Ui_MainWindow, RegistryProperties):
     """
     The main window.
     """
diff --git a/openlp/core/ui/slidecontroller.py b/openlp/core/ui/slidecontroller.py
index 432234f5b..80835b97f 100644
--- a/openlp/core/ui/slidecontroller.py
+++ b/openlp/core/ui/slidecontroller.py
@@ -102,7 +102,7 @@ class DisplayController(QtGui.QWidget):
         Registry().execute('%s' % sender, [controller, args])
 
 
-class SlideController(RegistryProperties, DisplayController):
+class SlideController(DisplayController, RegistryProperties):
     """
     SlideController is the slide controller widget. This widget is what the
     user uses to control the displaying of verses/slides/etc on the screen.