diff --git a/src/qml/AddUserDialog.qml b/src/qml/AddUserDialog.qml
index f236f48..a44dca4 100644
--- a/src/qml/AddUserDialog.qml
+++ b/src/qml/AddUserDialog.qml
@@ -8,12 +8,9 @@ import Cutefish.Accounts 1.0
 Dialog {
     id: control
 
-    width: _mainLayout.implicitWidth + FishUI.Units.largeSpacing * 4
-    height: _mainLayout.implicitHeight + FishUI.Units.largeSpacing * 3
     x: (parent.width - width) / 2
     y: (parent.height - height) / 2
     modal: true
-    padding: FishUI.Units.largeSpacing * 2
 
     onRejected: clear()
 
@@ -42,7 +39,7 @@ Dialog {
         accountTypeCombo.currentIndex = 0
     }
 
-    ColumnLayout {
+    contentItem: ColumnLayout {
         id: _mainLayout
         spacing: FishUI.Units.largeSpacing
 
diff --git a/src/qml/LanguagePage.qml b/src/qml/LanguagePage.qml
index bab4017..a857b6c 100644
--- a/src/qml/LanguagePage.qml
+++ b/src/qml/LanguagePage.qml
@@ -48,7 +48,7 @@ ItemPage {
 
                 id: item
                 width: ListView.view.width - ListView.view.leftMargin - ListView.view.rightMargin
-                height: 50
+                height: 43
                 hoverEnabled: true
                 acceptedButtons: Qt.LeftButton
 
diff --git a/src/qml/UserPage/UserDelegateItem.qml b/src/qml/UserPage/UserDelegateItem.qml
index 700a158..a4684a6 100644
--- a/src/qml/UserPage/UserDelegateItem.qml
+++ b/src/qml/UserPage/UserDelegateItem.qml
@@ -100,7 +100,6 @@ Item {
 
                     Label {
                         text: qsTr("Currently logged")
-                        rightPadding: FishUI.Units.largeSpacing
                         visible: currentUser.userId === loggedUser.userId
                     }
 
diff --git a/src/qml/WirelessDetailsDialog.qml b/src/qml/WirelessDetailsDialog.qml
index 00f82cf..899d3c5 100644
--- a/src/qml/WirelessDetailsDialog.qml
+++ b/src/qml/WirelessDetailsDialog.qml
@@ -9,12 +9,11 @@ Dialog {
     id: control
     title: model.itemUniqueName
 
-    width: Math.max(detailsLayout.implicitWidth, footer.implicitWidth)
+    // width: Math.max(detailsLayout.implicitWidth, footer.implicitWidth)
 
     x: (parent.width - width) / 2
     y: (parent.height - height) / 2
     modal: true
-    padding: FishUI.Units.largeSpacing * 2
 
     signal forgetBtnClicked()
 
@@ -31,10 +30,9 @@ Dialog {
         }
     }
 
-    ColumnLayout {
+    contentItem: ColumnLayout {
         id: detailsLayout
-        // I couldn't find a way of making the GridLayout resize.
-        anchors.centerIn: parent
+        spacing: FishUI.Units.largeSpacing
 
         GridLayout {
             id: gridLayout
@@ -46,6 +44,7 @@ Dialog {
                 id: autoJoinLabel
                 text: qsTr("Auto-Join")
                 visible: false
+                Layout.alignment: Qt.AlignRight
                 color: FishUI.Theme.disabledTextColor
             }
 
@@ -61,6 +60,7 @@ Dialog {
             Label {
                 text: qsTr("Security")
                 color: FishUI.Theme.disabledTextColor
+                Layout.alignment: Qt.AlignRight
             }
 
             Label {
@@ -72,6 +72,7 @@ Dialog {
             Label {
                 text: qsTr("Signal")
                 color: FishUI.Theme.disabledTextColor
+                Layout.alignment: Qt.AlignRight
             }
 
             Label {
@@ -83,23 +84,27 @@ Dialog {
             Label {
                 text: qsTr("IPv4 Address")
                 color: FishUI.Theme.disabledTextColor
+                Layout.alignment: Qt.AlignRight
             }
 
             Label {
                 id: ipv4AddressLabel
                 // text: model.ipV4Address
                 Layout.alignment: Qt.AlignRight
+                Layout.fillWidth: true
             }
 
             Label {
                 font.bold: true
                 text: qsTr("IPv6 Address")
                 color: FishUI.Theme.disabledTextColor
+                Layout.alignment: Qt.AlignRight
             }
 
             Label {
                 id: ipV6AddressLabel
                 // text: model.ipV6Address
+                Layout.fillWidth: true
                 Layout.alignment: Qt.AlignRight
             }
 
@@ -107,11 +112,13 @@ Dialog {
                 font.bold: true
                 text: qsTr("MAC Address")
                 color: FishUI.Theme.disabledTextColor
+                Layout.alignment: Qt.AlignRight
             }
 
             Label {
                 id: macAddressLabel
                 // text: model.macAddress
+                Layout.fillWidth: true
                 Layout.alignment: Qt.AlignRight
             }
 
@@ -119,6 +126,7 @@ Dialog {
                 font.bold: true
                 text: qsTr("Gateway")
                 color: FishUI.Theme.disabledTextColor
+                Layout.alignment: Qt.AlignRight
             }
 
             Label {
@@ -131,6 +139,7 @@ Dialog {
                 font.bold: true
                 text: qsTr("DNS")
                 color: FishUI.Theme.disabledTextColor
+                Layout.alignment: Qt.AlignRight
             }
 
             Label {
@@ -139,24 +148,22 @@ Dialog {
                 Layout.alignment: Qt.AlignRight
             }
         }
-    }
 
-    footer: DialogButtonBox {
-        padding: FishUI.Units.largeSpacing * 2
+        RowLayout {
+            id: footerLayout
 
-        Button {
-            text: qsTr("Close")
-            Layout.alignment: Qt.AlignHCenter
-            DialogButtonBox.buttonRole: DialogButtonBox.RejectRole
-            onClicked: control.reject()
-        }
+            Button {
+                text: qsTr("Close")
+                Layout.fillWidth: true
+                onClicked: control.reject()
+            }
 
-        Button {
-            text: qsTr("Forget this network")
-            Layout.alignment: Qt.AlignHCenter
-            DialogButtonBox.buttonRole: DialogButtonBox.AcceptRole
-            onClicked: {
-                networking.removeConnection(model.connectionPath)
+            Button {
+                text: qsTr("Forget this network")
+                Layout.fillWidth: true
+                onClicked: {
+                    networking.removeConnection(model.connectionPath)
+                }
             }
         }
     }