diff --git a/.gitignore b/.gitignore
index c2810ab..f9be852 100644
--- a/.gitignore
+++ b/.gitignore
@@ -19,6 +19,7 @@ local.properties
 # IDEA/Android Studio project files
 *.iml
 .idea/*
+!.idea/icon.png
 
 # Gradle cache
 .gradle
diff --git a/.idea/icon.png b/.idea/icon.png
new file mode 100644
index 0000000..7432b61
Binary files /dev/null and b/.idea/icon.png differ
diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index bde6607..1156e46 100644
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -19,7 +19,6 @@
 
         <activity
             android:name=".ui.main.MainActivity"
-            android:screenOrientation="portrait"
             android:exported="true"
             android:launchMode="singleTop"
             android:windowSoftInputMode="stateAlwaysHidden|adjustPan">
@@ -31,17 +30,14 @@
 
         <activity
             android:name=".ui.settings.SettingsActivity"
-            android:parentActivityName="com.devdunnapps.amplify.ui.main.MainActivity"
-            android:screenOrientation="portrait" />
+            android:parentActivityName="com.devdunnapps.amplify.ui.main.MainActivity" />
 
         <activity
             android:name=".ui.about.AboutActivity"
-            android:parentActivityName="com.devdunnapps.amplify.ui.main.MainActivity"
-            android:screenOrientation="portrait" />
+            android:parentActivityName="com.devdunnapps.amplify.ui.main.MainActivity" />
 
         <activity
-            android:name=".ui.onboarding.OnBoardingActivity"
-            android:screenOrientation="portrait" />
+            android:name=".ui.onboarding.OnBoardingActivity" />
 
         <service
             android:name=".utils.MusicService"
diff --git a/app/src/main/java/com/devdunnapps/amplify/ui/components/BottomSheetHeader.kt b/app/src/main/java/com/devdunnapps/amplify/ui/components/BottomSheetHeader.kt
index fc160b2..88b699e 100644
--- a/app/src/main/java/com/devdunnapps/amplify/ui/components/BottomSheetHeader.kt
+++ b/app/src/main/java/com/devdunnapps/amplify/ui/components/BottomSheetHeader.kt
@@ -38,10 +38,10 @@ fun BottomSheetHeader(
         }
 
         Column(modifier = Modifier.weight(1f)) {
-            Text(text = title, style = MaterialTheme.typography.headlineSmall, maxLines = 1)
+            Text(text = title, style = MaterialTheme.typography.bodyLarge, maxLines = 1)
 
             subtitle?.let {
-                Text(text = it, style = MaterialTheme.typography.bodyLarge, maxLines = 1)
+                Text(text = it, style = MaterialTheme.typography.bodyMedium, maxLines = 1)
             }
         }
 
diff --git a/app/src/main/java/com/devdunnapps/amplify/ui/components/RootDestinationAppBar.kt b/app/src/main/java/com/devdunnapps/amplify/ui/components/RootDestinationAppBar.kt
index c6ba081..2dbeb37 100644
--- a/app/src/main/java/com/devdunnapps/amplify/ui/components/RootDestinationAppBar.kt
+++ b/app/src/main/java/com/devdunnapps/amplify/ui/components/RootDestinationAppBar.kt
@@ -50,14 +50,20 @@ fun RootDestinationAppBar(
                     text = {
                         Text(text = stringResource(R.string.settings))
                     },
-                    onClick = onNavigateToSettings
+                    onClick = {
+                        onNavigateToSettings()
+                        isMenuExpanded = false
+                    }
                 )
 
                 DropdownMenuItem(
                     text = {
                         Text(text = stringResource(R.string.about))
                     },
-                    onClick = onNavigateToAbout
+                    onClick = {
+                        onNavigateToAbout()
+                        isMenuExpanded = false
+                    }
                 )
             }
         }
diff --git a/app/src/main/java/com/devdunnapps/amplify/ui/components/SubDestinationAppBar.kt b/app/src/main/java/com/devdunnapps/amplify/ui/components/SubDestinationAppBar.kt
index f08a4fe..5fbce14 100644
--- a/app/src/main/java/com/devdunnapps/amplify/ui/components/SubDestinationAppBar.kt
+++ b/app/src/main/java/com/devdunnapps/amplify/ui/components/SubDestinationAppBar.kt
@@ -57,14 +57,20 @@ fun SubDestinationAppBar(
                     text = {
                         Text(text = stringResource(R.string.settings))
                     },
-                    onClick = onNavigateToSettings
+                    onClick = {
+                        onNavigateToSettings()
+                        isMenuExpanded = false
+                    }
                 )
 
                 DropdownMenuItem(
                     text = {
                         Text(text = stringResource(R.string.about))
                     },
-                    onClick = onNavigateToAbout
+                    onClick = {
+                        onNavigateToAbout()
+                        isMenuExpanded = false
+                    }
                 )
             }
         }
diff --git a/app/src/main/java/com/devdunnapps/amplify/ui/main/MainActivity.kt b/app/src/main/java/com/devdunnapps/amplify/ui/main/MainActivity.kt
index 5c60705..d7667c3 100644
--- a/app/src/main/java/com/devdunnapps/amplify/ui/main/MainActivity.kt
+++ b/app/src/main/java/com/devdunnapps/amplify/ui/main/MainActivity.kt
@@ -1,11 +1,15 @@
 package com.devdunnapps.amplify.ui.main
 
 import android.content.Intent
+import android.content.pm.ActivityInfo
+import android.content.res.Configuration
 import android.os.Bundle
 import android.support.v4.media.MediaMetadataCompat
 import android.support.v4.media.session.PlaybackStateCompat
 import android.util.TypedValue
 import android.view.View
+import android.view.ViewGroup
+import androidx.activity.enableEdgeToEdge
 import androidx.activity.viewModels
 import androidx.appcompat.app.AppCompatActivity
 import androidx.compose.foundation.background
@@ -32,7 +36,10 @@ import androidx.compose.ui.tooling.preview.Preview
 import androidx.compose.ui.unit.dp
 import androidx.constraintlayout.widget.ConstraintLayout
 import androidx.coordinatorlayout.widget.CoordinatorLayout
+import androidx.core.view.ViewCompat
 import androidx.core.view.WindowCompat
+import androidx.core.view.WindowInsetsCompat
+import androidx.core.view.updateLayoutParams
 import androidx.lifecycle.Lifecycle
 import androidx.lifecycle.lifecycleScope
 import androidx.lifecycle.repeatOnLifecycle
@@ -66,11 +73,11 @@ class MainActivity : AppCompatActivity() {
         startOnBoardingIfFirstTime()
 
         binding = ActivityMainBinding.inflate(layoutInflater)
-        setContentView(binding.root)
-
         drawUnderSystemBars()
+        setContentView(binding.root)
 
-        val navHostFragment = supportFragmentManager.findFragmentById(R.id.nav_content_frame) as NavHostFragment
+        val navHostFragment =
+            supportFragmentManager.findFragmentById(R.id.nav_content_frame) as NavHostFragment
         binding.navView.apply {
             val navController = navHostFragment.navController
             setupWithNavController(navController)
@@ -109,7 +116,8 @@ class MainActivity : AppCompatActivity() {
                     bottomSheet.state = BottomSheetBehavior.STATE_COLLAPSED
                 },
                 onNowPlayingMenuClick = { songId ->
-                    val action = MobileNavigationDirections.actionGlobalNavigationSongBottomSheet(songId)
+                    val action =
+                        MobileNavigationDirections.actionGlobalNavigationSongBottomSheet(songId)
                     findNavController(binding.navContentFrame).navigate(action)
                 }
             )
@@ -119,9 +127,13 @@ class MainActivity : AppCompatActivity() {
             repeatOnLifecycle(Lifecycle.State.STARTED) {
                 viewModel.playbackState.collect {
                     if (it.state == PlaybackStateCompat.STATE_PLAYING) {
-                        val marginInDp =
-                            TypedValue.applyDimension(TypedValue.COMPLEX_UNIT_DIP, 64f, resources.displayMetrics).toInt()
-                        (binding.navContentFrame.layoutParams as CoordinatorLayout.LayoutParams).setMargins(0, 0, 0, marginInDp)
+                        val marginInDp = TypedValue.applyDimension(
+                            TypedValue.COMPLEX_UNIT_DIP,
+                            64f,
+                            resources.displayMetrics
+                        ).toInt()
+                        (binding.navContentFrame.layoutParams as CoordinatorLayout.LayoutParams)
+                            .setMargins(0, 0, 0, marginInDp)
 
                         binding.bottomSheet.visibility = View.VISIBLE
                     }
@@ -138,9 +150,8 @@ class MainActivity : AppCompatActivity() {
                         binding.nowPlayingBoxCollapsed.visibility = View.INVISIBLE
                     }
 
-                    BottomSheetBehavior.STATE_COLLAPSED -> {
+                    BottomSheetBehavior.STATE_COLLAPSED ->
                         binding.nowPlayingExpanded.visibility = View.INVISIBLE
-                    }
 
                     else -> Unit
                 }
@@ -162,11 +173,17 @@ class MainActivity : AppCompatActivity() {
         }
     }
 
-    /**
-     * Draws the main content under the system bars for Android versions 11+
-     */
     private fun drawUnderSystemBars() {
-        WindowCompat.setDecorFitsSystemWindows(window, false)
+        enableEdgeToEdge()
+
+        if (resources.configuration.orientation == Configuration.ORIENTATION_LANDSCAPE) {
+            ViewCompat.setOnApplyWindowInsetsListener(binding.root) { view, windowInsets ->
+                val insets = windowInsets.getInsets(WindowInsetsCompat.Type.systemBars())
+                view.setPadding(insets.left, 0, insets.right,0)
+
+                windowInsets
+            }
+        }
     }
 
     private fun startOnBoardingIfFirstTime() {
diff --git a/app/src/main/java/com/devdunnapps/amplify/ui/settings/SettingsActivity.kt b/app/src/main/java/com/devdunnapps/amplify/ui/settings/SettingsActivity.kt
index e843626..c02a718 100644
--- a/app/src/main/java/com/devdunnapps/amplify/ui/settings/SettingsActivity.kt
+++ b/app/src/main/java/com/devdunnapps/amplify/ui/settings/SettingsActivity.kt
@@ -46,7 +46,7 @@ class SettingsActivity : AppCompatActivity() {
                     uiState = viewModel.uiState.collectAsState().value,
                     onNavigateUpClick = { onBackPressed() },
                     onChooseThemeClick = viewModel::changeTheme,
-                    onSignOutClick = {  handleSignOut() }
+                    onSignOutClick = { handleSignOut() }
                 )
             }
         }