diff --git a/openlp/core/lib/db.py b/openlp/core/lib/db.py
index fb8a38b1f..f8c5a212b 100644
--- a/openlp/core/lib/db.py
+++ b/openlp/core/lib/db.py
@@ -205,7 +205,8 @@ class Manager(object):
                 return
         try:
             self.session = init_schema(self.db_url)
-        except:
+        except SQLAlchemyError, DBAPIError:
+            log.exception(u'Error loading database: %s', self.db_url)
             critical_error_message_box(
                 translate('OpenLP.Manager', 'Database Error'),
                 unicode(translate('OpenLP.Manager', 'OpenLP cannot load your '
diff --git a/openlp/plugins/songs/forms/editsongform.py b/openlp/plugins/songs/forms/editsongform.py
index 571d03791..24e2c852f 100644
--- a/openlp/plugins/songs/forms/editsongform.py
+++ b/openlp/plugins/songs/forms/editsongform.py
@@ -100,6 +100,10 @@ class EditSongForm(QtGui.QDialog, Ui_EditSongDialog):
             QtCore.SIGNAL(u'clicked()'), self.onAudioAddFromFileButtonClicked)
         QtCore.QObject.connect(self.audioAddFromMediaButton,
             QtCore.SIGNAL(u'clicked()'), self.onAudioAddFromMediaButtonClicked)
+        QtCore.QObject.connect(self.audioRemoveButton,
+            QtCore.SIGNAL(u'clicked()'), self.onAudioRemoveButtonClicked)
+        QtCore.QObject.connect(self.audioRemoveAllButton,
+            QtCore.SIGNAL(u'clicked()'), self.onAudioRemoveAllButtonClicked)
         QtCore.QObject.connect(Receiver.get_receiver(),
             QtCore.SIGNAL(u'theme_update_list'), self.loadThemes)
         self.previewButton = QtGui.QPushButton()
@@ -718,11 +722,42 @@ class EditSongForm(QtGui.QDialog, Ui_EditSongDialog):
                 item.setData(QtCore.Qt.UserRole, filename)
                 self.audioListWidget.addItem(item)
 
+    def onAudioRemoveButtonClicked(self):
+        """
+        Removes a file from the list.
+        """
+        row = self.audioListWidget.currentRow()
+        if row == -1:
+            return
+        self.audioListWidget.takeItem(row)
+
+    def onAudioRemoveAllButtonClicked(self):
+        """
+        Removes all files from the list.
+        """
+        self.audioListWidget.clear()
+
     def onUpButtonClicked(self):
-        pass
+        """
+        Moves a file up when the user clicks the up button on the audio tab.
+        """
+        row = self.audioListWidget.currentRow()
+        if row <= 0:
+            return
+        item = self.audioListWidget.takeItem(row)
+        self.audioListWidget.insertItem(row - 1, item)
+        self.audioListWidget.setCurrentRow(row - 1)
 
     def onDownButtonClicked(self):
-        pass
+        """
+        Moves a file down when the user clicks the up button on the audio tab.
+        """
+        row = self.audioListWidget.currentRow()
+        if row == -1 or row > self.audioListWidget.count() - 1:
+            return
+        item = self.audioListWidget.takeItem(row)
+        self.audioListWidget.insertItem(row + 1, item)
+        self.audioListWidget.setCurrentRow(row + 1)
 
     def clearCaches(self):
         """
@@ -830,6 +865,7 @@ class EditSongForm(QtGui.QDialog, Ui_EditSongDialog):
             media_file = MediaFile()
             media_file.file_name = filename
             media_file.type = u'audio'
+            media_file.weight = row
             self.song.media_files.append(media_file)
         for audio in audio_files:
             if audio not in files:
diff --git a/openlp/plugins/songs/lib/db.py b/openlp/plugins/songs/lib/db.py
index 5bfa0c830..37ee42451 100644
--- a/openlp/plugins/songs/lib/db.py
+++ b/openlp/plugins/songs/lib/db.py
@@ -232,7 +232,8 @@ def init_schema(url):
             'authors': relation(Author, backref='songs',
                 secondary=authors_songs_table, lazy=False),
             'book': relation(Book, backref='songs'),
-            'media_files': relation(MediaFile, backref='songs'),
+            'media_files': relation(MediaFile, backref='songs',
+                order_by=media_files_table.c.weight),
             'topics': relation(Topic, backref='songs',
                 secondary=songs_topics_table)
         })