diff --git a/gui/main.qml b/gui/main.qml
index 2ee34c3..31515d8 100644
--- a/gui/main.qml
+++ b/gui/main.qml
@@ -354,6 +354,20 @@ ApplicationWindow {
             // --- Session ---
             Label { text: "Session"; font.bold: true; font.pointSize: theme.fontSize > 0 ? theme.fontSize + 1 : Qt.application.font.pointSize + 1 }
 
+            // Name
+            RowLayout {
+                Layout.fillWidth: true
+                Label { text: "Name:"; Layout.preferredWidth: 80 }
+                TextField {
+                    id: nameField
+                    Layout.fillWidth: true
+                    placeholderText: "(auto-generated)"
+                }
+            }
+
+            // --- Agent ---
+            Label { text: "Agent"; font.bold: true; font.pointSize: theme.fontSize > 0 ? theme.fontSize + 1 : Qt.application.font.pointSize + 1 }
+
             // Directory
             RowLayout {
                 Layout.fillWidth: true
@@ -374,17 +388,6 @@ ApplicationWindow {
                 }
             }
 
-            // Name
-            RowLayout {
-                Layout.fillWidth: true
-                Label { text: "Name:"; Layout.preferredWidth: 80 }
-                TextField {
-                    id: nameField
-                    Layout.fillWidth: true
-                    placeholderText: "(auto-generated)"
-                }
-            }
-
             // Backend
             RowLayout {
                 Layout.fillWidth: true
@@ -418,21 +421,7 @@ ApplicationWindow {
                 }
             }
 
-            // Remote
-            RowLayout {
-                Layout.fillWidth: true
-                Label { text: "Remote:"; Layout.preferredWidth: 80 }
-                TextField {
-                    id: remoteField
-                    Layout.fillWidth: true
-                    placeholderText: "user@host:port"
-                }
-            }
-
-            // --- Agent ---
-            Label { text: "Agent"; font.bold: true; font.pointSize: theme.fontSize > 0 ? theme.fontSize + 1 : Qt.application.font.pointSize + 1 }
-
-            // Agent profile
+            // Profile
             RowLayout {
                 Layout.fillWidth: true
                 Label { text: "Profile:"; Layout.preferredWidth: 80 }
@@ -445,7 +434,7 @@ ApplicationWindow {
                 }
             }
 
-            // Agent Name
+            // Alias
             RowLayout {
                 Layout.fillWidth: true
                 Label { text: "Alias:"; Layout.preferredWidth: 80 }
@@ -456,6 +445,17 @@ ApplicationWindow {
                 }
             }
 
+            // Remote
+            RowLayout {
+                Layout.fillWidth: true
+                Label { text: "Remote:"; Layout.preferredWidth: 80 }
+                TextField {
+                    id: remoteField
+                    Layout.fillWidth: true
+                    placeholderText: "user@host:port"
+                }
+            }
+
             Component.onCompleted: {
                 if (!ollie.rootBackendsLoaded) ollie.loadRootBackends()
                 if (!ollie.rootAgentsLoaded) ollie.loadRootAgents()