diff --git a/resources/forms/authorsdialog.ui b/resources/forms/authorsdialog.ui
new file mode 100644
index 000000000..8c6735c7c
--- /dev/null
+++ b/resources/forms/authorsdialog.ui
@@ -0,0 +1,190 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<ui version="4.0">
+ <class>AuthorsDialog</class>
+ <widget class="QDialog" name="AuthorsDialog">
+  <property name="geometry">
+   <rect>
+    <x>0</x>
+    <y>0</y>
+    <width>387</width>
+    <height>532</height>
+   </rect>
+  </property>
+  <property name="windowTitle">
+   <string>Author Maintenance</string>
+  </property>
+  <widget class="QDialogButtonBox" name="buttonBox">
+   <property name="geometry">
+    <rect>
+     <x>40</x>
+     <y>490</y>
+     <width>341</width>
+     <height>32</height>
+    </rect>
+   </property>
+   <property name="toolTip">
+    <string>Exit Screen</string>
+   </property>
+   <property name="orientation">
+    <enum>Qt::Horizontal</enum>
+   </property>
+   <property name="standardButtons">
+    <set>QDialogButtonBox::Ok</set>
+   </property>
+  </widget>
+  <widget class="QGroupBox" name="AuthorDetails">
+   <property name="geometry">
+    <rect>
+     <x>20</x>
+     <y>330</y>
+     <width>341</width>
+     <height>158</height>
+    </rect>
+   </property>
+   <property name="title">
+    <string>Author Details</string>
+   </property>
+   <layout class="QGridLayout" name="gridLayout">
+    <item row="0" column="0">
+     <widget class="QLabel" name="DisplayLabel">
+      <property name="text">
+       <string>Display Name:</string>
+      </property>
+     </widget>
+    </item>
+    <item row="0" column="1" colspan="3">
+     <widget class="QLineEdit" name="DisplayEdit"/>
+    </item>
+    <item row="1" column="0">
+     <widget class="QLabel" name="FirstNameLabel">
+      <property name="text">
+       <string>First Name:</string>
+      </property>
+     </widget>
+    </item>
+    <item row="1" column="1" colspan="3">
+     <widget class="QLineEdit" name="FirstNameEdit"/>
+    </item>
+    <item row="2" column="0">
+     <widget class="QLabel" name="LastNameLabel">
+      <property name="text">
+       <string>Last Name:</string>
+      </property>
+     </widget>
+    </item>
+    <item row="2" column="1" colspan="3">
+     <widget class="QLineEdit" name="LastNameEdit"/>
+    </item>
+    <item row="3" column="0" colspan="2">
+     <spacer name="horizontalSpacer">
+      <property name="orientation">
+       <enum>Qt::Horizontal</enum>
+      </property>
+      <property name="sizeHint" stdset="0">
+       <size>
+        <width>198</width>
+        <height>20</height>
+       </size>
+      </property>
+     </spacer>
+    </item>
+    <item row="3" column="2">
+     <widget class="QPushButton" name="DeleteButton">
+      <property name="toolTip">
+       <string>Delete Author</string>
+      </property>
+      <property name="text">
+       <string/>
+      </property>
+      <property name="icon">
+       <iconset resource="../images/openlp-2.qrc">
+        <normaloff>:/services/service_delete.png</normaloff>:/services/service_delete.png</iconset>
+      </property>
+     </widget>
+    </item>
+    <item row="3" column="3">
+     <widget class="QPushButton" name="AddUpdateButton">
+      <property name="toolTip">
+       <string>Add Update Author</string>
+      </property>
+      <property name="text">
+       <string/>
+      </property>
+      <property name="icon">
+       <iconset resource="../images/openlp-2.qrc">
+        <normaloff>:/system/system_settings.png</normaloff>:/system/system_settings.png</iconset>
+      </property>
+     </widget>
+    </item>
+   </layout>
+  </widget>
+  <widget class="QLabel" name="MessageLabel">
+   <property name="geometry">
+    <rect>
+     <x>20</x>
+     <y>500</y>
+     <width>261</width>
+     <height>17</height>
+    </rect>
+   </property>
+   <property name="text">
+    <string/>
+   </property>
+  </widget>
+  <widget class="QTableWidget" name="AuthorListView">
+   <property name="geometry">
+    <rect>
+     <x>20</x>
+     <y>20</y>
+     <width>341</width>
+     <height>301</height>
+    </rect>
+   </property>
+   <property name="alternatingRowColors">
+    <bool>true</bool>
+   </property>
+   <property name="columnCount">
+    <number>2</number>
+   </property>
+   <column/>
+   <column/>
+  </widget>
+ </widget>
+ <resources>
+  <include location="../images/openlp-2.qrc"/>
+ </resources>
+ <connections>
+  <connection>
+   <sender>buttonBox</sender>
+   <signal>accepted()</signal>
+   <receiver>AuthorsDialog</receiver>
+   <slot>accept()</slot>
+   <hints>
+    <hint type="sourcelabel">
+     <x>248</x>
+     <y>254</y>
+    </hint>
+    <hint type="destinationlabel">
+     <x>157</x>
+     <y>274</y>
+    </hint>
+   </hints>
+  </connection>
+  <connection>
+   <sender>buttonBox</sender>
+   <signal>rejected()</signal>
+   <receiver>AuthorsDialog</receiver>
+   <slot>reject()</slot>
+   <hints>
+    <hint type="sourcelabel">
+     <x>316</x>
+     <y>260</y>
+    </hint>
+    <hint type="destinationlabel">
+     <x>286</x>
+     <y>274</y>
+    </hint>
+   </hints>
+  </connection>
+ </connections>
+</ui>
diff --git a/resources/forms/bibleimportdialog.py b/resources/forms/bibleimportdialog.py
new file mode 100644
index 000000000..8af899b1d
--- /dev/null
+++ b/resources/forms/bibleimportdialog.py
@@ -0,0 +1,240 @@
+# -*- coding: utf-8 -*-
+
+# Form implementation generated from reading ui file 'bibleimport.ui'
+#
+# Created: Mon Dec 15 18:34:25 2008
+#      by: PyQt4 UI code generator 4.4.3
+#
+# WARNING! All changes made in this file will be lost!
+
+from PyQt4 import QtCore, QtGui
+
+class Ui_BibleImportDialog(object):
+    def setupUi(self, BibleImportDialog):
+        BibleImportDialog.setObjectName("BibleImportDialog")
+        BibleImportDialog.resize(494, 725)
+        self.BibleImportButtonBox = QtGui.QDialogButtonBox(BibleImportDialog)
+        self.BibleImportButtonBox.setGeometry(QtCore.QRect(10, 690, 481, 33))
+        self.BibleImportButtonBox.setOrientation(QtCore.Qt.Horizontal)
+        self.BibleImportButtonBox.setStandardButtons(QtGui.QDialogButtonBox.Cancel|QtGui.QDialogButtonBox.Save)
+        self.BibleImportButtonBox.setObjectName("BibleImportButtonBox")
+        self.ImportToolBox = QtGui.QToolBox(BibleImportDialog)
+        self.ImportToolBox.setGeometry(QtCore.QRect(10, 0, 471, 431))
+        self.ImportToolBox.setObjectName("ImportToolBox")
+        self.FileImportPage = QtGui.QWidget()
+        self.FileImportPage.setGeometry(QtCore.QRect(0, 0, 461, 361))
+        self.FileImportPage.setObjectName("FileImportPage")
+        self.OSISGroupBox = QtGui.QGroupBox(self.FileImportPage)
+        self.OSISGroupBox.setGeometry(QtCore.QRect(8, 65, 451, 81))
+        self.OSISGroupBox.setObjectName("OSISGroupBox")
+        self.gridLayout_2 = QtGui.QGridLayout(self.OSISGroupBox)
+        self.gridLayout_2.setMargin(8)
+        self.gridLayout_2.setSpacing(8)
+        self.gridLayout_2.setObjectName("gridLayout_2")
+        self.LocatioLabel = QtGui.QLabel(self.OSISGroupBox)
+        self.LocatioLabel.setObjectName("LocatioLabel")
+        self.gridLayout_2.addWidget(self.LocatioLabel, 0, 0, 1, 1)
+        self.OSISLocationEdit = QtGui.QLineEdit(self.OSISGroupBox)
+        self.OSISLocationEdit.setObjectName("OSISLocationEdit")
+        self.gridLayout_2.addWidget(self.OSISLocationEdit, 0, 1, 1, 1)
+        self.OsisFileButton = QtGui.QPushButton(self.OSISGroupBox)
+        icon = QtGui.QIcon()
+        icon.addPixmap(QtGui.QPixmap("../images/import_load.png"), QtGui.QIcon.Normal, QtGui.QIcon.Off)
+        self.OsisFileButton.setIcon(icon)
+        self.OsisFileButton.setObjectName("OsisFileButton")
+        self.gridLayout_2.addWidget(self.OsisFileButton, 0, 2, 1, 1)
+        self.CVSGroupBox = QtGui.QGroupBox(self.FileImportPage)
+        self.CVSGroupBox.setGeometry(QtCore.QRect(10, 170, 451, 191))
+        self.CVSGroupBox.setObjectName("CVSGroupBox")
+        self.gridLayout = QtGui.QGridLayout(self.CVSGroupBox)
+        self.gridLayout.setMargin(8)
+        self.gridLayout.setSpacing(8)
+        self.gridLayout.setObjectName("gridLayout")
+        self.BooksLocationLabel = QtGui.QLabel(self.CVSGroupBox)
+        self.BooksLocationLabel.setObjectName("BooksLocationLabel")
+        self.gridLayout.addWidget(self.BooksLocationLabel, 0, 0, 1, 1)
+        self.VerseLocationLabel = QtGui.QLabel(self.CVSGroupBox)
+        self.VerseLocationLabel.setObjectName("VerseLocationLabel")
+        self.gridLayout.addWidget(self.VerseLocationLabel, 4, 0, 1, 1)
+        self.VerseLocationEdit = QtGui.QLineEdit(self.CVSGroupBox)
+        self.VerseLocationEdit.setObjectName("VerseLocationEdit")
+        self.gridLayout.addWidget(self.VerseLocationEdit, 4, 1, 1, 1)
+        self.BooksLocationEdit = QtGui.QLineEdit(self.CVSGroupBox)
+        self.BooksLocationEdit.setObjectName("BooksLocationEdit")
+        self.gridLayout.addWidget(self.BooksLocationEdit, 0, 1, 1, 1)
+        self.BooksFileButton = QtGui.QPushButton(self.CVSGroupBox)
+        self.BooksFileButton.setIcon(icon)
+        self.BooksFileButton.setObjectName("BooksFileButton")
+        self.gridLayout.addWidget(self.BooksFileButton, 0, 2, 1, 1)
+        self.VersesFileButton = QtGui.QPushButton(self.CVSGroupBox)
+        self.VersesFileButton.setIcon(icon)
+        self.VersesFileButton.setObjectName("VersesFileButton")
+        self.gridLayout.addWidget(self.VersesFileButton, 4, 2, 1, 1)
+        self.BibleNameEdit = QtGui.QLineEdit(self.FileImportPage)
+        self.BibleNameEdit.setGeometry(QtCore.QRect(100, 20, 280, 28))
+        self.BibleNameEdit.setObjectName("BibleNameEdit")
+        self.BibleNameLabel = QtGui.QLabel(self.FileImportPage)
+        self.BibleNameLabel.setGeometry(QtCore.QRect(18, 20, 98, 22))
+        self.BibleNameLabel.setObjectName("BibleNameLabel")
+        self.ImportToolBox.addItem(self.FileImportPage, "")
+        self.WebBiblePage = QtGui.QWidget()
+        self.WebBiblePage.setGeometry(QtCore.QRect(0, 0, 461, 361))
+        self.WebBiblePage.setObjectName("WebBiblePage")
+        self.WebBibleLayout = QtGui.QVBoxLayout(self.WebBiblePage)
+        self.WebBibleLayout.setSpacing(8)
+        self.WebBibleLayout.setMargin(8)
+        self.WebBibleLayout.setObjectName("WebBibleLayout")
+        self.OptionsGroupBox = QtGui.QGroupBox(self.WebBiblePage)
+        self.OptionsGroupBox.setObjectName("OptionsGroupBox")
+        self.OptionsLayout = QtGui.QFormLayout(self.OptionsGroupBox)
+        self.OptionsLayout.setFieldGrowthPolicy(QtGui.QFormLayout.AllNonFixedFieldsGrow)
+        self.OptionsLayout.setLabelAlignment(QtCore.Qt.AlignLeading|QtCore.Qt.AlignLeft|QtCore.Qt.AlignVCenter)
+        self.OptionsLayout.setFormAlignment(QtCore.Qt.AlignLeading|QtCore.Qt.AlignLeft|QtCore.Qt.AlignVCenter)
+        self.OptionsLayout.setMargin(8)
+        self.OptionsLayout.setSpacing(8)
+        self.OptionsLayout.setObjectName("OptionsLayout")
+        self.LocationLabel = QtGui.QLabel(self.OptionsGroupBox)
+        self.LocationLabel.setObjectName("LocationLabel")
+        self.OptionsLayout.setWidget(0, QtGui.QFormLayout.LabelRole, self.LocationLabel)
+        self.LocationComboBox = QtGui.QComboBox(self.OptionsGroupBox)
+        self.LocationComboBox.setObjectName("LocationComboBox")
+        self.LocationComboBox.addItem(QtCore.QString())
+        self.LocationComboBox.setItemText(0, "")
+        self.LocationComboBox.addItem(QtCore.QString())
+        self.OptionsLayout.setWidget(0, QtGui.QFormLayout.FieldRole, self.LocationComboBox)
+        self.TypeLabel = QtGui.QLabel(self.OptionsGroupBox)
+        self.TypeLabel.setObjectName("TypeLabel")
+        self.OptionsLayout.setWidget(1, QtGui.QFormLayout.LabelRole, self.TypeLabel)
+        self.TypeComboBox = QtGui.QComboBox(self.OptionsGroupBox)
+        self.TypeComboBox.setObjectName("TypeComboBox")
+        self.TypeComboBox.addItem(QtCore.QString())
+        self.TypeComboBox.setItemText(0, "")
+        self.TypeComboBox.addItem(QtCore.QString())
+        self.OptionsLayout.setWidget(1, QtGui.QFormLayout.FieldRole, self.TypeComboBox)
+        self.BibleLabel = QtGui.QLabel(self.OptionsGroupBox)
+        self.BibleLabel.setObjectName("BibleLabel")
+        self.OptionsLayout.setWidget(2, QtGui.QFormLayout.LabelRole, self.BibleLabel)
+        self.BibleComboBox = QtGui.QComboBox(self.OptionsGroupBox)
+        self.BibleComboBox.setObjectName("BibleComboBox")
+        self.BibleComboBox.addItem(QtCore.QString())
+        self.BibleComboBox.setItemText(0, "")
+        self.BibleComboBox.addItem(QtCore.QString())
+        self.BibleComboBox.addItem(QtCore.QString())
+        self.OptionsLayout.setWidget(2, QtGui.QFormLayout.FieldRole, self.BibleComboBox)
+        self.WebBibleLayout.addWidget(self.OptionsGroupBox)
+        self.ProxyGroupBox = QtGui.QGroupBox(self.WebBiblePage)
+        self.ProxyGroupBox.setObjectName("ProxyGroupBox")
+        self.ProxySettingsLayout = QtGui.QFormLayout(self.ProxyGroupBox)
+        self.ProxySettingsLayout.setFieldGrowthPolicy(QtGui.QFormLayout.AllNonFixedFieldsGrow)
+        self.ProxySettingsLayout.setMargin(8)
+        self.ProxySettingsLayout.setSpacing(8)
+        self.ProxySettingsLayout.setObjectName("ProxySettingsLayout")
+        self.AddressLabel = QtGui.QLabel(self.ProxyGroupBox)
+        self.AddressLabel.setObjectName("AddressLabel")
+        self.ProxySettingsLayout.setWidget(0, QtGui.QFormLayout.LabelRole, self.AddressLabel)
+        self.AddressEdit = QtGui.QLineEdit(self.ProxyGroupBox)
+        self.AddressEdit.setObjectName("AddressEdit")
+        self.ProxySettingsLayout.setWidget(0, QtGui.QFormLayout.FieldRole, self.AddressEdit)
+        self.UsernameLabel = QtGui.QLabel(self.ProxyGroupBox)
+        self.UsernameLabel.setObjectName("UsernameLabel")
+        self.ProxySettingsLayout.setWidget(1, QtGui.QFormLayout.LabelRole, self.UsernameLabel)
+        self.UsernameEdit = QtGui.QLineEdit(self.ProxyGroupBox)
+        self.UsernameEdit.setObjectName("UsernameEdit")
+        self.ProxySettingsLayout.setWidget(1, QtGui.QFormLayout.FieldRole, self.UsernameEdit)
+        self.PasswordLabel = QtGui.QLabel(self.ProxyGroupBox)
+        self.PasswordLabel.setObjectName("PasswordLabel")
+        self.ProxySettingsLayout.setWidget(2, QtGui.QFormLayout.LabelRole, self.PasswordLabel)
+        self.PasswordEdit = QtGui.QLineEdit(self.ProxyGroupBox)
+        self.PasswordEdit.setObjectName("PasswordEdit")
+        self.ProxySettingsLayout.setWidget(2, QtGui.QFormLayout.FieldRole, self.PasswordEdit)
+        self.WebBibleLayout.addWidget(self.ProxyGroupBox)
+        self.ImportToolBox.addItem(self.WebBiblePage, "")
+        self.LicenceDetailsGroupBox = QtGui.QGroupBox(BibleImportDialog)
+        self.LicenceDetailsGroupBox.setGeometry(QtCore.QRect(10, 435, 471, 151))
+        self.LicenceDetailsGroupBox.setMinimumSize(QtCore.QSize(0, 123))
+        self.LicenceDetailsGroupBox.setObjectName("LicenceDetailsGroupBox")
+        self.formLayout = QtGui.QFormLayout(self.LicenceDetailsGroupBox)
+        self.formLayout.setMargin(8)
+        self.formLayout.setHorizontalSpacing(8)
+        self.formLayout.setObjectName("formLayout")
+        self.VersionNameLabel = QtGui.QLabel(self.LicenceDetailsGroupBox)
+        self.VersionNameLabel.setObjectName("VersionNameLabel")
+        self.formLayout.setWidget(0, QtGui.QFormLayout.LabelRole, self.VersionNameLabel)
+        self.VersionNameEdit = QtGui.QLineEdit(self.LicenceDetailsGroupBox)
+        self.VersionNameEdit.setObjectName("VersionNameEdit")
+        self.formLayout.setWidget(0, QtGui.QFormLayout.FieldRole, self.VersionNameEdit)
+        self.CopyrightLabel = QtGui.QLabel(self.LicenceDetailsGroupBox)
+        self.CopyrightLabel.setObjectName("CopyrightLabel")
+        self.formLayout.setWidget(1, QtGui.QFormLayout.LabelRole, self.CopyrightLabel)
+        self.CopyrightEdit = QtGui.QLineEdit(self.LicenceDetailsGroupBox)
+        self.CopyrightEdit.setObjectName("CopyrightEdit")
+        self.formLayout.setWidget(1, QtGui.QFormLayout.FieldRole, self.CopyrightEdit)
+        self.PermisionLabel = QtGui.QLabel(self.LicenceDetailsGroupBox)
+        self.PermisionLabel.setObjectName("PermisionLabel")
+        self.formLayout.setWidget(2, QtGui.QFormLayout.LabelRole, self.PermisionLabel)
+        self.PermisionEdit = QtGui.QLineEdit(self.LicenceDetailsGroupBox)
+        self.PermisionEdit.setObjectName("PermisionEdit")
+        self.formLayout.setWidget(2, QtGui.QFormLayout.FieldRole, self.PermisionEdit)
+        self.MessageLabel = QtGui.QLabel(BibleImportDialog)
+        self.MessageLabel.setGeometry(QtCore.QRect(20, 670, 451, 17))
+        self.MessageLabel.setObjectName("MessageLabel")
+        self.ProgressGroupBox = QtGui.QGroupBox(BibleImportDialog)
+        self.ProgressGroupBox.setGeometry(QtCore.QRect(10, 600, 471, 70))
+        self.ProgressGroupBox.setObjectName("ProgressGroupBox")
+        self.gridLayout_3 = QtGui.QGridLayout(self.ProgressGroupBox)
+        self.gridLayout_3.setObjectName("gridLayout_3")
+        self.ProgressBar = QtGui.QProgressBar(self.ProgressGroupBox)
+        self.ProgressBar.setProperty("value", QtCore.QVariant(0))
+        self.ProgressBar.setInvertedAppearance(False)
+        self.ProgressBar.setObjectName("ProgressBar")
+        self.gridLayout_3.addWidget(self.ProgressBar, 0, 0, 1, 1)
+
+        self.retranslateUi(BibleImportDialog)
+        self.ImportToolBox.setCurrentIndex(0)
+        QtCore.QMetaObject.connectSlotsByName(BibleImportDialog)
+        BibleImportDialog.setTabOrder(self.BibleNameEdit, self.OSISLocationEdit)
+        BibleImportDialog.setTabOrder(self.OSISLocationEdit, self.OsisFileButton)
+        BibleImportDialog.setTabOrder(self.OsisFileButton, self.BooksLocationEdit)
+        BibleImportDialog.setTabOrder(self.BooksLocationEdit, self.BooksFileButton)
+        BibleImportDialog.setTabOrder(self.BooksFileButton, self.VerseLocationEdit)
+        BibleImportDialog.setTabOrder(self.VerseLocationEdit, self.VersesFileButton)
+        BibleImportDialog.setTabOrder(self.VersesFileButton, self.LocationComboBox)
+        BibleImportDialog.setTabOrder(self.LocationComboBox, self.TypeComboBox)
+        BibleImportDialog.setTabOrder(self.TypeComboBox, self.BibleComboBox)
+        BibleImportDialog.setTabOrder(self.BibleComboBox, self.AddressEdit)
+        BibleImportDialog.setTabOrder(self.AddressEdit, self.UsernameEdit)
+        BibleImportDialog.setTabOrder(self.UsernameEdit, self.PasswordEdit)
+        BibleImportDialog.setTabOrder(self.PasswordEdit, self.VersionNameEdit)
+        BibleImportDialog.setTabOrder(self.VersionNameEdit, self.CopyrightEdit)
+        BibleImportDialog.setTabOrder(self.CopyrightEdit, self.PermisionEdit)
+        BibleImportDialog.setTabOrder(self.PermisionEdit, self.BibleImportButtonBox)
+
+    def retranslateUi(self, BibleImportDialog):
+        BibleImportDialog.setWindowTitle(QtGui.QApplication.translate("BibleImportDialog", "Bible Registration", None, QtGui.QApplication.UnicodeUTF8))
+        self.OSISGroupBox.setTitle(QtGui.QApplication.translate("BibleImportDialog", "OSIS Bible", None, QtGui.QApplication.UnicodeUTF8))
+        self.LocatioLabel.setText(QtGui.QApplication.translate("BibleImportDialog", "File Location:", None, QtGui.QApplication.UnicodeUTF8))
+        self.CVSGroupBox.setTitle(QtGui.QApplication.translate("BibleImportDialog", "CVS Bible", None, QtGui.QApplication.UnicodeUTF8))
+        self.BooksLocationLabel.setText(QtGui.QApplication.translate("BibleImportDialog", "Books Location:", None, QtGui.QApplication.UnicodeUTF8))
+        self.VerseLocationLabel.setText(QtGui.QApplication.translate("BibleImportDialog", "Verse Location:", None, QtGui.QApplication.UnicodeUTF8))
+        self.BibleNameLabel.setText(QtGui.QApplication.translate("BibleImportDialog", "Bible Name:", None, QtGui.QApplication.UnicodeUTF8))
+        self.ImportToolBox.setItemText(self.ImportToolBox.indexOf(self.FileImportPage), QtGui.QApplication.translate("BibleImportDialog", "File Import Page", None, QtGui.QApplication.UnicodeUTF8))
+        self.OptionsGroupBox.setTitle(QtGui.QApplication.translate("BibleImportDialog", "Download Options", None, QtGui.QApplication.UnicodeUTF8))
+        self.LocationLabel.setText(QtGui.QApplication.translate("BibleImportDialog", "Location:", None, QtGui.QApplication.UnicodeUTF8))
+        self.LocationComboBox.setItemText(1, QtGui.QApplication.translate("BibleImportDialog", "CrossWire", None, QtGui.QApplication.UnicodeUTF8))
+        self.TypeLabel.setText(QtGui.QApplication.translate("BibleImportDialog", "Type:", None, QtGui.QApplication.UnicodeUTF8))
+        self.TypeComboBox.setItemText(1, QtGui.QApplication.translate("BibleImportDialog", "Download As Needed", None, QtGui.QApplication.UnicodeUTF8))
+        self.BibleLabel.setText(QtGui.QApplication.translate("BibleImportDialog", "Bible:", None, QtGui.QApplication.UnicodeUTF8))
+        self.BibleComboBox.setItemText(1, QtGui.QApplication.translate("BibleImportDialog", "NIV", None, QtGui.QApplication.UnicodeUTF8))
+        self.BibleComboBox.setItemText(2, QtGui.QApplication.translate("BibleImportDialog", "KJV", None, QtGui.QApplication.UnicodeUTF8))
+        self.ProxyGroupBox.setTitle(QtGui.QApplication.translate("BibleImportDialog", "Proxy Settings (Optional)", None, QtGui.QApplication.UnicodeUTF8))
+        self.AddressLabel.setText(QtGui.QApplication.translate("BibleImportDialog", "Proxy Address:", None, QtGui.QApplication.UnicodeUTF8))
+        self.UsernameLabel.setText(QtGui.QApplication.translate("BibleImportDialog", "Username:", None, QtGui.QApplication.UnicodeUTF8))
+        self.PasswordLabel.setText(QtGui.QApplication.translate("BibleImportDialog", "Password:", None, QtGui.QApplication.UnicodeUTF8))
+        self.ImportToolBox.setItemText(self.ImportToolBox.indexOf(self.WebBiblePage), QtGui.QApplication.translate("BibleImportDialog", "Web Bible Import page", None, QtGui.QApplication.UnicodeUTF8))
+        self.LicenceDetailsGroupBox.setTitle(QtGui.QApplication.translate("BibleImportDialog", "Licence Details", None, QtGui.QApplication.UnicodeUTF8))
+        self.VersionNameLabel.setText(QtGui.QApplication.translate("BibleImportDialog", "Version Name:", None, QtGui.QApplication.UnicodeUTF8))
+        self.CopyrightLabel.setText(QtGui.QApplication.translate("BibleImportDialog", "Copyright:", None, QtGui.QApplication.UnicodeUTF8))
+        self.PermisionLabel.setText(QtGui.QApplication.translate("BibleImportDialog", "Permission:", None, QtGui.QApplication.UnicodeUTF8))
+        self.ProgressGroupBox.setTitle(QtGui.QApplication.translate("BibleImportDialog", "Import Progress", None, QtGui.QApplication.UnicodeUTF8))
+        self.ProgressBar.setFormat(QtGui.QApplication.translate("BibleImportDialog", "%p", None, QtGui.QApplication.UnicodeUTF8))
+
diff --git a/resources/forms/editsongdialog.ui b/resources/forms/editsongdialog.ui
new file mode 100644
index 000000000..b13adb5dd
--- /dev/null
+++ b/resources/forms/editsongdialog.ui
@@ -0,0 +1,506 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<ui version="4.0">
+ <class>EditSongDialog</class>
+ <widget class="QWidget" name="EditSongDialog">
+  <property name="geometry">
+   <rect>
+    <x>0</x>
+    <y>0</y>
+    <width>734</width>
+    <height>602</height>
+   </rect>
+  </property>
+  <property name="windowTitle">
+   <string>Song Editor</string>
+  </property>
+  <property name="windowIcon">
+   <iconset resource="../images/openlp-2.qrc">
+    <normaloff>:/icon/openlp.org-icon-32.bmp</normaloff>:/icon/openlp.org-icon-32.bmp</iconset>
+  </property>
+  <widget class="QWidget" name="TopWidget" native="true">
+   <property name="geometry">
+    <rect>
+     <x>8</x>
+     <y>8</y>
+     <width>711</width>
+     <height>461</height>
+    </rect>
+   </property>
+   <widget class="QWidget" name="TextWidget" native="true">
+    <property name="geometry">
+     <rect>
+      <x>0</x>
+      <y>0</y>
+      <width>321</width>
+      <height>461</height>
+     </rect>
+    </property>
+    <layout class="QGridLayout" name="gridLayout">
+     <item row="0" column="0">
+      <widget class="QLabel" name="TitleLabel">
+       <property name="text">
+        <string>Title:</string>
+       </property>
+      </widget>
+     </item>
+     <item row="1" column="0">
+      <widget class="QLineEdit" name="TitleEditItem">
+       <property name="sizePolicy">
+        <sizepolicy hsizetype="Expanding" vsizetype="Fixed">
+         <horstretch>0</horstretch>
+         <verstretch>0</verstretch>
+        </sizepolicy>
+       </property>
+      </widget>
+     </item>
+     <item row="2" column="0">
+      <widget class="QLabel" name="AlternativeTitleLabel">
+       <property name="text">
+        <string>Alternative Title:</string>
+       </property>
+      </widget>
+     </item>
+     <item row="3" column="0">
+      <widget class="QLineEdit" name="AlternativeEdit"/>
+     </item>
+     <item row="4" column="0">
+      <widget class="QLabel" name="LyricsLabel">
+       <property name="text">
+        <string>Lyrics:</string>
+       </property>
+      </widget>
+     </item>
+     <item row="5" column="0">
+      <widget class="QTextEdit" name="LyricsTextEdit">
+       <property name="lineWrapMode">
+        <enum>QTextEdit::NoWrap</enum>
+       </property>
+       <property name="acceptRichText">
+        <bool>false</bool>
+       </property>
+      </widget>
+     </item>
+    </layout>
+   </widget>
+   <widget class="QWidget" name="AuthorWidget" native="true">
+    <property name="geometry">
+     <rect>
+      <x>329</x>
+      <y>0</y>
+      <width>381</width>
+      <height>431</height>
+     </rect>
+    </property>
+    <widget class="QLabel" name="AuthorsLabel">
+     <property name="geometry">
+      <rect>
+       <x>0</x>
+       <y>10</y>
+       <width>45</width>
+       <height>17</height>
+      </rect>
+     </property>
+     <property name="text">
+      <string>Authors:</string>
+     </property>
+    </widget>
+    <widget class="QWidget" name="AuthorSelectWidget" native="true">
+     <property name="geometry">
+      <rect>
+       <x>0</x>
+       <y>25</y>
+       <width>361</width>
+       <height>27</height>
+      </rect>
+     </property>
+     <layout class="QHBoxLayout" name="AuthorSelectWidgetLayout">
+      <property name="spacing">
+       <number>8</number>
+      </property>
+      <property name="margin">
+       <number>0</number>
+      </property>
+      <item>
+       <widget class="QComboBox" name="AuthorsSelectionComboItem">
+        <property name="sizePolicy">
+         <sizepolicy hsizetype="Preferred" vsizetype="Fixed">
+          <horstretch>0</horstretch>
+          <verstretch>0</verstretch>
+         </sizepolicy>
+        </property>
+        <property name="editable">
+         <bool>false</bool>
+        </property>
+        <property name="insertPolicy">
+         <enum>QComboBox::InsertAlphabetically</enum>
+        </property>
+        <property name="sizeAdjustPolicy">
+         <enum>QComboBox::AdjustToMinimumContentsLength</enum>
+        </property>
+        <property name="minimumContentsLength">
+         <number>8</number>
+        </property>
+       </widget>
+      </item>
+      <item>
+       <widget class="QPushButton" name="AuthorAddtoSongItem">
+        <property name="maximumSize">
+         <size>
+          <width>110</width>
+          <height>16777215</height>
+         </size>
+        </property>
+        <property name="text">
+         <string>Add to Song</string>
+        </property>
+       </widget>
+      </item>
+      <item>
+       <widget class="QPushButton" name="AddAuthorsButton">
+        <property name="text">
+         <string>Add Authors</string>
+        </property>
+       </widget>
+      </item>
+     </layout>
+    </widget>
+    <widget class="QWidget" name="SongBookGroup" native="true">
+     <property name="geometry">
+      <rect>
+       <x>0</x>
+       <y>85</y>
+       <width>351</width>
+       <height>27</height>
+      </rect>
+     </property>
+     <widget class="QWidget" name="layoutWidget">
+      <property name="geometry">
+       <rect>
+        <x>0</x>
+        <y>0</y>
+        <width>351</width>
+        <height>29</height>
+       </rect>
+      </property>
+      <layout class="QHBoxLayout" name="SongBookLayout">
+       <item>
+        <widget class="QComboBox" name="SongbookCombo"/>
+       </item>
+       <item>
+        <widget class="QPushButton" name="AddSongBookButton">
+         <property name="text">
+          <string>Add Song Book</string>
+         </property>
+        </widget>
+       </item>
+      </layout>
+     </widget>
+    </widget>
+    <widget class="QLabel" name="SelectedAuthorsLabel">
+     <property name="geometry">
+      <rect>
+       <x>10</x>
+       <y>160</y>
+       <width>96</width>
+       <height>17</height>
+      </rect>
+     </property>
+     <property name="text">
+      <string>Selected Authors:</string>
+     </property>
+    </widget>
+    <widget class="QWidget" name="CopyrightWidget" native="true">
+     <property name="geometry">
+      <rect>
+       <x>0</x>
+       <y>368</y>
+       <width>147</width>
+       <height>27</height>
+      </rect>
+     </property>
+     <layout class="QHBoxLayout" name="CopyrightWidgetLayout">
+      <property name="spacing">
+       <number>8</number>
+      </property>
+      <property name="margin">
+       <number>0</number>
+      </property>
+     </layout>
+    </widget>
+    <widget class="QLabel" name="SongBookLabel">
+     <property name="geometry">
+      <rect>
+       <x>0</x>
+       <y>50</y>
+       <width>57</width>
+       <height>27</height>
+      </rect>
+     </property>
+     <property name="text">
+      <string>SongBook</string>
+     </property>
+    </widget>
+    <widget class="QLabel" name="Topiclabel">
+     <property name="geometry">
+      <rect>
+       <x>0</x>
+       <y>110</y>
+       <width>242</width>
+       <height>27</height>
+      </rect>
+     </property>
+     <property name="text">
+      <string>SongTopic</string>
+     </property>
+    </widget>
+    <widget class="QLabel" name="SelectedTopicsLabel">
+     <property name="geometry">
+      <rect>
+       <x>180</x>
+       <y>160</y>
+       <width>96</width>
+       <height>17</height>
+      </rect>
+     </property>
+     <property name="text">
+      <string>Selected Topics:</string>
+     </property>
+    </widget>
+    <widget class="QWidget" name="layoutWidget">
+     <property name="geometry">
+      <rect>
+       <x>10</x>
+       <y>180</y>
+       <width>341</width>
+       <height>191</height>
+      </rect>
+     </property>
+     <layout class="QHBoxLayout" name="SelectedAuthorsGroup">
+      <item>
+       <widget class="QTableWidget" name="AuthorsListView">
+        <property name="alternatingRowColors">
+         <bool>true</bool>
+        </property>
+       </widget>
+      </item>
+      <item>
+       <widget class="QTableWidget" name="ToticsListView">
+        <property name="alternatingRowColors">
+         <bool>true</bool>
+        </property>
+       </widget>
+      </item>
+     </layout>
+    </widget>
+    <widget class="QWidget" name="layoutWidget">
+     <property name="geometry">
+      <rect>
+       <x>3</x>
+       <y>130</y>
+       <width>341</width>
+       <height>29</height>
+      </rect>
+     </property>
+     <layout class="QHBoxLayout" name="SongTopicLayout">
+      <item>
+       <widget class="QComboBox" name="comboBox"/>
+      </item>
+      <item>
+       <widget class="QPushButton" name="AddTopicsToSongButton">
+        <property name="text">
+         <string>Add to Song</string>
+        </property>
+       </widget>
+      </item>
+      <item>
+       <widget class="QPushButton" name="AddTopicButton">
+        <property name="text">
+         <string>Add Topic</string>
+        </property>
+       </widget>
+      </item>
+     </layout>
+    </widget>
+    <widget class="QWidget" name="layoutWidget">
+     <property name="geometry">
+      <rect>
+       <x>10</x>
+       <y>380</y>
+       <width>341</width>
+       <height>29</height>
+      </rect>
+     </property>
+     <layout class="QHBoxLayout" name="RemoveAuthorsLayout">
+      <item>
+       <widget class="QPushButton" name="AuthorRemoveItem">
+        <property name="text">
+         <string>Remove Selected Author(s)</string>
+        </property>
+       </widget>
+      </item>
+      <item>
+       <widget class="QPushButton" name="pushButton">
+        <property name="text">
+         <string>Remove Selected Topics</string>
+        </property>
+       </widget>
+      </item>
+     </layout>
+    </widget>
+   </widget>
+  </widget>
+  <widget class="QWidget" name="ThemeWidget" native="true">
+   <property name="geometry">
+    <rect>
+     <x>10</x>
+     <y>520</y>
+     <width>641</width>
+     <height>45</height>
+    </rect>
+   </property>
+   <layout class="QHBoxLayout" name="horizontalLayout_5">
+    <item>
+     <widget class="QLabel" name="ThemeLabel">
+      <property name="maximumSize">
+       <size>
+        <width>70</width>
+        <height>16777215</height>
+       </size>
+      </property>
+      <property name="text">
+       <string>Theme</string>
+      </property>
+     </widget>
+    </item>
+    <item>
+     <widget class="QComboBox" name="ThemeSelectionComboItem"/>
+    </item>
+    <item>
+     <widget class="QPushButton" name="ThemeAddItem">
+      <property name="maximumSize">
+       <size>
+        <width>110</width>
+        <height>16777215</height>
+       </size>
+      </property>
+      <property name="text">
+       <string>Add a Theme</string>
+      </property>
+     </widget>
+    </item>
+   </layout>
+  </widget>
+  <widget class="QDialogButtonBox" name="ButtonBox">
+   <property name="geometry">
+    <rect>
+     <x>500</x>
+     <y>570</y>
+     <width>156</width>
+     <height>27</height>
+    </rect>
+   </property>
+   <property name="standardButtons">
+    <set>QDialogButtonBox::Cancel|QDialogButtonBox::Save</set>
+   </property>
+  </widget>
+  <widget class="QWidget" name="layoutWidget">
+   <property name="geometry">
+    <rect>
+     <x>20</x>
+     <y>490</y>
+     <width>311</width>
+     <height>25</height>
+    </rect>
+   </property>
+   <layout class="QHBoxLayout" name="VerseOrderLayout">
+    <item>
+     <widget class="QLabel" name="VerseOrderLabel">
+      <property name="text">
+       <string>Verse Order:</string>
+      </property>
+     </widget>
+    </item>
+    <item>
+     <widget class="QLineEdit" name="VerseOrderEdit"/>
+    </item>
+   </layout>
+  </widget>
+  <widget class="QWidget" name="layoutWidget">
+   <property name="geometry">
+    <rect>
+     <x>341</x>
+     <y>461</y>
+     <width>371</width>
+     <height>52</height>
+    </rect>
+   </property>
+   <layout class="QGridLayout" name="CopyrightLayout">
+    <item row="0" column="0">
+     <widget class="QLabel" name="CopyrightInfoLabel">
+      <property name="text">
+       <string>Copyright Info:</string>
+      </property>
+     </widget>
+    </item>
+    <item row="1" column="0">
+     <widget class="QLineEdit" name="CopyrightEditItem"/>
+    </item>
+    <item row="1" column="1">
+     <widget class="QPushButton" name="CopyrightInsertItem">
+      <property name="maximumSize">
+       <size>
+        <width>29</width>
+        <height>16777215</height>
+       </size>
+      </property>
+      <property name="text">
+       <string>©</string>
+      </property>
+     </widget>
+    </item>
+   </layout>
+  </widget>
+  <zorder>layoutWidget</zorder>
+  <zorder>TopWidget</zorder>
+  <zorder>ThemeWidget</zorder>
+  <zorder>ButtonBox</zorder>
+  <zorder>layoutWidget</zorder>
+ </widget>
+ <resources>
+  <include location="../images/openlp-2.qrc"/>
+ </resources>
+ <connections>
+  <connection>
+   <sender>ButtonBox</sender>
+   <signal>rejected()</signal>
+   <receiver>EditSongDialog</receiver>
+   <slot>close()</slot>
+   <hints>
+    <hint type="sourcelabel">
+     <x>607</x>
+     <y>456</y>
+    </hint>
+    <hint type="destinationlabel">
+     <x>578</x>
+     <y>-15</y>
+    </hint>
+   </hints>
+  </connection>
+  <connection>
+   <sender>ButtonBox</sender>
+   <signal>accepted()</signal>
+   <receiver>EditSongDialog</receiver>
+   <slot>close()</slot>
+   <hints>
+    <hint type="sourcelabel">
+     <x>549</x>
+     <y>461</y>
+    </hint>
+    <hint type="destinationlabel">
+     <x>91</x>
+     <y>-50</y>
+    </hint>
+   </hints>
+  </connection>
+ </connections>
+</ui>
diff --git a/resources/forms/editsongform.ui b/resources/forms/editsongform.ui
deleted file mode 100644
index 89ee617dc..000000000
--- a/resources/forms/editsongform.ui
+++ /dev/null
@@ -1,347 +0,0 @@
-<ui version="4.0" >
- <class>EditSongForm</class>
- <widget class="QWidget" name="EditSongForm" >
-  <property name="geometry" >
-   <rect>
-    <x>0</x>
-    <y>0</y>
-    <width>665</width>
-    <height>481</height>
-   </rect>
-  </property>
-  <property name="windowTitle" >
-   <string>Song Editor</string>
-  </property>
-  <property name="windowIcon" >
-   <iconset resource="../images/openlp-2.qrc" >
-    <normaloff>:/icon/openlp.org-icon-32.bmp</normaloff>:/icon/openlp.org-icon-32.bmp</iconset>
-  </property>
-  <layout class="QVBoxLayout" name="EditSongFormLayout" >
-   <property name="spacing" >
-    <number>8</number>
-   </property>
-   <property name="margin" >
-    <number>8</number>
-   </property>
-   <item>
-    <widget class="QWidget" native="1" name="TopWidget" >
-     <layout class="QHBoxLayout" name="TopWidgetLayout" >
-      <property name="spacing" >
-       <number>8</number>
-      </property>
-      <property name="margin" >
-       <number>0</number>
-      </property>
-      <item>
-       <widget class="QWidget" native="1" name="TextWidget" >
-        <layout class="QVBoxLayout" name="TextWidgetLayout" >
-         <property name="spacing" >
-          <number>8</number>
-         </property>
-         <property name="margin" >
-          <number>0</number>
-         </property>
-         <item>
-          <widget class="QLabel" name="TitleLabel" >
-           <property name="text" >
-            <string>Title:</string>
-           </property>
-          </widget>
-         </item>
-         <item>
-          <widget class="QLineEdit" name="TitleEditItem" >
-           <property name="sizePolicy" >
-            <sizepolicy vsizetype="Fixed" hsizetype="Expanding" >
-             <horstretch>0</horstretch>
-             <verstretch>0</verstretch>
-            </sizepolicy>
-           </property>
-          </widget>
-         </item>
-         <item>
-          <widget class="QLabel" name="LyricsLabel" >
-           <property name="text" >
-            <string>Lyrics:</string>
-           </property>
-          </widget>
-         </item>
-         <item>
-          <widget class="QTextEdit" name="LyricsTextEdit" >
-           <property name="lineWrapMode" >
-            <enum>QTextEdit::NoWrap</enum>
-           </property>
-           <property name="acceptRichText" >
-            <bool>false</bool>
-           </property>
-          </widget>
-         </item>
-        </layout>
-       </widget>
-      </item>
-      <item>
-       <widget class="QWidget" native="1" name="AuthorWidget" >
-        <layout class="QVBoxLayout" name="AuthorWidgetLayout" >
-         <property name="spacing" >
-          <number>8</number>
-         </property>
-         <property name="margin" >
-          <number>0</number>
-         </property>
-         <item>
-          <widget class="QLabel" name="AuthorsLabel" >
-           <property name="text" >
-            <string>Authors:</string>
-           </property>
-          </widget>
-         </item>
-         <item>
-          <widget class="QWidget" native="1" name="AuthorSelectWidget" >
-           <layout class="QHBoxLayout" name="AuthorSelectWidgetLayout" >
-            <property name="spacing" >
-             <number>8</number>
-            </property>
-            <property name="margin" >
-             <number>0</number>
-            </property>
-            <item>
-             <widget class="QComboBox" name="AuthorsSelectionComboItem" >
-              <property name="sizePolicy" >
-               <sizepolicy vsizetype="Fixed" hsizetype="Preferred" >
-                <horstretch>0</horstretch>
-                <verstretch>0</verstretch>
-               </sizepolicy>
-              </property>
-              <property name="editable" >
-               <bool>false</bool>
-              </property>
-              <property name="insertPolicy" >
-               <enum>QComboBox::InsertAlphabetically</enum>
-              </property>
-              <property name="sizeAdjustPolicy" >
-               <enum>QComboBox::AdjustToMinimumContentsLength</enum>
-              </property>
-              <property name="minimumContentsLength" >
-               <number>8</number>
-              </property>
-             </widget>
-            </item>
-            <item>
-             <widget class="QPushButton" name="AuthorAddtoSongItem" >
-              <property name="maximumSize" >
-               <size>
-                <width>110</width>
-                <height>16777215</height>
-               </size>
-              </property>
-              <property name="text" >
-               <string>Add to Song</string>
-              </property>
-             </widget>
-            </item>
-           </layout>
-          </widget>
-         </item>
-         <item>
-          <widget class="QWidget" native="1" name="AuthorManagementWidget" >
-           <layout class="QHBoxLayout" name="AuthorManagementWidgetLayout" >
-            <property name="spacing" >
-             <number>8</number>
-            </property>
-            <property name="margin" >
-             <number>0</number>
-            </property>
-            <item>
-             <widget class="QPushButton" name="NewAuthorButton" >
-              <property name="text" >
-               <string>Add a New Author</string>
-              </property>
-             </widget>
-            </item>
-            <item>
-             <widget class="QPushButton" name="AuthorDeleteItem" >
-              <property name="text" >
-               <string>Delete Author</string>
-              </property>
-             </widget>
-            </item>
-           </layout>
-          </widget>
-         </item>
-         <item>
-          <widget class="QLabel" name="SelectedAuthorsLabel" >
-           <property name="text" >
-            <string>Selected Authors:</string>
-           </property>
-          </widget>
-         </item>
-         <item>
-          <widget class="QListView" name="AuthorsListItem" >
-           <property name="editTriggers" >
-            <set>QAbstractItemView::NoEditTriggers</set>
-           </property>
-           <property name="selectionRectVisible" >
-            <bool>true</bool>
-           </property>
-          </widget>
-         </item>
-         <item>
-          <widget class="QWidget" native="1" name="RemoveAuthorWidget" >
-           <layout class="QHBoxLayout" name="RemoveAuthorWidgetLayout" >
-            <property name="spacing" >
-             <number>8</number>
-            </property>
-            <property name="margin" >
-             <number>0</number>
-            </property>
-            <item>
-             <spacer name="RemoveAuthorHSpacer" >
-              <property name="orientation" >
-               <enum>Qt::Horizontal</enum>
-              </property>
-              <property name="sizeHint" stdset="0" >
-               <size>
-                <width>122</width>
-                <height>20</height>
-               </size>
-              </property>
-             </spacer>
-            </item>
-            <item>
-             <widget class="QPushButton" name="AuthorRemoveItem" >
-              <property name="text" >
-               <string>Remove Selected Author(s)</string>
-              </property>
-             </widget>
-            </item>
-           </layout>
-          </widget>
-         </item>
-         <item>
-          <widget class="QLabel" name="CopyrightInfoLabel" >
-           <property name="text" >
-            <string>Copyright Info:</string>
-           </property>
-          </widget>
-         </item>
-         <item>
-          <widget class="QWidget" native="1" name="CopyrightWidget" >
-           <layout class="QHBoxLayout" name="CopyrightWidgetLayout" >
-            <property name="spacing" >
-             <number>8</number>
-            </property>
-            <property name="margin" >
-             <number>0</number>
-            </property>
-            <item>
-             <widget class="QLineEdit" name="CopyrightEditItem" />
-            </item>
-            <item>
-             <widget class="QPushButton" name="CopyrightInsertItem" >
-              <property name="maximumSize" >
-               <size>
-                <width>29</width>
-                <height>16777215</height>
-               </size>
-              </property>
-              <property name="text" >
-               <string>©</string>
-              </property>
-             </widget>
-            </item>
-           </layout>
-          </widget>
-         </item>
-        </layout>
-       </widget>
-      </item>
-     </layout>
-    </widget>
-   </item>
-   <item>
-    <widget class="QWidget" native="1" name="ThemeWidget" >
-     <layout class="QHBoxLayout" name="ThemeWidgetLayout" >
-      <property name="spacing" >
-       <number>8</number>
-      </property>
-      <property name="margin" >
-       <number>0</number>
-      </property>
-      <item>
-       <widget class="QLabel" name="ThemeLabel" >
-        <property name="maximumSize" >
-         <size>
-          <width>70</width>
-          <height>16777215</height>
-         </size>
-        </property>
-        <property name="text" >
-         <string>Theme</string>
-        </property>
-       </widget>
-      </item>
-      <item>
-       <widget class="QComboBox" name="ThemeSelectionComboItem" />
-      </item>
-      <item>
-       <widget class="QPushButton" name="ThemeAddItem" >
-        <property name="maximumSize" >
-         <size>
-          <width>110</width>
-          <height>16777215</height>
-         </size>
-        </property>
-        <property name="text" >
-         <string>Add a Theme</string>
-        </property>
-       </widget>
-      </item>
-     </layout>
-    </widget>
-   </item>
-   <item>
-    <widget class="QDialogButtonBox" name="ButtonBox" >
-     <property name="standardButtons" >
-      <set>QDialogButtonBox::Cancel|QDialogButtonBox::Save</set>
-     </property>
-    </widget>
-   </item>
-  </layout>
- </widget>
- <resources>
-  <include location="../images/openlp-2.qrc" />
- </resources>
- <connections>
-  <connection>
-   <sender>ButtonBox</sender>
-   <signal>rejected()</signal>
-   <receiver>EditSongForm</receiver>
-   <slot>close()</slot>
-   <hints>
-    <hint type="sourcelabel" >
-     <x>607</x>
-     <y>456</y>
-    </hint>
-    <hint type="destinationlabel" >
-     <x>578</x>
-     <y>-15</y>
-    </hint>
-   </hints>
-  </connection>
-  <connection>
-   <sender>ButtonBox</sender>
-   <signal>accepted()</signal>
-   <receiver>EditSongForm</receiver>
-   <slot>close()</slot>
-   <hints>
-    <hint type="sourcelabel" >
-     <x>549</x>
-     <y>461</y>
-    </hint>
-    <hint type="destinationlabel" >
-     <x>91</x>
-     <y>-50</y>
-    </hint>
-   </hints>
-  </connection>
- </connections>
-</ui>
diff --git a/resources/forms/songbookdialog.ui b/resources/forms/songbookdialog.ui
new file mode 100644
index 000000000..4aa4a25f4
--- /dev/null
+++ b/resources/forms/songbookdialog.ui
@@ -0,0 +1,146 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<ui version="4.0">
+ <class>SongBookDialog</class>
+ <widget class="QDialog" name="SongBookDialog">
+  <property name="geometry">
+   <rect>
+    <x>0</x>
+    <y>0</y>
+    <width>387</width>
+    <height>500</height>
+   </rect>
+  </property>
+  <property name="windowTitle">
+   <string>Book Song Maintenance</string>
+  </property>
+  <layout class="QGridLayout" name="gridLayout_2">
+   <item row="0" column="0" colspan="2">
+    <widget class="QTableWidget" name="BookSongListView"/>
+   </item>
+   <item row="1" column="0" colspan="2">
+    <widget class="QGroupBox" name="SongBookGroup">
+     <property name="title">
+      <string>Song Book</string>
+     </property>
+     <layout class="QGridLayout" name="gridLayout">
+      <item row="0" column="0">
+       <widget class="QLabel" name="NameLabel">
+        <property name="text">
+         <string>Name:</string>
+        </property>
+       </widget>
+      </item>
+      <item row="0" column="1" colspan="3">
+       <widget class="QLineEdit" name="NameEdit"/>
+      </item>
+      <item row="1" column="0">
+       <widget class="QLabel" name="PublisherLabel">
+        <property name="text">
+         <string>Publisher:</string>
+        </property>
+       </widget>
+      </item>
+      <item row="1" column="1" colspan="3">
+       <widget class="QLineEdit" name="PublisherEdit"/>
+      </item>
+      <item row="2" column="0" colspan="2">
+       <spacer name="horizontalSpacer">
+        <property name="orientation">
+         <enum>Qt::Horizontal</enum>
+        </property>
+        <property name="sizeHint" stdset="0">
+         <size>
+          <width>198</width>
+          <height>20</height>
+         </size>
+        </property>
+       </spacer>
+      </item>
+      <item row="2" column="2">
+       <widget class="QPushButton" name="DeleteButton">
+        <property name="toolTip">
+         <string>Delete Author</string>
+        </property>
+        <property name="text">
+         <string/>
+        </property>
+        <property name="icon">
+         <iconset resource="../images/openlp-2.qrc">
+          <normaloff>:/services/service_delete.png</normaloff>:/services/service_delete.png</iconset>
+        </property>
+       </widget>
+      </item>
+      <item row="2" column="3">
+       <widget class="QPushButton" name="AddUpdateButton">
+        <property name="toolTip">
+         <string>Add Update Author</string>
+        </property>
+        <property name="text">
+         <string/>
+        </property>
+        <property name="icon">
+         <iconset resource="../images/openlp-2.qrc">
+          <normaloff>:/system/system_settings.png</normaloff>:/system/system_settings.png</iconset>
+        </property>
+       </widget>
+      </item>
+     </layout>
+    </widget>
+   </item>
+   <item row="2" column="0">
+    <widget class="QLabel" name="MessageLabel">
+     <property name="text">
+      <string/>
+     </property>
+    </widget>
+   </item>
+   <item row="2" column="1">
+    <widget class="QDialogButtonBox" name="ButtonBox">
+     <property name="orientation">
+      <enum>Qt::Horizontal</enum>
+     </property>
+     <property name="standardButtons">
+      <set>QDialogButtonBox::Ok</set>
+     </property>
+    </widget>
+   </item>
+  </layout>
+ </widget>
+ <resources>
+  <include location="../images/openlp-2.qrc"/>
+ </resources>
+ <connections>
+  <connection>
+   <sender>ButtonBox</sender>
+   <signal>accepted()</signal>
+   <receiver>SongBookDialog</receiver>
+   <slot>accept()</slot>
+   <hints>
+    <hint type="sourcelabel">
+     <x>248</x>
+     <y>254</y>
+    </hint>
+    <hint type="destinationlabel">
+     <x>157</x>
+     <y>274</y>
+    </hint>
+   </hints>
+  </connection>
+  <connection>
+   <sender>ButtonBox</sender>
+   <signal>rejected()</signal>
+   <receiver>SongBookDialog</receiver>
+   <slot>reject()</slot>
+   <hints>
+    <hint type="sourcelabel">
+     <x>316</x>
+     <y>260</y>
+    </hint>
+    <hint type="destinationlabel">
+     <x>286</x>
+     <y>274</y>
+    </hint>
+   </hints>
+  </connection>
+ </connections>
+</ui>
diff --git a/resources/forms/topicsdialog.ui b/resources/forms/topicsdialog.ui
new file mode 100644
index 000000000..fe6f465fa
--- /dev/null
+++ b/resources/forms/topicsdialog.ui
@@ -0,0 +1,141 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<ui version="4.0">
+ <class>TopicsDialog</class>
+ <widget class="QDialog" name="TopicsDialog">
+  <property name="geometry">
+   <rect>
+    <x>0</x>
+    <y>0</y>
+    <width>387</width>
+    <height>463</height>
+   </rect>
+  </property>
+  <property name="windowTitle">
+   <string>Topic Maintenance</string>
+  </property>
+  <layout class="QGridLayout" name="gridLayout_2">
+   <item row="0" column="0">
+    <widget class="QTableWidget" name="TopicsListView"/>
+   </item>
+   <item row="1" column="0">
+    <widget class="QGroupBox" name="TopicGroupBox">
+     <property name="title">
+      <string>Topic</string>
+     </property>
+     <layout class="QGridLayout" name="gridLayout">
+      <item row="0" column="0">
+       <widget class="QLabel" name="TopicNameLabel">
+        <property name="text">
+         <string>Topic Name:</string>
+        </property>
+       </widget>
+      </item>
+      <item row="0" column="1" colspan="3">
+       <widget class="QLineEdit" name="TopicNameEdit"/>
+      </item>
+      <item row="1" column="0" colspan="2">
+       <spacer name="horizontalSpacer">
+        <property name="orientation">
+         <enum>Qt::Horizontal</enum>
+        </property>
+        <property name="sizeHint" stdset="0">
+         <size>
+          <width>198</width>
+          <height>20</height>
+         </size>
+        </property>
+       </spacer>
+      </item>
+      <item row="1" column="2">
+       <widget class="QPushButton" name="DeleteButton">
+        <property name="toolTip">
+         <string>Delete Author</string>
+        </property>
+        <property name="text">
+         <string/>
+        </property>
+        <property name="icon">
+         <iconset resource="../images/openlp-2.qrc">
+          <normaloff>:/services/service_delete.png</normaloff>:/services/service_delete.png</iconset>
+        </property>
+       </widget>
+      </item>
+      <item row="1" column="3">
+       <widget class="QPushButton" name="AddUpdateButton">
+        <property name="toolTip">
+         <string>Add Update Author</string>
+        </property>
+        <property name="text">
+         <string/>
+        </property>
+        <property name="icon">
+         <iconset resource="../images/openlp-2.qrc">
+          <normaloff>:/system/system_settings.png</normaloff>:/system/system_settings.png</iconset>
+        </property>
+       </widget>
+      </item>
+     </layout>
+    </widget>
+   </item>
+   <item row="2" column="0">
+    <widget class="QDialogButtonBox" name="ButtonBox">
+     <property name="orientation">
+      <enum>Qt::Horizontal</enum>
+     </property>
+     <property name="standardButtons">
+      <set>QDialogButtonBox::Ok</set>
+     </property>
+    </widget>
+   </item>
+   <item row="3" column="0">
+    <widget class="QLabel" name="MessageLabel">
+     <property name="text">
+      <string/>
+     </property>
+    </widget>
+   </item>
+  </layout>
+  <zorder>TopicGroupBox</zorder>
+  <zorder>TopicListView</zorder>
+  <zorder>MessageLabel</zorder>
+  <zorder>TopicsListView</zorder>
+  <zorder>ButtonBox</zorder>
+ </widget>
+ <resources>
+  <include location="../images/openlp-2.qrc"/>
+ </resources>
+ <connections>
+  <connection>
+   <sender>ButtonBox</sender>
+   <signal>accepted()</signal>
+   <receiver>TopicsDialog</receiver>
+   <slot>accept()</slot>
+   <hints>
+    <hint type="sourcelabel">
+     <x>248</x>
+     <y>254</y>
+    </hint>
+    <hint type="destinationlabel">
+     <x>157</x>
+     <y>274</y>
+    </hint>
+   </hints>
+  </connection>
+  <connection>
+   <sender>ButtonBox</sender>
+   <signal>rejected()</signal>
+   <receiver>TopicsDialog</receiver>
+   <slot>reject()</slot>
+   <hints>
+    <hint type="sourcelabel">
+     <x>316</x>
+     <y>260</y>
+    </hint>
+    <hint type="destinationlabel">
+     <x>286</x>
+     <y>274</y>
+    </hint>
+   </hints>
+  </connection>
+ </connections>
+</ui>