diff --git a/.idea/inspectionProfiles/Project_Default.xml b/.idea/inspectionProfiles/Project_Default.xml
new file mode 100644
index 0000000..44ca2d9
--- /dev/null
+++ b/.idea/inspectionProfiles/Project_Default.xml
@@ -0,0 +1,41 @@
+<component name="InspectionProjectProfileManager">
+  <profile version="1.0">
+    <option name="myName" value="Project Default" />
+    <inspection_tool class="PreviewAnnotationInFunctionWithParameters" enabled="true" level="ERROR" enabled_by_default="true">
+      <option name="composableFile" value="true" />
+      <option name="previewFile" value="true" />
+    </inspection_tool>
+    <inspection_tool class="PreviewApiLevelMustBeValid" enabled="true" level="ERROR" enabled_by_default="true">
+      <option name="composableFile" value="true" />
+      <option name="previewFile" value="true" />
+    </inspection_tool>
+    <inspection_tool class="PreviewDimensionRespectsLimit" enabled="true" level="WARNING" enabled_by_default="true">
+      <option name="composableFile" value="true" />
+      <option name="previewFile" value="true" />
+    </inspection_tool>
+    <inspection_tool class="PreviewFontScaleMustBeGreaterThanZero" enabled="true" level="ERROR" enabled_by_default="true">
+      <option name="composableFile" value="true" />
+      <option name="previewFile" value="true" />
+    </inspection_tool>
+    <inspection_tool class="PreviewMultipleParameterProviders" enabled="true" level="ERROR" enabled_by_default="true">
+      <option name="composableFile" value="true" />
+      <option name="previewFile" value="true" />
+    </inspection_tool>
+    <inspection_tool class="PreviewMustBeTopLevelFunction" enabled="true" level="ERROR" enabled_by_default="true">
+      <option name="composableFile" value="true" />
+      <option name="previewFile" value="true" />
+    </inspection_tool>
+    <inspection_tool class="PreviewNeedsComposableAnnotation" enabled="true" level="ERROR" enabled_by_default="true">
+      <option name="composableFile" value="true" />
+      <option name="previewFile" value="true" />
+    </inspection_tool>
+    <inspection_tool class="PreviewNotSupportedInUnitTestFiles" enabled="true" level="ERROR" enabled_by_default="true">
+      <option name="composableFile" value="true" />
+      <option name="previewFile" value="true" />
+    </inspection_tool>
+    <inspection_tool class="PreviewPickerAnnotation" enabled="true" level="ERROR" enabled_by_default="true">
+      <option name="composableFile" value="true" />
+      <option name="previewFile" value="true" />
+    </inspection_tool>
+  </profile>
+</component>
\ No newline at end of file
diff --git a/.idea/misc.xml b/.idea/misc.xml
index 0ad17cb..8978d23 100644
--- a/.idea/misc.xml
+++ b/.idea/misc.xml
@@ -1,4 +1,3 @@
-<?xml version="1.0" encoding="UTF-8"?>
 <project version="4">
   <component name="ExternalStorageConfigurationManager" enabled="true" />
   <component name="ProjectRootManager" version="2" languageLevel="JDK_17" default="true" project-jdk-name="jbr-17" project-jdk-type="JavaSDK">
diff --git a/app/build.gradle.kts b/app/build.gradle.kts
index b5611c1..5c8891a 100644
--- a/app/build.gradle.kts
+++ b/app/build.gradle.kts
@@ -65,4 +65,5 @@ dependencies {
     debugImplementation(libs.androidx.ui.tooling)
     debugImplementation(libs.androidx.ui.test.manifest)
     implementation("androidx.navigation:navigation-compose:$nav_version")
+    implementation("androidx.lifecycle:lifecycle-viewmodel-compose:2.6.1")
 }
\ No newline at end of file
diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index ce57858..9ab37b6 100644
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -4,6 +4,7 @@
 
     <application
         android:allowBackup="true"
+        android:enableOnBackInvokedCallback="true"
         android:dataExtractionRules="@xml/data_extraction_rules"
         android:fullBackupContent="@xml/backup_rules"
         android:icon="@mipmap/ic_launcher"
diff --git a/app/src/main/java/com/ti/mobpo/MainActivity.kt b/app/src/main/java/com/ti/mobpo/MainActivity.kt
index a71ac26..3ee751e 100644
--- a/app/src/main/java/com/ti/mobpo/MainActivity.kt
+++ b/app/src/main/java/com/ti/mobpo/MainActivity.kt
@@ -4,6 +4,7 @@ import android.annotation.SuppressLint
 import android.os.Bundle
 import androidx.activity.ComponentActivity
 import androidx.activity.compose.setContent
+import com.ti.mobpo.ui.Navigation
 import com.ti.mobpo.ui.theme.MobileSecurityTheme
 
 class MainActivity : ComponentActivity() {
diff --git a/app/src/main/java/com/ti/mobpo/Compontents.kt b/app/src/main/java/com/ti/mobpo/ui/Compontents.kt
similarity index 98%
rename from app/src/main/java/com/ti/mobpo/Compontents.kt
rename to app/src/main/java/com/ti/mobpo/ui/Compontents.kt
index c57a6dd..6124450 100644
--- a/app/src/main/java/com/ti/mobpo/Compontents.kt
+++ b/app/src/main/java/com/ti/mobpo/ui/Compontents.kt
@@ -1,4 +1,4 @@
-package com.ti.mobpo
+package com.ti.mobpo.ui
 
 import androidx.compose.foundation.layout.fillMaxWidth
 import androidx.compose.foundation.text.KeyboardActions
diff --git a/app/src/main/java/com/ti/mobpo/Navigation.kt b/app/src/main/java/com/ti/mobpo/ui/Navigation.kt
similarity index 86%
rename from app/src/main/java/com/ti/mobpo/Navigation.kt
rename to app/src/main/java/com/ti/mobpo/ui/Navigation.kt
index c5020c1..90d1497 100644
--- a/app/src/main/java/com/ti/mobpo/Navigation.kt
+++ b/app/src/main/java/com/ti/mobpo/ui/Navigation.kt
@@ -1,4 +1,4 @@
-package com.ti.mobpo
+package com.ti.mobpo.ui
 
 import androidx.compose.foundation.layout.Box
 import androidx.compose.foundation.layout.fillMaxSize
@@ -20,16 +20,19 @@ import androidx.compose.material3.Text
 import androidx.compose.runtime.Composable
 import androidx.compose.runtime.getValue
 import androidx.compose.runtime.mutableStateOf
+import androidx.compose.runtime.rememberUpdatedState
 import androidx.compose.runtime.saveable.rememberSaveable
 import androidx.compose.runtime.setValue
 import androidx.compose.ui.Modifier
 import androidx.compose.ui.tooling.preview.Preview
 import androidx.navigation.compose.NavHost
 import androidx.navigation.compose.composable
+import androidx.navigation.compose.currentBackStackEntryAsState
 import androidx.navigation.compose.rememberNavController
-import com.ti.mobpo.screens.Favourites
-import com.ti.mobpo.screens.PokeSearch
-import com.ti.mobpo.screens.Profile
+import com.ti.mobpo.ui.screens.Favourites
+import com.ti.mobpo.ui.screens.PokeSearch
+import com.ti.mobpo.ui.screens.PokeSearchScreen
+import com.ti.mobpo.ui.screens.Profile
 
 
 @Composable
@@ -54,10 +57,17 @@ fun Navigation() {
             route = Screen.Profile.route
         ),
     )
+
     var selectedItemIndex by rememberSaveable {
         mutableStateOf(0)
     }
     val navController = rememberNavController()
+
+    val currentBackStackEntry by navController.currentBackStackEntryAsState()
+    val currentRoute = currentBackStackEntry?.destination?.route
+    val updatedSelectedIndex = items.indexOfFirst { it.route == currentRoute }
+    selectedItemIndex = rememberUpdatedState(updatedSelectedIndex).value
+
     Scaffold (
         bottomBar = {
             NavigationBar {
@@ -113,6 +123,6 @@ fun Navigation() {
 @Composable
 fun NavigationPreview() {
     Surface {
-        PokeSearch()
+        PokeSearchScreen()
     }
 }
\ No newline at end of file
diff --git a/app/src/main/java/com/ti/mobpo/ui/PokeSearchUiState.kt b/app/src/main/java/com/ti/mobpo/ui/PokeSearchUiState.kt
new file mode 100644
index 0000000..2bd3d0f
--- /dev/null
+++ b/app/src/main/java/com/ti/mobpo/ui/PokeSearchUiState.kt
@@ -0,0 +1,3 @@
+package com.ti.mobpo.ui
+
+data class PokeSearchUiState(val searchQuery: String = "")
diff --git a/app/src/main/java/com/ti/mobpo/ui/PokeSearchViewModel.kt b/app/src/main/java/com/ti/mobpo/ui/PokeSearchViewModel.kt
new file mode 100644
index 0000000..dcd3733
--- /dev/null
+++ b/app/src/main/java/com/ti/mobpo/ui/PokeSearchViewModel.kt
@@ -0,0 +1,11 @@
+package com.ti.mobpo.ui
+import androidx.lifecycle.ViewModel
+import kotlinx.coroutines.flow.MutableStateFlow
+import kotlinx.coroutines.flow.StateFlow
+import kotlinx.coroutines.flow.asStateFlow
+
+class PokeSearchViewModel : ViewModel() {
+    private val _uiState = MutableStateFlow(PokeSearchUiState())
+    val uiState: StateFlow<PokeSearchUiState> = _uiState.asStateFlow()
+
+}
\ No newline at end of file
diff --git a/app/src/main/java/com/ti/mobpo/Screen.kt b/app/src/main/java/com/ti/mobpo/ui/Screen.kt
similarity index 90%
rename from app/src/main/java/com/ti/mobpo/Screen.kt
rename to app/src/main/java/com/ti/mobpo/ui/Screen.kt
index 687285b..a564e79 100644
--- a/app/src/main/java/com/ti/mobpo/Screen.kt
+++ b/app/src/main/java/com/ti/mobpo/ui/Screen.kt
@@ -1,4 +1,4 @@
-package com.ti.mobpo
+package com.ti.mobpo.ui
 
 sealed class Screen (val route: String) {
     object PokeSearch : Screen("default_screen")
diff --git a/app/src/main/java/com/ti/mobpo/screens/Favourites.kt b/app/src/main/java/com/ti/mobpo/ui/screens/Favourites.kt
similarity index 84%
rename from app/src/main/java/com/ti/mobpo/screens/Favourites.kt
rename to app/src/main/java/com/ti/mobpo/ui/screens/Favourites.kt
index b7e3a29..2fe3bd6 100644
--- a/app/src/main/java/com/ti/mobpo/screens/Favourites.kt
+++ b/app/src/main/java/com/ti/mobpo/ui/screens/Favourites.kt
@@ -1,4 +1,4 @@
-package com.ti.mobpo.screens
+package com.ti.mobpo.ui.screens
 
 import androidx.compose.material3.Text
 import androidx.compose.runtime.Composable
diff --git a/app/src/main/java/com/ti/mobpo/screens/PokeSearch.kt b/app/src/main/java/com/ti/mobpo/ui/screens/PokeSearch.kt
similarity index 62%
rename from app/src/main/java/com/ti/mobpo/screens/PokeSearch.kt
rename to app/src/main/java/com/ti/mobpo/ui/screens/PokeSearch.kt
index 0b818b7..c79f9a1 100644
--- a/app/src/main/java/com/ti/mobpo/screens/PokeSearch.kt
+++ b/app/src/main/java/com/ti/mobpo/ui/screens/PokeSearch.kt
@@ -1,25 +1,36 @@
-package com.ti.mobpo.screens
+package com.ti.mobpo.ui.screens
 
 import androidx.compose.foundation.layout.Arrangement
 import androidx.compose.foundation.layout.Column
 import androidx.compose.foundation.layout.fillMaxSize
 import androidx.compose.foundation.layout.padding
 import androidx.compose.runtime.Composable
+import androidx.compose.runtime.collectAsState
+import androidx.compose.runtime.getValue
 import androidx.compose.ui.Alignment
 import androidx.compose.ui.Modifier
 import androidx.compose.ui.res.stringResource
 import androidx.compose.ui.tooling.preview.Preview
 import androidx.compose.ui.unit.dp
 import com.ti.mobpo.R
-import com.ti.mobpo.SearchBar
+import com.ti.mobpo.ui.SearchBar
+import androidx.lifecycle.viewmodel.compose.viewModel
+import com.ti.mobpo.ui.PokeSearchViewModel
 
+@Composable
+fun PokeSearchScreen(pokesearchViewModel: PokeSearchViewModel = viewModel()){
+    val pokesearchUiState by pokesearchViewModel.uiState.collectAsState()
+    PokeSearch()
+}
 
 @Composable
 fun PokeSearch() {
     Column (
         verticalArrangement = Arrangement.Top,
         horizontalAlignment = Alignment.CenterHorizontally,
-        modifier = Modifier.fillMaxSize().padding(20.dp)
+        modifier = Modifier
+            .fillMaxSize()
+            .padding(20.dp)
     ) {
         SearchBar(stringResource(R.string.input_field_label)){ value ->
             run {
@@ -31,5 +42,5 @@ fun PokeSearch() {
 @Preview(showBackground = true)
 @Composable
 fun PokeSearchApp(){
-    PokeSearch()
+    PokeSearchScreen()
 }
\ No newline at end of file
diff --git a/app/src/main/java/com/ti/mobpo/screens/Profile.kt b/app/src/main/java/com/ti/mobpo/ui/screens/Profile.kt
similarity index 81%
rename from app/src/main/java/com/ti/mobpo/screens/Profile.kt
rename to app/src/main/java/com/ti/mobpo/ui/screens/Profile.kt
index 67d5a5f..cf3f3b8 100644
--- a/app/src/main/java/com/ti/mobpo/screens/Profile.kt
+++ b/app/src/main/java/com/ti/mobpo/ui/screens/Profile.kt
@@ -1,4 +1,4 @@
-package com.ti.mobpo.screens
+package com.ti.mobpo.ui.screens
 
 import androidx.compose.material3.Text
 import androidx.compose.runtime.Composable