diff --git a/JellyfinPlayer tvOS/Views/ServerListView.swift b/JellyfinPlayer tvOS/Views/ServerListView.swift
index b6be5412..8b466bcf 100644
--- a/JellyfinPlayer tvOS/Views/ServerListView.swift	
+++ b/JellyfinPlayer tvOS/Views/ServerListView.swift	
@@ -42,8 +42,11 @@ struct ServerListView: View {
                                     .font(.footnote)
                                     .foregroundColor(.primary)
                             }
+                            
+                            Spacer()
                         }
                     }
+                    .padding([.leading, .trailing], 100)
                     .contextMenu {
                         Button(role: .destructive) {
                             viewModel.remove(server: server)
@@ -53,8 +56,9 @@ struct ServerListView: View {
                     }
                 }
             }
+            .padding(.top, 50)
         }
-        .padding(.top, 100)
+        .padding(.top, 50)
     }
     
     @ViewBuilder
@@ -83,7 +87,6 @@ struct ServerListView: View {
                 .offset(y: -50)
         } else {
             listView
-                .frame(width: 3000)
         }
     }
     
@@ -117,7 +120,6 @@ struct ServerListView: View {
     
     var body: some View {
         innerBody
-            .frame(width: 1500)
         .navigationTitle("Servers")
         .toolbar {
             ToolbarItemGroup(placement: .navigationBarTrailing) {
@@ -129,11 +131,3 @@ struct ServerListView: View {
         }
     }
 }
-
-struct ContentView_Previews: PreviewProvider {
-    static var previews: some View {
-        NavigationView {
-            ServerListView(viewModel: ServerListViewModel())
-        }
-    }
-}
diff --git a/JellyfinPlayer tvOS/Views/UserListView.swift b/JellyfinPlayer tvOS/Views/UserListView.swift
index 9937feb4..a35a21e2 100644
--- a/JellyfinPlayer tvOS/Views/UserListView.swift	
+++ b/JellyfinPlayer tvOS/Views/UserListView.swift	
@@ -22,29 +22,18 @@ struct UserListView: View {
                     Button {
                         viewModel.login(user: user)
                     } label: {
-                        ZStack(alignment: Alignment.leading) {
-                            Rectangle()
-                                .foregroundColor(Color.secondarySystemFill)
-                                .frame(height: 70)
-                                .cornerRadius(10)
+                        HStack {
+                            Text(user.username)
+                                .font(.title2)
                             
-                            HStack {
-                                Image(systemName: "person.crop.circle.fill")
-                                    .font(.system(size: 46))
-                                    .foregroundColor(.primary)
-                                
-                                Text(user.username)
-                                    .font(.title2)
-                                
-                                Spacer()
-                                
-                                if viewModel.isLoading {
-                                    ProgressView()
-                                }
-                            }.padding(.leading)
+                            Spacer()
+                            
+                            if viewModel.isLoading {
+                                ProgressView()
+                            }
                         }
-                        .padding()
                     }
+                    .padding([.leading, .trailing], 100)
                     .contextMenu {
                         Button(role: .destructive) {
                             viewModel.remove(user: user)
@@ -54,33 +43,27 @@ struct UserListView: View {
                     }
                 }
             }
+            .padding(.top, 50)
         }
+        .padding(.top, 50)
     }
     
     @ViewBuilder
     private var noUserView: some View {
         VStack {
             Text("Sign in to get started")
-                .frame(minWidth: 50, maxWidth: 240)
+                .frame(minWidth: 50, maxWidth: 500)
                 .multilineTextAlignment(.center)
+                .font(.callout)
             
             Button {
                 userListRouter.route(to: \.userSignIn, viewModel.server)
             } label: {
-                ZStack {
-                    Rectangle()
-                        .foregroundColor(Color.jellyfinPurple)
-                        .frame(maxWidth: 500, maxHeight: 50)
-                        .frame(height: 50)
-                        .cornerRadius(10)
-                        .padding([.leading, .trailing], 30)
-                        .padding([.top, .bottom], 20)
-                    
-                    Text("Sign in")
-                        .foregroundColor(Color.white)
-                        .bold()
-                }
+                Text("Sign in")
+                    .bold()
+                    .font(.callout)
             }
+            .padding(.top, 40)
         }
     }
     
diff --git a/Shared/ViewModels/LibraryListViewModel.swift b/Shared/ViewModels/LibraryListViewModel.swift
index f352f686..a95c429f 100644
--- a/Shared/ViewModels/LibraryListViewModel.swift
+++ b/Shared/ViewModels/LibraryListViewModel.swift
@@ -24,7 +24,7 @@ final class LibraryListViewModel: ViewModel {
     }
 
     func requestLibraries() {
-        UserViewsAPI.getUserViews(userId: SessionManager.main.currentLogin.user.id ?? "val was nil")
+        UserViewsAPI.getUserViews(userId: SessionManager.main.currentLogin.user.id)
             .trackActivity(loading)
             .sink(receiveCompletion: { completion in
                 self.handleAPIRequestError(completion: completion)