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 e05c5b6..84c6162 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
@@ -70,6 +70,7 @@ fun HomeScreen(paddingValues: PaddingValues) {
         verticalArrangement = Arrangement.Center) {
         Greeting(serverURL, currentScreen);
         AnimatedContent(
+            modifier = Modifier.padding(bottom = 24.dp),
             targetState = currentScreen,
             transitionSpec = {
                 fadeIn(
@@ -87,11 +88,13 @@ fun HomeScreen(paddingValues: PaddingValues) {
 
         AnimatedVisibility(currentScreen == "passwordDialog" || currentScreen == "apiDialog") {
             Row(
+                modifier = Modifier.padding(bottom = 12.dp)
+                    .fillMaxWidth(),
                 horizontalArrangement = Arrangement.SpaceBetween
             ) {
                 OutlinedButton(
                     onClick = { currentScreen = "serverDialog" },
-                    modifier = Modifier.padding(top = 24.dp)
+                    modifier = Modifier.weight(1f)
                 ) {
                     Row() {
                         Text(text = "Change Server")
@@ -99,6 +102,7 @@ fun HomeScreen(paddingValues: PaddingValues) {
                 }
                 Spacer(modifier = Modifier.width(12.dp))
                 OutlinedButton(
+                    modifier = Modifier.weight(1f),
                     onClick = {
                         when (currentScreen) {
                             "passwordDialog" -> {
@@ -110,7 +114,6 @@ fun HomeScreen(paddingValues: PaddingValues) {
                             }
                         }
                     },
-                    modifier = Modifier.padding(top = 24.dp)
                 ) {
                     Row() {
                         when (currentScreen) {
@@ -129,9 +132,8 @@ fun HomeScreen(paddingValues: PaddingValues) {
                 "loadingDialog" -> currentScreen = "loadingDialog"
             }},
             modifier = Modifier
-                .padding(top = 24.dp)
                 .fillMaxWidth()
-                .height(128.dp),
+                .height(96.dp),
             enabled = when(currentScreen) {
                 "serverDialog" -> isValidUrl(serverURL)
                 "passwordDialog" -> username.isNotEmpty() && password.isNotEmpty()