diff --git a/Shared/WriteFreely_MultiPlatformApp.swift b/Shared/WriteFreely_MultiPlatformApp.swift
index 84a24d8..5eff6b7 100644
--- a/Shared/WriteFreely_MultiPlatformApp.swift
+++ b/Shared/WriteFreely_MultiPlatformApp.swift
@@ -1,29 +1,50 @@
 import SwiftUI
 
 @main
 struct WriteFreely_MultiPlatformApp: App {
     @StateObject private var preferences = PreferencesModel()
     @StateObject private var account = AccountModel()
+    @State private var selectedTab = 0
 
     #if DEBUG
     @StateObject private var store = testPostStore
     #else
     @StateObject private var store = PostStore()
     #endif
 
     var body: some Scene {
         WindowGroup {
             ContentView(postStore: store, preferences: preferences, account: account)
                 .preferredColorScheme(preferences.preferredColorScheme)
         }
 
         #if os(macOS)
         Settings {
-            SettingsView(preferences: preferences, account: account)
-                .frame(minWidth: 300, maxWidth: 300, minHeight: 200, maxHeight: 200)
-                .padding()
-                .preferredColorScheme(preferences.preferredColorScheme)
+            TabView(selection: $selectedTab) {
+                Form {
+                    Section(header: Text("Login Details")) {
+                        AccountView(account: account)
+                    }
+                }
+                .tabItem {
+                    Image(systemName: "person.crop.circle")
+                    Text("Account")
+                }
+                .tag(0)
+                VStack {
+                    PreferencesView(preferences: preferences)
+                    Spacer()
+                }
+                .tabItem {
+                    Image(systemName: "gear")
+                    Text("Preferences")
+                }
+                .tag(1)
+            }
+            .frame(minWidth: 300, maxWidth: 300, minHeight: 200, maxHeight: 200)
+            .padding()
+            .preferredColorScheme(preferences.preferredColorScheme)
         }
         #endif
     }
 }
diff --git a/WriteFreely-MultiPlatform.xcodeproj/xcuserdata/angelo.xcuserdatad/xcschemes/xcschememanagement.plist b/WriteFreely-MultiPlatform.xcodeproj/xcuserdata/angelo.xcuserdatad/xcschemes/xcschememanagement.plist
index 6cd8075..2723ebe 100644
--- a/WriteFreely-MultiPlatform.xcodeproj/xcuserdata/angelo.xcuserdatad/xcschemes/xcschememanagement.plist
+++ b/WriteFreely-MultiPlatform.xcodeproj/xcuserdata/angelo.xcuserdatad/xcschemes/xcschememanagement.plist
@@ -1,19 +1,19 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
 <plist version="1.0">
 <dict>
 	<key>SchemeUserState</key>
 	<dict>
 		<key>WriteFreely-MultiPlatform (iOS).xcscheme_^#shared#^_</key>
 		<dict>
 			<key>orderHint</key>
-			<integer>1</integer>
+			<integer>0</integer>
 		</dict>
 		<key>WriteFreely-MultiPlatform (macOS).xcscheme_^#shared#^_</key>
 		<dict>
 			<key>orderHint</key>
-			<integer>0</integer>
+			<integer>1</integer>
 		</dict>
 	</dict>
 </dict>
 </plist>