diff --git a/ScreenPlay/qml/Settings/SettingBool.qml b/ScreenPlay/qml/Settings/SettingBool.qml
index aee67300..2602b917 100644
--- a/ScreenPlay/qml/Settings/SettingBool.qml
+++ b/ScreenPlay/qml/Settings/SettingBool.qml
@@ -18,14 +18,14 @@ Item {
     }
     signal checkboxChanged(bool checked)
 
-    height: 50
+    height: 50 +txtDescription.paintedHeight
     width: parent.width
 
     Text {
         id: txtHeadline
         color: "#5D5D5D"
         text: settingsBool.headline
-        
+
         verticalAlignment: Text.AlignVCenter
         horizontalAlignment: Text.AlignLeft
         anchors{
@@ -45,7 +45,7 @@ Item {
         text: settingsBool.description
         wrapMode: Text.WordWrap
         color: "#B5B5B5"
-        
+
         verticalAlignment: Text.AlignVCenter
         horizontalAlignment: Text.AlignLeft
         font.pixelSize: 12
diff --git a/ScreenPlay/qml/Settings/Settings.qml b/ScreenPlay/qml/Settings/Settings.qml
index 524691ab..4d59cfeb 100644
--- a/ScreenPlay/qml/Settings/Settings.qml
+++ b/ScreenPlay/qml/Settings/Settings.qml
@@ -38,7 +38,7 @@ Item {
 
             Item {
                 id: settingsGeneralWrapper
-                height: 520
+                height: 520 + txtDirChangesInfo.paintedHeight
                 width: parent.width
 
                 RectangularGlow {
@@ -139,11 +139,11 @@ Item {
                         }
 
                         Text {
+                            id: txtDirChangesInfo
                             text: qsTr("Important: Changing this directory has no effect on the workshop download path. ScreenPlay only supports having one content folder!")
                             color: "#B5B5B5"
                             height: 30
                             width: parent.width
-
                             verticalAlignment: Text.AlignVCenter
                             wrapMode: Text.WordWrap
                             horizontalAlignment: Text.AlignLeft
@@ -205,7 +205,7 @@ Item {
 
             Item {
                 id: settingsPerformanceWrapper
-                height: 220
+                height: 250
                 width: parent.width
 
                 RectangularGlow {
@@ -445,3 +445,8 @@ Item {
         }
     }
 }
+
+/*##^## Designer {
+    D{i:0;autoSize:true;height:480;width:640}
+}
+ ##^##*/
diff --git a/ScreenPlay/qml/Settings/SettingsHeader.qml b/ScreenPlay/qml/Settings/SettingsHeader.qml
index 89ac8c19..1aa6176f 100644
--- a/ScreenPlay/qml/Settings/SettingsHeader.qml
+++ b/ScreenPlay/qml/Settings/SettingsHeader.qml
@@ -65,7 +65,7 @@ Item {
                 font.pixelSize: 18
                 color: "white"
                 verticalAlignment: Text.AlignTop
-                
+
                 font.family: "Roboto"
                 anchors {
                     top: parent.top
@@ -102,7 +102,7 @@ Item {
 
             PropertyChanges {
                 target: txtHeadline
-                anchors.topMargin: 0
+                anchors.topMargin: 2
                 opacity: 1
             }
         }