diff --git a/src/qml/presenter/SongEditor.qml b/src/qml/presenter/SongEditor.qml
index 9f10c60..b917c49 100644
--- a/src/qml/presenter/SongEditor.qml
+++ b/src/qml/presenter/SongEditor.qml
@@ -10,7 +10,7 @@ Item {
     id: root
 
     property int songIndex
-    property var song
+    property var song 
 
     GridLayout {
         id: mainLayout
@@ -268,10 +268,13 @@ Item {
     }
 
     function changeSong(index) {
-        song = songsqlmodel.getSong(index);
+        const s = songsqlmodel.getSong(index);
+        print(s.font);
+        print(s.title);
+        song = s;
         songIndex = index;
 
-        if (songBackgroundType == "image") {
+        if (song.backgroundType == "image") {
             slideEditor.videoBackground = "";
             slideEditor.imageBackground = song.background;
         } else {
@@ -319,15 +322,11 @@ Item {
 
 
     function updateHorizontalTextAlignment(textAlignment) {
-        if (alignmentSetTimer.running)
-            return;
         changeSlideHAlignment(textAlignment);
         songsqlmodel.updateHorizontalTextAlignment(songIndex, textAlignment);
     }
 
     function updateVerticalTextAlignment(textAlignment) {
-        if (alignmentSetTimer.running)
-            return;
         changeSlideVAlignment(textAlignment);
         songsqlmodel.updateVerticalTextAlignment(songIndex, textAlignment)
     }
diff --git a/src/songsqlmodel.cpp b/src/songsqlmodel.cpp
index 9408d8b..db4651f 100644
--- a/src/songsqlmodel.cpp
+++ b/src/songsqlmodel.cpp
@@ -128,26 +128,9 @@ void SongSqlModel::deleteSong(const int &row) {
 }
 
 QVariantMap SongSqlModel::getSong(const int &row) {
-  // QSqlRecord recordData = record(row);
-  // if (recordData.isEmpty()) {
-  //   qDebug() << "this is not a song";
-  //   QVariantList empty;
-  //   return empty;
-  // }
-
-  // QVariantList song;
-  // song.append(recordData.value("title"));
-  // song.append(recordData.value("lyrics"));
-  // song.append(recordData.value("author"));
-  // song.append(recordData.value("ccli"));
-  // song.append(recordData.value("audio"));
-  // song.append(recordData.value("vorder"));
-  // song.append(recordData.value("background"));
-  // song.append(recordData.value("backgroundType"));
-  // song.append(recordData.value("horizontalTextAlignment"));
-
-  // return song;
-
+  // this whole function returns all data in the song
+  // regardless of it's length. When new things are added
+  // it will still work without refactoring.
   QVariantMap data;
   const QModelIndex idx = this->index(row,0);
   // qDebug() << idx;