diff --git a/src/Eden/Config/GlobalConfigureDialog.qml b/src/Eden/Config/GlobalConfigureDialog.qml
index 4f44fd2d9d..f1421eb4d2 100644
--- a/src/Eden/Config/GlobalConfigureDialog.qml
+++ b/src/Eden/Config/GlobalConfigureDialog.qml
@@ -19,6 +19,8 @@ Dialog {
     implicitWidth: 1000
     implicitHeight: 700
 
+    padding: 5
+
     title: qsTr("Configuration")
     standardButtons: Dialog.Ok | Dialog.Cancel
 
@@ -42,23 +44,30 @@ Dialog {
         id: tabBar
         vertical: true
 
+        // TODO: style-dependent
+        property int topMargin: 45
+
         anchors {
             top: parent.top
-            topMargin: 55
+            topMargin: tabBar.topMargin
 
             left: parent.left
-            leftMargin: 10
+            leftMargin: 0
         }
-        contentWidth: 100
-        contentHeight: 60
+
+        height: Math.min(contentHeight * count + 20,
+                         parent.height - tabBar.topMargin)
+        contentWidth: 85
+        contentHeight: 55
 
         position: TabBar.Footer
 
         currentIndex: swipe.currentIndex
 
-        height: contentHeight * count + 20
         width: contentWidth
 
+        clip: true
+
         Repeater {
             model: [qsTr("General"), qsTr("System"), qsTr("CPU"), qsTr(
                     "Graphics"), qsTr("Audio"), qsTr("Debug"), qsTr("Controls")]
@@ -90,7 +99,7 @@ Dialog {
             top: parent.top
             bottom: parent.bottom
 
-            leftMargin: 5
+            leftMargin: 0
         }
 
         clip: true
diff --git a/src/Eden/Config/fields/BaseField.qml b/src/Eden/Config/fields/BaseField.qml
index 05e0ca98a1..e326900d97 100644
--- a/src/Eden/Config/fields/BaseField.qml
+++ b/src/Eden/Config/fields/BaseField.qml
@@ -66,7 +66,7 @@ Item {
         anchors {
             left: help.right
             leftMargin: -5
-            verticalCenter: parent.verticalCenter
+            verticalCenter: help.verticalCenter
         }
     }
 
@@ -87,12 +87,14 @@ Item {
     RowLayout {
         id: content
 
-        height: 40
+        height: 30
         visible: showLabel
 
         anchors {
             left: parent.horizontalCenter
             right: parent.right
+
+            verticalCenter: help.verticalCenter
         }
 
         children: [contentItem]
diff --git a/src/Eden/Config/pages/global/GlobalTab.qml b/src/Eden/Config/pages/global/GlobalTab.qml
index 82919d36dd..16ac2da7aa 100644
--- a/src/Eden/Config/pages/global/GlobalTab.qml
+++ b/src/Eden/Config/pages/global/GlobalTab.qml
@@ -17,13 +17,15 @@ Item {
             top: parent.top
             left: parent.left
             right: parent.right
+
+            leftMargin: 5
         }
 
         Repeater {
             model: tabs
 
             CarboxylTabButton {
-                font.pixelSize: 16
+                font.pixelSize: 14
                 text: modelData
             }
         }
diff --git a/src/Eden/Config/pages/global/GlobalTabSwipeView.qml b/src/Eden/Config/pages/global/GlobalTabSwipeView.qml
index e35ea61fe6..1f3d2eca75 100644
--- a/src/Eden/Config/pages/global/GlobalTabSwipeView.qml
+++ b/src/Eden/Config/pages/global/GlobalTabSwipeView.qml
@@ -11,7 +11,7 @@ SwipeView {
         right: parent.right
         bottom: parent.bottom
 
-        leftMargin: 20
+        leftMargin: 5
         topMargin: 10
     }
 }
diff --git a/src/Eden/Config/pages/graphics/RendererPage.qml b/src/Eden/Config/pages/graphics/RendererPage.qml
index 2f9b474993..15b5ea03a3 100644
--- a/src/Eden/Config/pages/graphics/RendererPage.qml
+++ b/src/Eden/Config/pages/graphics/RendererPage.qml
@@ -16,17 +16,17 @@ PageScrollView {
         vsync.apply()
     }
 
-    GraphicsDeviceInterface {
-        id: gdi
-
-        api: api.value
-        device: dev.value
-        vsyncMode: vsync.value
-    }
-
     ColumnLayout {
         width: scroll.width - scroll.effectiveScrollBarWidth
 
+        GraphicsDeviceInterface {
+            id: gdi
+
+            api: api.value
+            device: dev.value
+            vsyncMode: vsync.value
+        }
+
         ConfigComboBox {
             Layout.fillWidth: true
             id: api