diff --git a/README.org b/README.org
index 7af305b..ba7a4fc 100644
--- a/README.org
+++ b/README.org
@@ -7,12 +7,12 @@ This is an attempt at building a church presentation application in Qt/QML. QML
 ** Features (planned are in parentheses)
 - Presents songs lyrics with image and video backgrounds
 - Use MPV as a rendering system for videos
+- Simple song creation with a powerful text parser - Almost fully finished
 - (Present Slides)
 - (Custom slide builder)
-- (Simple song creation with a powerful text parser)
 
 ** MPV
-You will need MPV installed in order to use this. All videos run through it. This, however, enables us to make videos work very well and with a lot of control and since it uses ffmpeg underneath, nearly any codec regardless of underlying system. This prevents the need for the user to go and install other codecs to work with Windows or MacOS. It also means a much easier control system and the potential to stream web content as well.
+You will need MPV installed in order to use this. All videos run through it. This, however, enables us to make videos work very well and with a lot of control and since it uses ffmpeg underneath, nearly any codec regardless of underlying system. This prevents the need for the user to install other codecs to work with Windows or MacOS. It also means a much easier control system and the potential to stream web content as well without downloading first.
 
 * Build and Run
 First get the source code
@@ -33,4 +33,4 @@ Then run.
 #+END_SRC
 
 * Contact Me
-If, for whatever reason, you need to contact me and get something ironed out, please do so at [[mailto:chris@tfcconnection.org][chris@tfcconnection.org]]
+If, for whatever reason, you need to contact me and get something ironed out, please do so at [[mailto:chris@tfcconnection.org][chris@cochrun.xyz]]
diff --git a/src/qml/presenter/SongEditor.qml b/src/qml/presenter/SongEditor.qml
index b917c49..78ab926 100644
--- a/src/qml/presenter/SongEditor.qml
+++ b/src/qml/presenter/SongEditor.qml
@@ -27,13 +27,16 @@ Item {
                 anchors.fill: parent 
 
                 Controls.ComboBox {
+                    id: fontBox
                     model: Qt.fontFamilies()
                     implicitWidth: 300
                     editable: true
                     hoverEnabled: true
+                    flat: true
                     onCurrentTextChanged: showPassiveNotification(currentText)
                 }
                 Controls.SpinBox {
+                    id: fontSizeBox
                     editable: true
                     from: 5
                     to: 72
@@ -44,6 +47,7 @@ Item {
                     model: ["Left", "Center", "Right", "Justify"]
                     implicitWidth: 100
                     hoverEnabled: true
+                    flat: true
                     onActivated: updateHorizontalTextAlignment(currentText.toLowerCase());
                 }
                 Controls.ComboBox {
@@ -51,6 +55,7 @@ Item {
                     model: ["Top", "Center", "Bottom"]
                     implicitWidth: 100
                     hoverEnabled: true
+                    flat: true
                     onActivated: updateVerticalTextAlignment(currentText.toLowerCase());
                 }
                 Controls.ToolButton {