diff --git a/openlp/core/ui/mainwindow.py b/openlp/core/ui/mainwindow.py
index d907a90c0..213f4815f 100644
--- a/openlp/core/ui/mainwindow.py
+++ b/openlp/core/ui/mainwindow.py
@@ -1195,6 +1195,9 @@ class MainWindow(QtGui.QMainWindow, Ui_MainWindow):
         self.live_controller.splitter.restoreState(settings.value(u'live splitter geometry'))
         self.preview_controller.splitter.restoreState(settings.value(u'preview splitter geometry'))
         self.control_splitter.restoreState(settings.value(u'main window splitter geometry'))
+        #This needs to be called after restoreState(), because saveState() also saves the "Collapsible" property
+        #which was True (by default) < OpenLP 2.1.
+        self.control_splitter.setChildrenCollapsible(False)
         settings.endGroup()
 
     def save_settings(self):
diff --git a/openlp/plugins/songs/forms/editsongform.py b/openlp/plugins/songs/forms/editsongform.py
index df48aa704..69990d111 100644
--- a/openlp/plugins/songs/forms/editsongform.py
+++ b/openlp/plugins/songs/forms/editsongform.py
@@ -171,13 +171,15 @@ class EditSongForm(QtGui.QDialog, Ui_EditSongDialog):
         if invalid_verses:
             valid = create_separated_list(verse_names)
             if len(invalid_verses) > 1:
-                critical_error_message_box(message=translate('SongsPlugin.EditSongForm',
-                    'The verse order is invalid. There are no verses corresponding to %s. Valid entries are %s.') %
-                    (u', '.join(invalid_verses), valid))
+                msg = translate('SongsPlugin.EditSongForm', 'There are no verses corresponding to "%(invalid)s".'
+                    'Valid entries are %(valid)s.\nPlease enter the verses seperated by spaces.') \
+                    % {'invalid' : u', '.join(invalid_verses), 'valid' : valid}
             else:
-                critical_error_message_box(message=translate('SongsPlugin.EditSongForm',
-                    'The verse order is invalid. There is no verse corresponding to %s. Valid entries are %s.') %
-                    (invalid_verses[0], valid))
+                msg = translate('SongsPlugin.EditSongForm', 'There is no verse corresponding to "%(invalid)s".'
+                    'Valid entries are %(valid)s.\nPlease enter the verses seperated by spaces.') \
+                    % {'invalid' : invalid_verses[0], 'valid' : valid}
+            critical_error_message_box(title=translate('SongsPlugin.EditSongForm', 'Invalid Verse Order'),
+                                       message=msg)
         return len(invalid_verses) == 0
 
     def _validate_song(self):