Slightly improve the settings layouts.

app/qml/ApplicationSettings.qml

@@ -31,6 +31,8 @@ QtObject {
     readonly property real minimumFontScaling: 0.25
     readonly property real maximumFontScaling: 2.50
 
+    readonly property int defaultMargin: 16
+
     readonly property real minBurnInFadeTime: 0.16
     readonly property real maxBurnInFadeTime: 1.6
 

app/qml/SettingsAdvancedTab.qml

@@ -27,7 +27,9 @@ import "Components"
 ColumnLayout {
     GroupBox {
         Layout.fillWidth: true
+        Layout.fillHeight: true
         title: qsTr("Command")
+        padding: appSettings.defaultMargin
 
         ColumnLayout {
             anchors.fill: parent
@@ -60,9 +62,32 @@ ColumnLayout {
         }
     }
 
+    GroupBox {
+        title: qsTr("Cursor")
+        Layout.fillWidth: true
+        Layout.fillHeight: true
+        padding: appSettings.defaultMargin
+        ColumnLayout {
+            anchors.fill: parent
+            CheckBox {
+                id: blinkingCursor
+                text: qsTr("Blinking Cursor")
+                checked: appSettings.blinkingCursor
+                onCheckedChanged: appSettings.blinkingCursor = checked
+            }
+            Binding {
+                target: blinkingCursor
+                property: "checked"
+                value: appSettings.blinkingCursor
+            }
+        }
+    }
+
     GroupBox {
         title: qsTr("Performance")
         Layout.fillWidth: true
+        Layout.fillHeight: true
+        padding: appSettings.defaultMargin
         GridLayout {
             anchors.fill: parent
             columns: 4

app/qml/SettingsEffectsTab.qml

@@ -22,11 +22,15 @@ import QtQuick.Controls 2.0
 import QtQuick.Layouts 1.1
 
 ColumnLayout {
+    Layout.fillWidth: true
+    Layout.fillHeight: true
     spacing: 2
 
     GroupBox {
         title: qsTr("Effects")
         Layout.fillWidth: true
+        Layout.fillHeight: true
+        padding: appSettings.defaultMargin
 
         ColumnLayout {
             anchors.fill: parent

app/qml/SettingsGeneralTab.qml

@@ -25,7 +25,9 @@ import QtQuick.Dialogs
 ColumnLayout {
     GroupBox {
         Layout.fillWidth: true
+        Layout.fillHeight: true
         title: qsTr("Profile")
+        padding: appSettings.defaultMargin
         RowLayout {
             anchors.fill: parent
             ListView {
@@ -183,6 +185,8 @@ ColumnLayout {
     GroupBox {
         title: qsTr("Screen")
         Layout.fillWidth: true
+        Layout.fillHeight: true
+        padding: appSettings.defaultMargin
         GridLayout {
             anchors.fill: parent
             columns: 2

app/qml/SettingsTerminalTab.qml

@@ -25,10 +25,11 @@ import QtQml 2.0
 import "Components"
 
 ColumnLayout {
-
     GroupBox {
         title: qsTr("Font")
         Layout.fillWidth: true
+        Layout.fillHeight: true
+        padding: appSettings.defaultMargin
         GridLayout {
             anchors.fill: parent
             columns: 2
@@ -149,27 +150,11 @@ ColumnLayout {
             }
         }
     }
-    GroupBox {
-        title: qsTr("Cursor")
-        Layout.fillWidth: true
-        ColumnLayout {
-            anchors.fill: parent
-            CheckBox {
-                id: blinkingCursor
-                text: qsTr("Blinking Cursor")
-                checked: appSettings.blinkingCursor
-                onCheckedChanged: appSettings.blinkingCursor = checked
-            }
-            Binding {
-                target: blinkingCursor
-                property: "checked"
-                value: appSettings.blinkingCursor
-            }
-        }
-    }
     GroupBox {
         title: qsTr("Colors")
         Layout.fillWidth: true
+        Layout.fillHeight: true
+        padding: appSettings.defaultMargin
         ColumnLayout {
             anchors.fill: parent
             ColumnLayout {

app/qml/SettingsWindow.qml

@@ -28,7 +28,7 @@ ApplicationWindow {
     id: settings_window
     title: qsTr("Settings")
     width: 640
-    height: 640
+    height: 480
 
     Item {
         anchors { fill: parent; }