diff --git a/app/src/main/java/com/example/composesigninsample/MainActivity.kt b/app/src/main/java/com/example/composesigninsample/MainActivity.kt
index 4cbecd8..fd049e0 100644
--- a/app/src/main/java/com/example/composesigninsample/MainActivity.kt
+++ b/app/src/main/java/com/example/composesigninsample/MainActivity.kt
@@ -4,17 +4,26 @@ import android.app.Application
 import android.content.Context
 import android.content.SharedPreferences
 import android.os.Bundle
+import android.os.Handler
+import android.os.Looper
 import android.preference.PreferenceManager
 import androidx.activity.ComponentActivity
 import androidx.activity.compose.setContent
+import androidx.compose.foundation.layout.Box
 import androidx.compose.foundation.layout.Column
+import androidx.compose.foundation.layout.Spacer
+import androidx.compose.foundation.layout.fillMaxSize
+import androidx.compose.foundation.layout.height
+import androidx.compose.foundation.layout.padding
 import androidx.compose.material.*
 import androidx.compose.runtime.*
 import androidx.compose.runtime.saveable.rememberSaveable
-import androidx.compose.ui.text.TextStyle
+import androidx.compose.ui.Alignment
+import androidx.compose.ui.Modifier
+import androidx.compose.ui.text.style.TextAlign
+import androidx.compose.ui.unit.dp
 import androidx.hilt.navigation.compose.hiltViewModel
 import androidx.lifecycle.ViewModel
-import androidx.navigation.NavController
 import androidx.navigation.compose.NavHost
 import androidx.navigation.compose.composable
 import androidx.navigation.compose.rememberNavController
@@ -37,7 +46,9 @@ class MainActivity : ComponentActivity() {
         setContent {
             ComposeSignInSampleTheme {
                 Surface(color = MaterialTheme.colors.background) {
-                    AppRouter()
+                    Box(modifier = Modifier.fillMaxSize(), contentAlignment = Alignment.Center) {
+                        AppRouter()
+                    }
                 }
             }
         }
@@ -49,11 +60,35 @@ fun AppRouter() {
     val navController = rememberNavController()
     NavHost(navController = navController, startDestination = Screen.HomeScreen.route) {
         composable(Screen.HomeScreen.route) {
-            HomeScreen({
-                navController.navigate(Screen.SignInScreen.route)
-            })
+            val homeViewModel: HomeViewModel = hiltViewModel()
+
+            HomeScreen(
+                navigateToSignIn = {
+                    navController.navigate(Screen.SignInScreen.route) {
+                        popUpTo(Screen.HomeScreen.route) {
+                            inclusive = true
+                        }
+                    }
+                },
+                signOut = homeViewModel::signOut,
+                isSignedIn = homeViewModel.loggedInState,
+            )
+        }
+        composable(Screen.SignInScreen.route) {
+            val signInViewModel: SignInViewModel = hiltViewModel()
+
+            SignInScreen(
+                navigateToHome = {
+                    navController.navigate(Screen.HomeScreen.route) {
+                        popUpTo(Screen.SignInScreen.route) {
+                            inclusive = true
+                        }
+                    }
+                },
+                setLoggedIn = signInViewModel::signIn,
+                isSignedIn = signInViewModel.loggedInState,
+            )
         }
-        composable(Screen.SignInScreen.route) { SignInScreen({ navController.popBackStack() }) }
     }
 }
 
@@ -62,17 +97,14 @@ sealed class Screen(val route: String) {
     object SignInScreen : Screen("signin")
 }
 
-/**
- * SignIn Screen and ViewModel
- */
 @Composable
-fun SignInScreen(loggedOutEvent: () -> Unit, viewModel: SignInViewModel = hiltViewModel()) {
-    if (viewModel.loggedInState) {
-        LaunchedEffect(Unit) {
-            loggedOutEvent()
-        }
-    } else {
-        Column {
+fun SignInScreen(
+    navigateToHome: () -> Unit,
+    setLoggedIn: () -> Unit,
+    isSignedIn: Boolean,
+) {
+    if(!isSignedIn) {
+        Column(horizontalAlignment = Alignment.CenterHorizontally) {
             var text by rememberSaveable { mutableStateOf("") }
 
             TextField(
@@ -81,6 +113,9 @@ fun SignInScreen(loggedOutEvent: () -> Unit, viewModel: SignInViewModel = hiltVi
                 label = { Text("Email") },
                 singleLine = true
             )
+
+            Spacer(modifier = Modifier.height(8.dp))
+
             var text2 by rememberSaveable { mutableStateOf("") }
 
             TextField(
@@ -89,12 +124,27 @@ fun SignInScreen(loggedOutEvent: () -> Unit, viewModel: SignInViewModel = hiltVi
                 label = { Text("Password") },
                 singleLine = true
             )
+
+            Spacer(modifier = Modifier.height(24.dp))
+
             Text(text = "Welcome to the app. Sign in to begin")
-            Button(onClick = viewModel::signIn) {
+
+            Spacer(modifier = Modifier.height(8.dp))
+
+            Button(onClick = setLoggedIn) {
                 Text(text = "Sign In")
             }
         }
     }
+
+    DisposableEffect(key1 = isSignedIn, effect = {
+        if (isSignedIn) {
+            navigateToHome()
+        }
+
+        onDispose {
+        }
+    })
 }
 
 @HiltViewModel
@@ -109,22 +159,26 @@ class SignInViewModel @Inject constructor(
     }
 }
 
-/**
- * Home Screen and ViewModel
- */
 @Composable
-fun HomeScreen(navigateHome: () -> Unit, homeViewModel: HomeViewModel = hiltViewModel()) {
-    if (homeViewModel.loggedInState) {
-        Column {
-            Text(style = Typography.h1, text = "You are on the home screen!")
+fun HomeScreen(navigateToSignIn: () -> Unit, signOut: () -> Unit, isSignedIn: Boolean) {
+    if (isSignedIn) {
+        Column(horizontalAlignment = Alignment.CenterHorizontally, modifier = Modifier.padding(16.dp)) {
+            Text(style = Typography.h1, text = "You are on the home screen!", textAlign = TextAlign.Center)
+            Spacer(modifier = Modifier.height(8.dp))
             Text(style = Typography.body1, text = "Only for super secret signed in users only!")
-            Button(onClick = homeViewModel::signOut) {
+            Spacer(modifier = Modifier.height(16.dp))
+            Button(onClick = signOut) {
                 Text(text = "Sign Out")
             }
         }
-    } else {
-        LaunchedEffect(Unit) {
-            navigateHome()
+    }
+
+    DisposableEffect(isSignedIn) {
+        if (!isSignedIn) {
+            navigateToSignIn()
+        }
+
+        onDispose {
         }
     }
 }
@@ -139,7 +193,6 @@ class HomeViewModel @Inject constructor(
         prefs.edit().putBoolean("authenticated", false).commit()
         loggedInState = false
     }
-
 }
 
 /**