diff --git a/openlp/plugins/songs/forms/editsongdialog.py b/openlp/plugins/songs/forms/editsongdialog.py
index a4e9a87a5..a855414be 100644
--- a/openlp/plugins/songs/forms/editsongdialog.py
+++ b/openlp/plugins/songs/forms/editsongdialog.py
@@ -2,7 +2,7 @@
 
 # Form implementation generated from reading ui file 'editsongdialog.ui'
 #
-# Created: Mon Jan  5 19:38:13 2009
+# Created: Tue Jan  6 19:54:19 2009
 #      by: PyQt4 UI code generator 4.4.3
 #
 # WARNING! All changes made in this file will be lost!
@@ -12,15 +12,15 @@ from PyQt4 import QtCore, QtGui
 class Ui_EditSongDialog(object):
     def setupUi(self, EditSongDialog):
         EditSongDialog.setObjectName("EditSongDialog")
-        EditSongDialog.resize(734, 602)
+        EditSongDialog.resize(734, 761)
         icon = QtGui.QIcon()
         icon.addPixmap(QtGui.QPixmap(":/icon/openlp.org-icon-32.bmp"), QtGui.QIcon.Normal, QtGui.QIcon.Off)
         EditSongDialog.setWindowIcon(icon)
         self.TopWidget = QtGui.QWidget(EditSongDialog)
-        self.TopWidget.setGeometry(QtCore.QRect(8, 8, 711, 461))
+        self.TopWidget.setGeometry(QtCore.QRect(8, 8, 711, 721))
         self.TopWidget.setObjectName("TopWidget")
         self.TextWidget = QtGui.QWidget(self.TopWidget)
-        self.TextWidget.setGeometry(QtCore.QRect(0, 0, 321, 461))
+        self.TextWidget.setGeometry(QtCore.QRect(0, 0, 331, 531))
         self.TextWidget.setObjectName("TextWidget")
         self.gridLayout = QtGui.QGridLayout(self.TextWidget)
         self.gridLayout.setObjectName("gridLayout")
@@ -41,16 +41,22 @@ class Ui_EditSongDialog(object):
         self.AlternativeEdit = QtGui.QLineEdit(self.TextWidget)
         self.AlternativeEdit.setObjectName("AlternativeEdit")
         self.gridLayout.addWidget(self.AlternativeEdit, 3, 0, 1, 1)
+        self.VerseOrderLabel = QtGui.QLabel(self.TextWidget)
+        self.VerseOrderLabel.setObjectName("VerseOrderLabel")
+        self.gridLayout.addWidget(self.VerseOrderLabel, 4, 0, 1, 1)
+        self.VerseOrderEdit = QtGui.QLineEdit(self.TextWidget)
+        self.VerseOrderEdit.setObjectName("VerseOrderEdit")
+        self.gridLayout.addWidget(self.VerseOrderEdit, 5, 0, 1, 1)
         self.LyricsLabel = QtGui.QLabel(self.TextWidget)
         self.LyricsLabel.setObjectName("LyricsLabel")
-        self.gridLayout.addWidget(self.LyricsLabel, 4, 0, 1, 1)
+        self.gridLayout.addWidget(self.LyricsLabel, 6, 0, 1, 1)
         self.LyricsTextEdit = QtGui.QTextEdit(self.TextWidget)
         self.LyricsTextEdit.setLineWrapMode(QtGui.QTextEdit.NoWrap)
         self.LyricsTextEdit.setAcceptRichText(False)
         self.LyricsTextEdit.setObjectName("LyricsTextEdit")
-        self.gridLayout.addWidget(self.LyricsTextEdit, 5, 0, 1, 1)
+        self.gridLayout.addWidget(self.LyricsTextEdit, 7, 0, 1, 1)
         self.Selectedroup = QtGui.QWidget(self.TopWidget)
-        self.Selectedroup.setGeometry(QtCore.QRect(329, 0, 381, 431))
+        self.Selectedroup.setGeometry(QtCore.QRect(329, 0, 381, 531))
         self.Selectedroup.setObjectName("Selectedroup")
         self.AuthorsGroupBox = QtGui.QGroupBox(self.Selectedroup)
         self.AuthorsGroupBox.setGeometry(QtCore.QRect(0, 0, 381, 66))
@@ -139,59 +145,40 @@ class Ui_EditSongDialog(object):
         self.pushButton = QtGui.QPushButton(self.SelectedTopicGroupBox)
         self.pushButton.setObjectName("pushButton")
         self.verticalLayout_2.addWidget(self.pushButton)
-        self.ThemeWidget = QtGui.QWidget(EditSongDialog)
-        self.ThemeWidget.setGeometry(QtCore.QRect(10, 520, 641, 45))
-        self.ThemeWidget.setObjectName("ThemeWidget")
-        self.horizontalLayout_5 = QtGui.QHBoxLayout(self.ThemeWidget)
-        self.horizontalLayout_5.setObjectName("horizontalLayout_5")
-        self.ThemeLabel = QtGui.QLabel(self.ThemeWidget)
-        self.ThemeLabel.setMaximumSize(QtCore.QSize(70, 16777215))
-        self.ThemeLabel.setObjectName("ThemeLabel")
-        self.horizontalLayout_5.addWidget(self.ThemeLabel)
-        self.ThemeSelectionComboItem = QtGui.QComboBox(self.ThemeWidget)
-        self.ThemeSelectionComboItem.setObjectName("ThemeSelectionComboItem")
-        self.horizontalLayout_5.addWidget(self.ThemeSelectionComboItem)
-        self.ThemeAddItem = QtGui.QPushButton(self.ThemeWidget)
-        self.ThemeAddItem.setMaximumSize(QtCore.QSize(110, 16777215))
-        self.ThemeAddItem.setObjectName("ThemeAddItem")
-        self.horizontalLayout_5.addWidget(self.ThemeAddItem)
-        self.ButtonBox = QtGui.QDialogButtonBox(EditSongDialog)
-        self.ButtonBox.setGeometry(QtCore.QRect(500, 570, 156, 27))
-        self.ButtonBox.setStandardButtons(QtGui.QDialogButtonBox.Cancel|QtGui.QDialogButtonBox.Save)
-        self.ButtonBox.setObjectName("ButtonBox")
-        self.layoutWidget = QtGui.QWidget(EditSongDialog)
-        self.layoutWidget.setGeometry(QtCore.QRect(20, 490, 311, 25))
-        self.layoutWidget.setObjectName("layoutWidget")
-        self.VerseOrderLayout = QtGui.QHBoxLayout(self.layoutWidget)
-        self.VerseOrderLayout.setObjectName("VerseOrderLayout")
-        self.VerseOrderLabel = QtGui.QLabel(self.layoutWidget)
-        self.VerseOrderLabel.setObjectName("VerseOrderLabel")
-        self.VerseOrderLayout.addWidget(self.VerseOrderLabel)
-        self.VerseOrderEdit = QtGui.QLineEdit(self.layoutWidget)
-        self.VerseOrderEdit.setObjectName("VerseOrderEdit")
-        self.VerseOrderLayout.addWidget(self.VerseOrderEdit)
-        self.layoutWidget1 = QtGui.QWidget(EditSongDialog)
-        self.layoutWidget1.setGeometry(QtCore.QRect(340, 440, 381, 110))
-        self.layoutWidget1.setObjectName("layoutWidget1")
-        self.CopyrightLayout = QtGui.QFormLayout(self.layoutWidget1)
-        self.CopyrightLayout.setFieldGrowthPolicy(QtGui.QFormLayout.AllNonFixedFieldsGrow)
-        self.CopyrightLayout.setObjectName("CopyrightLayout")
-        self.CopyrightInfoLabel = QtGui.QLabel(self.layoutWidget1)
-        self.CopyrightInfoLabel.setObjectName("CopyrightInfoLabel")
-        self.CopyrightLayout.setWidget(0, QtGui.QFormLayout.LabelRole, self.CopyrightInfoLabel)
-        self.CopyrightEditItem = QtGui.QLineEdit(self.layoutWidget1)
+        self.CopyrightgroupBox = QtGui.QGroupBox(self.Selectedroup)
+        self.CopyrightgroupBox.setGeometry(QtCore.QRect(0, 430, 371, 95))
+        self.CopyrightgroupBox.setObjectName("CopyrightgroupBox")
+        self.gridLayout_4 = QtGui.QGridLayout(self.CopyrightgroupBox)
+        self.gridLayout_4.setObjectName("gridLayout_4")
+        self.CopyrightEditItem = QtGui.QLineEdit(self.CopyrightgroupBox)
         self.CopyrightEditItem.setObjectName("CopyrightEditItem")
-        self.CopyrightLayout.setWidget(1, QtGui.QFormLayout.LabelRole, self.CopyrightEditItem)
-        self.CCLLabel = QtGui.QLabel(self.layoutWidget1)
+        self.gridLayout_4.addWidget(self.CopyrightEditItem, 0, 0, 1, 1)
+        self.CCLLabel = QtGui.QLabel(self.CopyrightgroupBox)
         self.CCLLabel.setObjectName("CCLLabel")
-        self.CopyrightLayout.setWidget(2, QtGui.QFormLayout.LabelRole, self.CCLLabel)
-        self.CCLNumberEdit = QtGui.QLineEdit(self.layoutWidget1)
+        self.gridLayout_4.addWidget(self.CCLLabel, 1, 0, 1, 1)
+        self.CCLNumberEdit = QtGui.QLineEdit(self.CopyrightgroupBox)
         self.CCLNumberEdit.setObjectName("CCLNumberEdit")
-        self.CopyrightLayout.setWidget(2, QtGui.QFormLayout.FieldRole, self.CCLNumberEdit)
-        self.CopyrightInsertItem = QtGui.QPushButton(self.layoutWidget1)
+        self.gridLayout_4.addWidget(self.CCLNumberEdit, 1, 1, 1, 1)
+        self.CopyrightInsertItem = QtGui.QPushButton(self.CopyrightgroupBox)
         self.CopyrightInsertItem.setMaximumSize(QtCore.QSize(29, 16777215))
         self.CopyrightInsertItem.setObjectName("CopyrightInsertItem")
-        self.CopyrightLayout.setWidget(1, QtGui.QFormLayout.FieldRole, self.CopyrightInsertItem)
+        self.gridLayout_4.addWidget(self.CopyrightInsertItem, 0, 1, 1, 1)
+        self.ThemeGroupBox = QtGui.QGroupBox(self.TopWidget)
+        self.ThemeGroupBox.setGeometry(QtCore.QRect(0, 540, 711, 66))
+        self.ThemeGroupBox.setObjectName("ThemeGroupBox")
+        self.horizontalLayout_2 = QtGui.QHBoxLayout(self.ThemeGroupBox)
+        self.horizontalLayout_2.setObjectName("horizontalLayout_2")
+        self.ThemeSelectionComboItem = QtGui.QComboBox(self.ThemeGroupBox)
+        self.ThemeSelectionComboItem.setObjectName("ThemeSelectionComboItem")
+        self.horizontalLayout_2.addWidget(self.ThemeSelectionComboItem)
+        self.ThemeAddItem = QtGui.QPushButton(self.ThemeGroupBox)
+        self.ThemeAddItem.setMaximumSize(QtCore.QSize(110, 16777215))
+        self.ThemeAddItem.setObjectName("ThemeAddItem")
+        self.horizontalLayout_2.addWidget(self.ThemeAddItem)
+        self.ButtonBox = QtGui.QDialogButtonBox(EditSongDialog)
+        self.ButtonBox.setGeometry(QtCore.QRect(570, 720, 156, 27))
+        self.ButtonBox.setStandardButtons(QtGui.QDialogButtonBox.Cancel|QtGui.QDialogButtonBox.Save)
+        self.ButtonBox.setObjectName("ButtonBox")
 
         self.retranslateUi(EditSongDialog)
         QtCore.QObject.connect(self.ButtonBox, QtCore.SIGNAL("rejected()"), EditSongDialog.close)
@@ -202,6 +189,7 @@ class Ui_EditSongDialog(object):
         EditSongDialog.setWindowTitle(QtGui.QApplication.translate("EditSongDialog", "Song Editor", None, QtGui.QApplication.UnicodeUTF8))
         self.TitleLabel.setText(QtGui.QApplication.translate("EditSongDialog", "Title:", None, QtGui.QApplication.UnicodeUTF8))
         self.AlternativeTitleLabel.setText(QtGui.QApplication.translate("EditSongDialog", "Alternative Title:", None, QtGui.QApplication.UnicodeUTF8))
+        self.VerseOrderLabel.setText(QtGui.QApplication.translate("EditSongDialog", "Verse Order:", None, QtGui.QApplication.UnicodeUTF8))
         self.LyricsLabel.setText(QtGui.QApplication.translate("EditSongDialog", "Lyrics:", None, QtGui.QApplication.UnicodeUTF8))
         self.AuthorsGroupBox.setTitle(QtGui.QApplication.translate("EditSongDialog", "Authors", None, QtGui.QApplication.UnicodeUTF8))
         self.AuthorAddtoSongItem.setText(QtGui.QApplication.translate("EditSongDialog", "Add to Song", None, QtGui.QApplication.UnicodeUTF8))
@@ -215,10 +203,10 @@ class Ui_EditSongDialog(object):
         self.AuthorRemoveItem.setText(QtGui.QApplication.translate("EditSongDialog", "Remove", None, QtGui.QApplication.UnicodeUTF8))
         self.SelectedTopicGroupBox.setTitle(QtGui.QApplication.translate("EditSongDialog", "Selected Topics", None, QtGui.QApplication.UnicodeUTF8))
         self.pushButton.setText(QtGui.QApplication.translate("EditSongDialog", "Remove", None, QtGui.QApplication.UnicodeUTF8))
-        self.ThemeLabel.setText(QtGui.QApplication.translate("EditSongDialog", "Theme", None, QtGui.QApplication.UnicodeUTF8))
-        self.ThemeAddItem.setText(QtGui.QApplication.translate("EditSongDialog", "Add a Theme", None, QtGui.QApplication.UnicodeUTF8))
-        self.VerseOrderLabel.setText(QtGui.QApplication.translate("EditSongDialog", "Verse Order:", None, QtGui.QApplication.UnicodeUTF8))
-        self.CopyrightInfoLabel.setText(QtGui.QApplication.translate("EditSongDialog", "Copyright Info:", None, QtGui.QApplication.UnicodeUTF8))
+        self.CopyrightgroupBox.setTitle(QtGui.QApplication.translate("EditSongDialog", "Copyright Infomaton", None, QtGui.QApplication.UnicodeUTF8))
         self.CCLLabel.setText(QtGui.QApplication.translate("EditSongDialog", "CCL Number:", None, QtGui.QApplication.UnicodeUTF8))
         self.CopyrightInsertItem.setText(QtGui.QApplication.translate("EditSongDialog", "©", None, QtGui.QApplication.UnicodeUTF8))
+        self.ThemeGroupBox.setTitle(QtGui.QApplication.translate("EditSongDialog", "Theme", None, QtGui.QApplication.UnicodeUTF8))
+        self.ThemeAddItem.setText(QtGui.QApplication.translate("EditSongDialog", "Add a Theme", None, QtGui.QApplication.UnicodeUTF8))
+
 
diff --git a/resources/forms/editsongdialog.ui b/resources/forms/editsongdialog.ui
index f01c851c8..a175c4b06 100644
--- a/resources/forms/editsongdialog.ui
+++ b/resources/forms/editsongdialog.ui
@@ -7,7 +7,7 @@
     <x>0</x>
     <y>0</y>
     <width>734</width>
-    <height>602</height>
+    <height>761</height>
    </rect>
   </property>
   <property name="windowTitle">
@@ -23,7 +23,7 @@
      <x>8</x>
      <y>8</y>
      <width>711</width>
-     <height>461</height>
+     <height>721</height>
     </rect>
    </property>
    <widget class="QWidget" name="TextWidget" native="true">
@@ -31,8 +31,8 @@
      <rect>
       <x>0</x>
       <y>0</y>
-      <width>321</width>
-      <height>461</height>
+      <width>331</width>
+      <height>531</height>
      </rect>
     </property>
     <layout class="QGridLayout" name="gridLayout">
@@ -64,13 +64,23 @@
       <widget class="QLineEdit" name="AlternativeEdit"/>
      </item>
      <item row="4" column="0">
+      <widget class="QLabel" name="VerseOrderLabel">
+       <property name="text">
+        <string>Verse Order:</string>
+       </property>
+      </widget>
+     </item>
+     <item row="5" column="0">
+      <widget class="QLineEdit" name="VerseOrderEdit"/>
+     </item>
+     <item row="6" column="0">
       <widget class="QLabel" name="LyricsLabel">
        <property name="text">
         <string>Lyrics:</string>
        </property>
       </widget>
      </item>
-     <item row="5" column="0">
+     <item row="7" column="0">
       <widget class="QTextEdit" name="LyricsTextEdit">
        <property name="lineWrapMode">
         <enum>QTextEdit::NoWrap</enum>
@@ -81,6 +91,14 @@
       </widget>
      </item>
     </layout>
+    <zorder>TitleLabel</zorder>
+    <zorder>TitleEditItem</zorder>
+    <zorder>AlternativeTitleLabel</zorder>
+    <zorder>AlternativeEdit</zorder>
+    <zorder>LyricsLabel</zorder>
+    <zorder>LyricsTextEdit</zorder>
+    <zorder>VerseOrderEdit</zorder>
+    <zorder>VerseOrderLabel</zorder>
    </widget>
    <widget class="QWidget" name="Selectedroup" native="true">
     <property name="geometry">
@@ -88,7 +106,7 @@
       <x>329</x>
       <y>0</y>
       <width>381</width>
-      <height>431</height>
+      <height>531</height>
      </rect>
     </property>
     <widget class="QGroupBox" name="AuthorsGroupBox">
@@ -293,56 +311,89 @@
       </item>
      </layout>
     </widget>
+    <widget class="QGroupBox" name="CopyrightgroupBox">
+     <property name="geometry">
+      <rect>
+       <x>0</x>
+       <y>430</y>
+       <width>371</width>
+       <height>95</height>
+      </rect>
+     </property>
+     <property name="title">
+      <string>Copyright Infomaton</string>
+     </property>
+     <layout class="QGridLayout" name="gridLayout_4">
+      <item row="0" column="0">
+       <widget class="QLineEdit" name="CopyrightEditItem"/>
+      </item>
+      <item row="1" column="0">
+       <widget class="QLabel" name="CCLLabel">
+        <property name="text">
+         <string>CCL Number:</string>
+        </property>
+       </widget>
+      </item>
+      <item row="1" column="1">
+       <widget class="QLineEdit" name="CCLNumberEdit"/>
+      </item>
+      <item row="0" 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>
+     <zorder>CopyrightEditItem</zorder>
+     <zorder>CCLLabel</zorder>
+     <zorder>CCLNumberEdit</zorder>
+     <zorder>CopyrightInsertItem</zorder>
+    </widget>
+   </widget>
+   <widget class="QGroupBox" name="ThemeGroupBox">
+    <property name="geometry">
+     <rect>
+      <x>0</x>
+      <y>540</y>
+      <width>711</width>
+      <height>66</height>
+     </rect>
+    </property>
+    <property name="title">
+     <string>Theme</string>
+    </property>
+    <layout class="QHBoxLayout" name="horizontalLayout_2">
+     <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>
-   <zorder>Selectedroup</zorder>
-   <zorder>TextWidget</zorder>
-  </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>
+     <x>570</x>
+     <y>720</y>
      <width>156</width>
      <height>27</height>
     </rect>
@@ -351,76 +402,6 @@
     <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>340</x>
-     <y>440</y>
-     <width>381</width>
-     <height>110</height>
-    </rect>
-   </property>
-   <layout class="QFormLayout" name="CopyrightLayout">
-    <property name="fieldGrowthPolicy">
-     <enum>QFormLayout::AllNonFixedFieldsGrow</enum>
-    </property>
-    <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="2" column="0">
-     <widget class="QLabel" name="CCLLabel">
-      <property name="text">
-       <string>CCL Number:</string>
-      </property>
-     </widget>
-    </item>
-    <item row="2" column="1">
-     <widget class="QLineEdit" name="CCLNumberEdit"/>
-    </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>
  </widget>
  <resources>
   <include location="../images/openlp-2.qrc"/>