diff --git a/app/src/main/java/de/lelehier/keeper/screens/home_screen.kt b/app/src/main/java/de/lelehier/keeper/screens/home_screen.kt
index 374e3f3..e05c5b6 100644
--- a/app/src/main/java/de/lelehier/keeper/screens/home_screen.kt
+++ b/app/src/main/java/de/lelehier/keeper/screens/home_screen.kt
@@ -11,6 +11,7 @@ import androidx.compose.animation.fadeIn
 import androidx.compose.animation.fadeOut
 import androidx.compose.animation.togetherWith
 import androidx.compose.foundation.layout.Arrangement
+import androidx.compose.foundation.layout.Box
 import androidx.compose.foundation.layout.Column
 import androidx.compose.foundation.layout.PaddingValues
 import androidx.compose.foundation.layout.Row
@@ -64,7 +65,7 @@ fun HomeScreen(paddingValues: PaddingValues) {
             .padding(paddingValues)
             .fillMaxSize()
             .imePadding()
-            .padding(all = 56.dp),
+            .padding(start = 56.dp, end = 56.dp),
         horizontalAlignment = Alignment.CenterHorizontally,
         verticalArrangement = Arrangement.Center) {
         Greeting(serverURL, currentScreen);
@@ -84,39 +85,42 @@ fun HomeScreen(paddingValues: PaddingValues) {
         }
         }
 
-        Row (
-            horizontalArrangement = Arrangement.SpaceBetween
-        ) {
-            AnimatedVisibility(currentScreen == "passwordDialog") {
-                OutlinedButton (
-                    onClick = {currentScreen = "serverDialog"},
+        AnimatedVisibility(currentScreen == "passwordDialog" || currentScreen == "apiDialog") {
+            Row(
+                horizontalArrangement = Arrangement.SpaceBetween
+            ) {
+                OutlinedButton(
+                    onClick = { currentScreen = "serverDialog" },
                     modifier = Modifier.padding(top = 24.dp)
                 ) {
                     Row() {
                         Text(text = "Change Server")
                     }
                 }
-            }
-            Spacer(modifier = Modifier.width(12.dp))
-            AnimatedVisibility(currentScreen == "passwordDialog") {
-                OutlinedButton (
+                Spacer(modifier = Modifier.width(12.dp))
+                OutlinedButton(
                     onClick = {
-                        when(currentScreen) {
-                            "passwordDialog" -> {currentScreen = "apiDialog"}
-                            "apidialog" -> {currentScreen = "passwordDialog"}
+                        when (currentScreen) {
+                            "passwordDialog" -> {
+                                currentScreen = "apiDialog"
+                            }
+
+                            "apidialog" -> {
+                                currentScreen = "passwordDialog"
+                            }
                         }
                     },
                     modifier = Modifier.padding(top = 24.dp)
                 ) {
                     Row() {
-                        when(currentScreen) {
+                        when (currentScreen) {
                             "passwordDialog" -> Text(text = "Use API Key")
                             "apiDialog" -> Text(text = "Use Password")
                         }
                     }
                 }
             }
-            }
+        }
         Button(
             onClick = {when(currentScreen) {
                 "serverDialog" -> currentScreen = "passwordDialog"
@@ -124,7 +128,8 @@ fun HomeScreen(paddingValues: PaddingValues) {
                 "apiDialog" -> currentScreen = "loadingDialog"
                 "loadingDialog" -> currentScreen = "loadingDialog"
             }},
-            modifier = Modifier.padding(top = 24.dp)
+            modifier = Modifier
+                .padding(top = 24.dp)
                 .fillMaxWidth()
                 .height(128.dp),
             enabled = when(currentScreen) {