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 97a6e43..8a8dbc0 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
@@ -21,7 +21,6 @@ import androidx.compose.foundation.layout.padding
 import androidx.compose.foundation.text.KeyboardOptions
 import androidx.compose.material3.Button
 import androidx.compose.material3.MaterialTheme
-import androidx.compose.material3.OutlinedButton
 import androidx.compose.material3.OutlinedTextField
 import androidx.compose.material3.Text
 import androidx.compose.runtime.Composable
@@ -68,34 +67,22 @@ fun HomeScreen(paddingValues: PaddingValues) {
             },
 
         ) { targetState -> when(targetState) {
-            0 -> ServerDialog(serverURL, {newServerURL -> serverURL = newServerURL })
-            1 -> PasswordDialog(username, password, {newUsername ->  username = newUsername}, {newPassword -> password = newPassword  })
+            0 -> serverDialog(serverURL, {newServerURL -> serverURL = newServerURL })
+            1 -> passwordDialog(username, password, {newUsername ->  username = newUsername}, {newPassword -> password = newPassword  })
         }
         }
 
-        Row {
-            AnimatedVisibility(currentScreen == 1) {
-                OutlinedButton (
-                    onClick = {currentScreen = nextScreen},
-                    modifier = Modifier.padding(top = 24.dp)
-                ) {
-                    Row() {
-                        Text(text = "Use API Key")
-                    }
-                }
-            }
-            Button(
-                onClick = {currentScreen = nextScreen},
-                modifier = Modifier.padding(top = 24.dp),
-                enabled = when(currentScreen) {
-                    0 -> isValidUrl(serverURL)
-                    1 -> username.isNotEmpty() && password.isNotEmpty()
-                    else -> false
-                },
+        Button(
+            onClick = {currentScreen = nextScreen},
+            modifier = Modifier.padding(top = 24.dp),
+            enabled = when(currentScreen) {
+                0 -> isValidUrl(serverURL)
+                1 -> username.isNotEmpty() && password.isNotEmpty()
+                else -> false
+            },
             ) {
-                Row() {
-                    Text(text = "Next")
-                }
+            Row() {
+                Text(text = "Next")
             }
         }
     }
@@ -132,15 +119,15 @@ fun Greeting(serverURL: String, currentScreen: Int) {
 
 
 @Composable
-fun ServerDialog(serverURL: String, updateServerURL: (newServerURL: String) -> Unit) {
-    var dialogServerURL by remember { mutableStateOf("") }
+fun serverDialog(serverURL: String, updateServerURL: (newServerURL: String) -> Unit) {
+    var serverURL by remember { mutableStateOf("") }
     OutlinedTextField(
         label = { Text(text = "Server URL") },
         textStyle = MaterialTheme.typography.bodySmall,
         value = serverURL,
         onValueChange = { text ->
-            dialogServerURL = text
-            updateServerURL(dialogServerURL)
+            serverURL = text
+            updateServerURL(serverURL)
         },
         keyboardOptions = KeyboardOptions(keyboardType = KeyboardType.Uri),
         supportingText = {
@@ -165,25 +152,25 @@ fun isValidUrl(url: String): Boolean {
 }
 
 @Composable
-fun PasswordDialog(username: String, password: String, updateUsername: (newUsername: String) -> Unit, updatePassword: (newPassword: String) -> Unit) {
-    var dialogUsername by remember { mutableStateOf("") }
-    var dialogPassword by remember { mutableStateOf("") }
+fun passwordDialog(username: String, password: String, updateUsername: (newUsername: String) -> Unit, updatePassword: (newPassword: String) -> Unit) {
+    var username by remember { mutableStateOf("") }
+    var password by remember { mutableStateOf("") }
     Column {
         OutlinedTextField(
             label = { Text(text = "Username") },
             textStyle = MaterialTheme.typography.bodySmall,
             value = username,
             onValueChange = { text ->
-                dialogUsername = text
-                updateUsername(dialogUsername)
+                username = text
+                updateUsername(username)
             });
         OutlinedTextField(
             label = { Text(text = "Password") },
             textStyle = MaterialTheme.typography.bodySmall,
             value = password,
             onValueChange = { text ->
-                dialogPassword = text
-                updatePassword(dialogPassword)
+                password = text
+                updatePassword(password)
             }
         )