diff --git a/launcher/ui/Main.qml b/launcher/ui/Main.qml
index 1c04d01..e4f6fc2 100644
--- a/launcher/ui/Main.qml
+++ b/launcher/ui/Main.qml
@@ -21,9 +21,11 @@ Kirigami.ApplicationWindow {
 
     property bool checkedAutoLogin: false
 
-    pageStack.initialPage: Kirigami.Page {
-        Kirigami.LoadingPlaceholder {
-            anchors.centerIn: parent
+    pageStack {
+        initialPage: Kirigami.Page {
+            Kirigami.LoadingPlaceholder {
+                anchors.centerIn: parent
+            }
         }
     }
 
@@ -56,7 +58,7 @@ Kirigami.ApplicationWindow {
                 pageStack.layers.replace(Qt.createComponent("zone.xiv.astra", "AutoLoginPage"))
                 checkedAutoLogin = true;
             } else {
-                pageStack.layers.replace(Qt.createComponent("zone.xiv.astra", "MainPage"))
+                pageStack.replace(Qt.createComponent("zone.xiv.astra", "MainPage"))
             }
         }
     }
diff --git a/launcher/ui/Pages/LoginPage.qml b/launcher/ui/Pages/LoginPage.qml
index c73b2db..dc11c53 100644
--- a/launcher/ui/Pages/LoginPage.qml
+++ b/launcher/ui/Pages/LoginPage.qml
@@ -274,32 +274,5 @@ QQC2.Control {
                 onClicked: applicationWindow().openUrl('https://secure.square-enix.com/account/app/svc/reminder')
             }
         }
-
-        FormCard.FormCard {
-            maximumWidth: Kirigami.Units.gridUnit * 25
-
-            Layout.fillWidth: true
-
-            FormCard.FormButtonDelegate {
-                id: serverStatusButton
-
-                text: i18n("Server Status")
-                icon.name: "cloudstatus"
-                onClicked: applicationWindow().openUrl('https://na.finalfantasyxiv.com/lodestone/worldstatus/')
-            }
-
-            FormCard.FormDelegateSeparator {
-                above: serverStatusButton
-                below: settingsButton
-            }
-
-            FormCard.FormButtonDelegate {
-                id: settingsButton
-
-                text: i18n("Settings")
-                icon.name: "configure"
-                onClicked: applicationWindow().pushDialogLayer(Qt.createComponent("zone.xiv.astra", "SettingsPage"))
-            }
-        }
     }
 }
\ No newline at end of file
diff --git a/launcher/ui/Pages/MainPage.qml b/launcher/ui/Pages/MainPage.qml
index b4fd2e7..b16efdc 100644
--- a/launcher/ui/Pages/MainPage.qml
+++ b/launcher/ui/Pages/MainPage.qml
@@ -14,18 +14,37 @@ Kirigami.Page {
 
     title: i18n("Home")
 
-    globalToolBarStyle: Kirigami.ApplicationHeaderStyle.None
-
-    topPadding: Kirigami.Units.largeSpacing
-    leftPadding: Kirigami.Units.largeSpacing
-    rightPadding: Kirigami.Units.largeSpacing
+    topPadding: 0
+    leftPadding: 0
+    rightPadding: 0
     bottomPadding: 0
 
+    actions: [
+        Kirigami.Action {
+            text: i18nc("@action:button", "Server Status")
+            icon.name: "cloudstatus"
+            onTriggered: applicationWindow().openUrl('https://na.finalfantasyxiv.com/lodestone/worldstatus/')
+        },
+        Kirigami.Action {
+            text: i18nc("@action:button", "Settings")
+            icon.name: "configure"
+            onTriggered: applicationWindow().pushDialogLayer(Qt.createComponent("zone.xiv.astra", "SettingsPage"))
+        }
+    ]
+
     RowLayout {
         anchors.fill: parent
 
         spacing: Kirigami.Units.largeSpacing
 
+        LoginPage {
+            id: loginPage
+
+            Layout.alignment: Qt.AlignTop | Qt.AlignHCenter
+            Layout.minimumWidth: LauncherCore.settings.showNews ? Kirigami.Units.gridUnit * 26 : 0
+            Layout.fillWidth: !LauncherCore.settings.showNews
+        }
+
         Loader {
             active: LauncherCore.settings.showNews
 
@@ -41,13 +60,5 @@ Kirigami.Page {
                 }
             }
         }
-
-        LoginPage {
-            id: loginPage
-
-            Layout.alignment: Qt.AlignTop | Qt.AlignHCenter
-            Layout.minimumWidth: LauncherCore.settings.showNews ? Kirigami.Units.gridUnit * 26 : 0
-            Layout.fillWidth: !LauncherCore.settings.showNews
-        }
     }
 }
\ No newline at end of file