diff --git a/app/src/main/java/org/fnives/test/showcase/compose/screen/AppNavigation.kt b/app/src/main/java/org/fnives/test/showcase/compose/screen/AppNavigation.kt
index b5ae528..076011b 100644
--- a/app/src/main/java/org/fnives/test/showcase/compose/screen/AppNavigation.kt
+++ b/app/src/main/java/org/fnives/test/showcase/compose/screen/AppNavigation.kt
@@ -6,6 +6,7 @@ import androidx.compose.runtime.Composable
 import androidx.compose.runtime.LaunchedEffect
 import androidx.compose.ui.Modifier
 import androidx.compose.ui.platform.testTag
+import androidx.navigation.NavOptions
 import androidx.navigation.compose.NavHost
 import androidx.navigation.compose.composable
 import androidx.navigation.compose.rememberNavController
@@ -24,34 +25,53 @@ fun AppNavigation(isUserLogeInUseCase: IsUserLoggedInUseCase = get()) {
 
     LaunchedEffect(isUserLogeInUseCase) {
         delay(500)
-        navController.navigate(if (isUserLogeInUseCase.invoke()) "Home" else "Auth")
+        navController.navigate(
+            route = if (isUserLogeInUseCase.invoke()) RouteTag.HOME else RouteTag.AUTH,
+            navOptions = NavOptions.Builder().setPopUpTo(route = RouteTag.SPLASH, inclusive = true).build()
+        )
     }
 
     NavHost(
         navController,
-        startDestination = "Splash",
+        startDestination = RouteTag.SPLASH,
         modifier = Modifier.background(MaterialTheme.colors.surface)
     ) {
-        composable("Splash") { SplashScreen() }
-        composable("Auth") {
+        composable(RouteTag.SPLASH) { SplashScreen() }
+        composable(RouteTag.AUTH) {
             AuthScreen(
                 modifier = Modifier.testTag(AppNavigationTag.AuthScreen),
                 authScreenState = rememberAuthScreenState(
-                    onLoginSuccess = { navController.navigate("Home") }
+                    onLoginSuccess = {
+                        navController.navigate(
+                            route = RouteTag.HOME,
+                            navOptions = NavOptions.Builder().setPopUpTo(route = RouteTag.AUTH, inclusive = true).build()
+                        )
+                    }
                 )
             )
         }
-        composable("Home") {
+        composable(RouteTag.HOME) {
             HomeScreen(
                 modifier = Modifier.testTag(AppNavigationTag.HomeScreen),
                 homeScreenState = rememberHomeScreenState(
-                    onLogout = { navController.navigate("Auth") }
+                    onLogout = {
+                        navController.navigate(
+                            route = RouteTag.AUTH,
+                            navOptions = NavOptions.Builder().setPopUpTo(route = RouteTag.HOME, inclusive = true).build()
+                        )
+                    }
                 )
             )
         }
     }
 }
 
+object RouteTag {
+    const val HOME = "Home"
+    const val AUTH = "Auth"
+    const val SPLASH = "Splash"
+}
+
 object AppNavigationTag {
     const val AuthScreen = "AppNavigationTag.AuthScreen"
     const val HomeScreen = "AppNavigationTag.HomeScreen"
diff --git a/detekt/detekt.yml b/detekt/detekt.yml
index 6e6c0df..4797b6e 100644
--- a/detekt/detekt.yml
+++ b/detekt/detekt.yml
@@ -279,7 +279,7 @@ formatting:
     active: false
     autoCorrect: true
     indentSize: 4
-    maxLineLength: 120
+    maxLineLength: 140
   ChainWrapping:
     active: true
     autoCorrect: true
@@ -306,7 +306,7 @@ formatting:
     continuationIndentSize: 4
   MaximumLineLength:
     active: true
-    maxLineLength: 120
+    maxLineLength: 140
     ignoreBackTickedIdentifier: false
   ModifierOrdering:
     active: true
@@ -356,7 +356,7 @@ formatting:
     active: true
     autoCorrect: true
     indentSize: 4
-    maxLineLength: 120
+    maxLineLength: 140
   SpacingAroundAngleBrackets:
     active: false
     autoCorrect: true
@@ -678,7 +678,7 @@ style:
     active: false
   MaxLineLength:
     active: true
-    maxLineLength: 120
+    maxLineLength: 140
     excludePackageStatements: true
     excludeImportStatements: true
     excludeCommentStatements: false