diff --git a/src/main/kotlin/com/looker/droidify/ui/activities/MainActivityX.kt b/src/main/kotlin/com/looker/droidify/ui/activities/MainActivityX.kt
index f25f1d34..2bbf06eb 100644
--- a/src/main/kotlin/com/looker/droidify/ui/activities/MainActivityX.kt
+++ b/src/main/kotlin/com/looker/droidify/ui/activities/MainActivityX.kt
@@ -106,7 +106,6 @@ class MainActivityX : AppCompatActivity() {
             toolbar.menu.setGroupDividerEnabled(true)
         }
         toolbar.isFocusableInTouchMode = true
-        toolbar.title = getString(R.string.application_name)
 
         supportFragmentManager.addFragmentOnAttachListener { _, _ ->
             hideKeyboard()
diff --git a/src/main/kotlin/com/looker/droidify/ui/activities/PrefsActivityX.kt b/src/main/kotlin/com/looker/droidify/ui/activities/PrefsActivityX.kt
index b5cb6c1c..21998254 100644
--- a/src/main/kotlin/com/looker/droidify/ui/activities/PrefsActivityX.kt
+++ b/src/main/kotlin/com/looker/droidify/ui/activities/PrefsActivityX.kt
@@ -78,7 +78,6 @@ class PrefsActivityX : AppCompatActivity() {
         super.onStart()
         setSupportActionBar(toolbar)
         toolbar.isFocusableInTouchMode = true
-        binding.collapsingToolbar.title = getString(R.string.settings)
 
         val navHostFragment =
             supportFragmentManager.findFragmentById(R.id.fragment_content) as NavHostFragment
diff --git a/src/main/res/layout/activity_main_x.xml b/src/main/res/layout/activity_main_x.xml
index 5a486461..80f35d53 100644
--- a/src/main/res/layout/activity_main_x.xml
+++ b/src/main/res/layout/activity_main_x.xml
@@ -10,52 +10,41 @@
         android:layout_width="match_parent"
         android:layout_height="match_parent">
 
-        <androidx.coordinatorlayout.widget.CoordinatorLayout
-            android:id="@+id/coordinator"
+        <com.google.android.material.appbar.AppBarLayout
+            android:id="@+id/appbar_layout"
+            style="?attr/appBarLayoutStyle"
             android:layout_width="match_parent"
-            android:layout_height="0dp"
-            app:layout_constraintBottom_toTopOf="@id/bottom_navigation"
+            android:layout_height="wrap_content"
+            app:layout_constraintBottom_toTopOf="@id/fragment_content"
             app:layout_constraintTop_toTopOf="parent">
 
-            <com.google.android.material.appbar.AppBarLayout
-                android:id="@+id/appbar_layout"
-                style="?attr/appBarLayoutStyle"
+            <com.google.android.material.appbar.MaterialToolbar
+                android:id="@+id/toolbar"
+                style="?attr/toolbarStyle"
                 android:layout_width="match_parent"
-                android:layout_height="wrap_content">
+                android:layout_height="?actionBarSize"
+                app:menu="@menu/menu_main"
+                app:title="@string/application_name" />
+        </com.google.android.material.appbar.AppBarLayout>
 
-                <com.google.android.material.appbar.CollapsingToolbarLayout
-                    android:id="@+id/collapsing_toolbar"
-                    style="?attr/collapsingToolbarLayoutLargeStyle"
-                    android:layout_width="match_parent"
-                    android:layout_height="?attr/collapsingToolbarLayoutLargeSize"
-                    app:layout_scrollFlags="scroll|snap|exitUntilCollapsed">
-
-                    <com.google.android.material.appbar.MaterialToolbar
-                        android:id="@+id/toolbar"
-                        style="?attr/toolbarStyle"
-                        android:layout_width="match_parent"
-                        android:layout_height="?actionBarSize"
-                        app:menu="@menu/menu_main" />
-                </com.google.android.material.appbar.CollapsingToolbarLayout>
-            </com.google.android.material.appbar.AppBarLayout>
-
-            <androidx.fragment.app.FragmentContainerView
-                android:id="@+id/fragment_content"
-                android:name="androidx.navigation.fragment.NavHostFragment"
-                android:layout_width="match_parent"
-                android:layout_height="match_parent"
-                app:defaultNavHost="true"
-                app:layout_behavior="@string/appbar_scrolling_view_behavior"
-                app:navGraph="@navigation/navigation_graph_main" />
-        </androidx.coordinatorlayout.widget.CoordinatorLayout>
+        <androidx.fragment.app.FragmentContainerView
+            android:id="@+id/fragment_content"
+            android:name="androidx.navigation.fragment.NavHostFragment"
+            android:layout_width="match_parent"
+            android:layout_height="0dp"
+            app:defaultNavHost="true"
+            app:layout_behavior="@string/appbar_scrolling_view_behavior"
+            app:layout_constraintBottom_toTopOf="@id/bottom_navigation"
+            app:layout_constraintTop_toBottomOf="@id/appbar_layout"
+            app:navGraph="@navigation/navigation_graph_main" />
 
         <com.google.android.material.bottomnavigation.BottomNavigationView
             android:id="@+id/bottom_navigation"
+            style="?bottomNavigationStyle"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
             app:layout_constraintBottom_toBottomOf="parent"
-            app:layout_constraintTop_toBottomOf="@id/coordinator"
-            style="?bottomNavigationStyle"
+            app:layout_constraintTop_toBottomOf="@id/fragment_content"
             app:menu="@menu/navigation_menu_main" />
     </androidx.constraintlayout.widget.ConstraintLayout>
 </layout>
\ No newline at end of file
diff --git a/src/main/res/layout/activity_prefs_x.xml b/src/main/res/layout/activity_prefs_x.xml
index a2901d73..23f52898 100644
--- a/src/main/res/layout/activity_prefs_x.xml
+++ b/src/main/res/layout/activity_prefs_x.xml
@@ -10,50 +10,39 @@
         android:layout_width="match_parent"
         android:layout_height="match_parent">
 
-        <androidx.coordinatorlayout.widget.CoordinatorLayout
-            android:id="@+id/coordinator"
+        <com.google.android.material.appbar.AppBarLayout
+            android:id="@+id/appbar_layout"
+            style="?attr/appBarLayoutStyle"
             android:layout_width="match_parent"
-            android:layout_height="0dp"
-            app:layout_constraintBottom_toTopOf="@id/bottom_navigation"
+            android:layout_height="wrap_content"
+            app:layout_constraintBottom_toTopOf="@id/fragment_content"
             app:layout_constraintTop_toTopOf="parent">
 
-            <com.google.android.material.appbar.AppBarLayout
-                android:id="@+id/appbar_layout"
-                style="?attr/appBarLayoutStyle"
+            <com.google.android.material.appbar.MaterialToolbar
+                android:id="@+id/toolbar"
+                style="?attr/toolbarStyle"
                 android:layout_width="match_parent"
-                android:layout_height="wrap_content">
+                android:layout_height="?actionBarSize"
+                app:title="@string/settings" />
+        </com.google.android.material.appbar.AppBarLayout>
 
-                <com.google.android.material.appbar.CollapsingToolbarLayout
-                    android:id="@+id/collapsing_toolbar"
-                    style="?attr/collapsingToolbarLayoutLargeStyle"
-                    android:layout_width="match_parent"
-                    android:layout_height="?attr/collapsingToolbarLayoutLargeSize"
-                    app:layout_scrollFlags="scroll|snap|exitUntilCollapsed">
-
-                    <com.google.android.material.appbar.MaterialToolbar
-                        android:id="@+id/toolbar"
-                        style="?attr/toolbarStyle"
-                        android:layout_width="match_parent"
-                        android:layout_height="?actionBarSize" />
-                </com.google.android.material.appbar.CollapsingToolbarLayout>
-            </com.google.android.material.appbar.AppBarLayout>
-
-            <androidx.fragment.app.FragmentContainerView
-                android:id="@+id/fragment_content"
-                android:name="androidx.navigation.fragment.NavHostFragment"
-                android:layout_width="match_parent"
-                android:layout_height="match_parent"
-                app:defaultNavHost="true"
-                app:layout_behavior="@string/appbar_scrolling_view_behavior"
-                app:navGraph="@navigation/navigation_graph_prefs" />
-        </androidx.coordinatorlayout.widget.CoordinatorLayout>
+        <androidx.fragment.app.FragmentContainerView
+            android:id="@+id/fragment_content"
+            android:name="androidx.navigation.fragment.NavHostFragment"
+            android:layout_width="match_parent"
+            android:layout_height="0dp"
+            app:defaultNavHost="true"
+            app:layout_behavior="@string/appbar_scrolling_view_behavior"
+            app:layout_constraintBottom_toTopOf="@id/bottom_navigation"
+            app:layout_constraintTop_toBottomOf="@id/appbar_layout"
+            app:navGraph="@navigation/navigation_graph_prefs" />
 
         <com.google.android.material.bottomnavigation.BottomNavigationView
             android:id="@+id/bottom_navigation"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
             app:layout_constraintBottom_toBottomOf="parent"
-            app:layout_constraintTop_toBottomOf="@id/coordinator"
+            app:layout_constraintTop_toBottomOf="@id/fragment_content"
             app:menu="@menu/navigation_menu_prefs" />
     </androidx.constraintlayout.widget.ConstraintLayout>
 </layout>
\ No newline at end of file