diff --git a/openlp/core/lib/__init__.py b/openlp/core/lib/__init__.py
index 730fee232..7ad377817 100644
--- a/openlp/core/lib/__init__.py
+++ b/openlp/core/lib/__init__.py
@@ -316,7 +316,7 @@ def check_directory_exists(dir):
     """
     log.debug(u'check_directory_exists')
     if not os.path.exists(dir):
-        os.mkdir(dir)
+        os.makedirs(dir)
 
 from theme import ThemeLevel, ThemeXML, BackgroundGradientType, \
     BackgroundType, HorizontalType, VerticalType
@@ -338,4 +338,4 @@ from dockwidget import OpenLPDockWidget
 from renderer import Renderer
 from rendermanager import RenderManager
 from mediamanageritem import MediaManagerItem
-from baselistwithdnd import BaseListWithDnD
\ No newline at end of file
+from baselistwithdnd import BaseListWithDnD
diff --git a/openlp/core/ui/displaytagtab.py b/openlp/core/ui/displaytagtab.py
index b27141079..1feb74b48 100644
--- a/openlp/core/ui/displaytagtab.py
+++ b/openlp/core/ui/displaytagtab.py
@@ -166,14 +166,14 @@ class DisplayTagTab(SettingsTab):
         self.defaultPushButton.setText(
             translate('OpenLP.DisplayTagTab', 'Default'))
         self.newPushButton.setText(translate('OpenLP.DisplayTagTab', 'New'))
-        self.tagTableWidget.horizontalHeaderItem(0). \
-            setText(translate('OpenLP.DisplayTagTab', 'Description'))
-        self.tagTableWidget.horizontalHeaderItem(1). \
-            setText(translate('OpenLP.DisplayTagTab', 'Tag id'))
-        self.tagTableWidget.horizontalHeaderItem(2). \
-            setText(translate('OpenLP.DisplayTagTab', 'Start Html'))
-        self.tagTableWidget.horizontalHeaderItem(3). \
-            setText(translate('OpenLP.DisplayTagTab', 'End Html'))
+        self.tagTableWidget.horizontalHeaderItem(0)\
+            .setText(translate('OpenLP.DisplayTagTab', 'Description'))
+        self.tagTableWidget.horizontalHeaderItem(1)\
+            .setText(translate('OpenLP.DisplayTagTab', 'Tag id'))
+        self.tagTableWidget.horizontalHeaderItem(2)\
+            .setText(translate('OpenLP.DisplayTagTab', 'Start Html'))
+        self.tagTableWidget.horizontalHeaderItem(3)\
+            .setText(translate('OpenLP.DisplayTagTab', 'End Html'))
         QtCore.QMetaObject.connectSlotsByName(self.displayTagEdit)
         self.tagTableWidget.setColumnWidth(0, 120)
         self.tagTableWidget.setColumnWidth(1, 40)
diff --git a/openlp/core/ui/maindisplay.py b/openlp/core/ui/maindisplay.py
index 0396deedc..adc2cb5fa 100644
--- a/openlp/core/ui/maindisplay.py
+++ b/openlp/core/ui/maindisplay.py
@@ -105,7 +105,6 @@ class MainDisplay(DisplayWidget):
         self.hideMode = None
         mainIcon = build_icon(u':/icon/openlp-logo-16x16.png')
         self.setWindowIcon(mainIcon)
-        self.setWindowTitle(u'OpenLP Display')
         self.retranslateUi()
         self.setStyleSheet(u'border: 0px; margin: 0px; padding: 0px;')
         self.setWindowFlags(QtCore.Qt.FramelessWindowHint |
diff --git a/openlp/core/ui/settingsform.py b/openlp/core/ui/settingsform.py
index 2696e6329..afea928b6 100644
--- a/openlp/core/ui/settingsform.py
+++ b/openlp/core/ui/settingsform.py
@@ -55,9 +55,9 @@ class SettingsForm(QtGui.QDialog, Ui_SettingsDialog):
         # Advanced tab
         self.advancedTab = AdvancedTab()
         self.addTab(u'Advanced', self.advancedTab)
-        # Edit Tags tab
-        displayTagTab = DisplayTagTab()
-        self.addTab(u'Display Tags', displayTagTab)
+        # Edit Display Tags tab
+        self.displayTagTab = DisplayTagTab()
+        self.addTab(u'Display Tags', self.displayTagTab)
 
     def addTab(self, name, tab):
         """