diff --git a/app/src/main/java/com/owenlejeune/tvtime/MainActivity.kt b/app/src/main/java/com/owenlejeune/tvtime/MainActivity.kt
index ec9d190..c4218bd 100644
--- a/app/src/main/java/com/owenlejeune/tvtime/MainActivity.kt
+++ b/app/src/main/java/com/owenlejeune/tvtime/MainActivity.kt
@@ -3,12 +3,9 @@ package com.owenlejeune.tvtime
 import android.os.Bundle
 import androidx.activity.ComponentActivity
 import androidx.activity.compose.setContent
-import androidx.compose.animation.rememberSplineBasedDecay
 import androidx.compose.material.Scaffold
 import androidx.compose.material3.*
 import androidx.compose.runtime.*
-import androidx.compose.ui.Modifier
-import androidx.compose.ui.input.nestedscroll.nestedScroll
 import androidx.compose.ui.res.painterResource
 import androidx.compose.ui.tooling.preview.Preview
 import androidx.navigation.NavController
@@ -17,7 +14,11 @@ import androidx.navigation.compose.NavHost
 import androidx.navigation.compose.composable
 import androidx.navigation.compose.currentBackStackEntryAsState
 import androidx.navigation.compose.rememberNavController
-import com.owenlejeune.tvtime.ui.components.*
+import com.owenlejeune.tvtime.ui.components.NavItems
+import com.owenlejeune.tvtime.ui.screens.FavouritesTab
+import com.owenlejeune.tvtime.ui.screens.MoviesTab
+import com.owenlejeune.tvtime.ui.screens.SettingsTab
+import com.owenlejeune.tvtime.ui.screens.TvTab
 import com.owenlejeune.tvtime.ui.theme.TVTimeTheme
 
 class MainActivity : ComponentActivity() {
@@ -57,15 +58,8 @@ fun MyApp() {
 @OptIn(ExperimentalMaterial3Api::class)
 @Composable
 private fun TopBar(title: MutableState<String>) {
-    val decayAnimationSpec = rememberSplineBasedDecay<Float>()
-    val scrollBehavior = remember(decayAnimationSpec) {
-        TopAppBarDefaults.exitUntilCollapsedScrollBehavior(decayAnimationSpec)
-    }
-
     LargeTopAppBar(
-        modifier = Modifier.nestedScroll(scrollBehavior.nestedScrollConnection),
-        title = { Text(text = title.value) },
-        scrollBehavior = scrollBehavior
+        title = { Text(text = title.value) }
     )
 }
 
diff --git a/app/src/main/java/com/owenlejeune/tvtime/ui/components/NavScreens.kt b/app/src/main/java/com/owenlejeune/tvtime/ui/components/NavScreens.kt
deleted file mode 100644
index 0aefb5e..0000000
--- a/app/src/main/java/com/owenlejeune/tvtime/ui/components/NavScreens.kt
+++ /dev/null
@@ -1,66 +0,0 @@
-package com.owenlejeune.tvtime.ui.components
-
-import androidx.compose.foundation.layout.Column
-import androidx.compose.foundation.layout.fillMaxSize
-import androidx.compose.foundation.layout.wrapContentSize
-import androidx.compose.material3.MaterialTheme
-import androidx.compose.material3.Text
-import androidx.compose.runtime.Composable
-import androidx.compose.ui.Alignment
-import androidx.compose.ui.Modifier
-
-@Composable
-fun MoviesTab() {
-    Column(
-        modifier = Modifier
-            .fillMaxSize()
-            .wrapContentSize(Alignment.Center)
-    ) {
-        Text(
-            text = "Movies Tab",
-            color = MaterialTheme.colorScheme.onBackground
-        )
-    }
-}
-
-@Composable
-fun TvTab() {
-    Column(
-        modifier = Modifier
-            .fillMaxSize()
-            .wrapContentSize(Alignment.Center)
-    ) {
-        Text(
-            text = "TV Tab",
-            color = MaterialTheme.colorScheme.onBackground
-        )
-    }
-}
-
-@Composable
-fun FavouritesTab() {
-    Column(
-        modifier = Modifier
-            .fillMaxSize()
-            .wrapContentSize(Alignment.Center)
-    ) {
-        Text(
-            text = "Favourites Tab",
-            color = MaterialTheme.colorScheme.onBackground
-        )
-    }
-}
-
-@Composable
-fun SettingsTab() {
-    Column(
-        modifier = Modifier
-            .fillMaxSize()
-            .wrapContentSize(Alignment.Center)
-    ) {
-        Text(
-            text = "Settings Tab",
-            color = MaterialTheme.colorScheme.onBackground
-        )
-    }
-}
\ No newline at end of file
diff --git a/app/src/main/java/com/owenlejeune/tvtime/ui/screens/FavouritesTab.kt b/app/src/main/java/com/owenlejeune/tvtime/ui/screens/FavouritesTab.kt
new file mode 100644
index 0000000..3128de9
--- /dev/null
+++ b/app/src/main/java/com/owenlejeune/tvtime/ui/screens/FavouritesTab.kt
@@ -0,0 +1,24 @@
+package com.owenlejeune.tvtime.ui.screens
+
+import androidx.compose.foundation.layout.Column
+import androidx.compose.foundation.layout.fillMaxSize
+import androidx.compose.foundation.layout.wrapContentSize
+import androidx.compose.material3.MaterialTheme
+import androidx.compose.material3.Text
+import androidx.compose.runtime.Composable
+import androidx.compose.ui.Alignment
+import androidx.compose.ui.Modifier
+
+@Composable
+fun FavouritesTab() {
+    Column(
+        modifier = Modifier
+            .fillMaxSize()
+            .wrapContentSize(Alignment.Center)
+    ) {
+        Text(
+            text = "Favourites Tab",
+            color = MaterialTheme.colorScheme.onBackground
+        )
+    }
+}
\ No newline at end of file
diff --git a/app/src/main/java/com/owenlejeune/tvtime/ui/screens/MoviesTab.kt b/app/src/main/java/com/owenlejeune/tvtime/ui/screens/MoviesTab.kt
new file mode 100644
index 0000000..5fe802d
--- /dev/null
+++ b/app/src/main/java/com/owenlejeune/tvtime/ui/screens/MoviesTab.kt
@@ -0,0 +1,24 @@
+package com.owenlejeune.tvtime.ui.screens
+
+import androidx.compose.foundation.layout.Column
+import androidx.compose.foundation.layout.fillMaxSize
+import androidx.compose.foundation.layout.wrapContentSize
+import androidx.compose.material3.MaterialTheme
+import androidx.compose.material3.Text
+import androidx.compose.runtime.Composable
+import androidx.compose.ui.Alignment
+import androidx.compose.ui.Modifier
+
+@Composable
+fun MoviesTab() {
+    Column(
+        modifier = Modifier
+            .fillMaxSize()
+            .wrapContentSize(Alignment.Center)
+    ) {
+        Text(
+            text = "Movies Tab",
+            color = MaterialTheme.colorScheme.onBackground
+        )
+    }
+}
\ No newline at end of file
diff --git a/app/src/main/java/com/owenlejeune/tvtime/ui/screens/SettingsTab.kt b/app/src/main/java/com/owenlejeune/tvtime/ui/screens/SettingsTab.kt
new file mode 100644
index 0000000..0e9c357
--- /dev/null
+++ b/app/src/main/java/com/owenlejeune/tvtime/ui/screens/SettingsTab.kt
@@ -0,0 +1,24 @@
+package com.owenlejeune.tvtime.ui.screens
+
+import androidx.compose.foundation.layout.Column
+import androidx.compose.foundation.layout.fillMaxSize
+import androidx.compose.foundation.layout.wrapContentSize
+import androidx.compose.material3.MaterialTheme
+import androidx.compose.material3.Text
+import androidx.compose.runtime.Composable
+import androidx.compose.ui.Alignment
+import androidx.compose.ui.Modifier
+
+@Composable
+fun SettingsTab() {
+    Column(
+        modifier = Modifier
+            .fillMaxSize()
+            .wrapContentSize(Alignment.Center)
+    ) {
+        Text(
+            text = "Settings Tab",
+            color = MaterialTheme.colorScheme.onBackground
+        )
+    }
+}
\ No newline at end of file
diff --git a/app/src/main/java/com/owenlejeune/tvtime/ui/screens/TvTab.kt b/app/src/main/java/com/owenlejeune/tvtime/ui/screens/TvTab.kt
new file mode 100644
index 0000000..5a26218
--- /dev/null
+++ b/app/src/main/java/com/owenlejeune/tvtime/ui/screens/TvTab.kt
@@ -0,0 +1,24 @@
+package com.owenlejeune.tvtime.ui.screens
+
+import androidx.compose.foundation.layout.Column
+import androidx.compose.foundation.layout.fillMaxSize
+import androidx.compose.foundation.layout.wrapContentSize
+import androidx.compose.material3.MaterialTheme
+import androidx.compose.material3.Text
+import androidx.compose.runtime.Composable
+import androidx.compose.ui.Alignment
+import androidx.compose.ui.Modifier
+
+@Composable
+fun TvTab() {
+    Column(
+        modifier = Modifier
+            .fillMaxSize()
+            .wrapContentSize(Alignment.Center)
+    ) {
+        Text(
+            text = "TV Tab",
+            color = MaterialTheme.colorScheme.onBackground
+        )
+    }
+}
\ No newline at end of file