diff --git a/app/build.gradle.kts b/app/build.gradle.kts
index 504e7a3..728d660 100644
--- a/app/build.gradle.kts
+++ b/app/build.gradle.kts
@@ -17,8 +17,8 @@ plugins {
 android {
     defaultConfig {
         applicationId = "gq.kirmanak.mealient"
-        versionCode = 20
-        versionName = "0.3.5"
+        versionCode = 21
+        versionName = "0.3.6"
     }
 
     signingConfigs {
diff --git a/app/src/main/java/gq/kirmanak/mealient/ui/activity/MainActivity.kt b/app/src/main/java/gq/kirmanak/mealient/ui/activity/MainActivity.kt
index 49ea282..cf4c5ac 100644
--- a/app/src/main/java/gq/kirmanak/mealient/ui/activity/MainActivity.kt
+++ b/app/src/main/java/gq/kirmanak/mealient/ui/activity/MainActivity.kt
@@ -125,15 +125,14 @@ class MainActivity : AppCompatActivity(R.layout.main_activity) {
         binding.toolbar.isSearchVisible = uiState.searchVisible
 
         if (uiState.searchVisible) {
-            binding.toolbarHolder.setBackgroundResource(R.drawable.bg_toolbar)
+            binding.toolbar.setBackgroundResource(R.drawable.bg_toolbar)
         } else {
-            binding.toolbarHolder.background = null
+            binding.toolbar.background = null
         }
     }
 
     private fun navigateTo(directions: NavDirections) {
         logger.v { "navigateTo() called with: directions = $directions" }
-        binding.toolbarHolder.setExpanded(true)
         binding.drawer.close()
         navController.navigate(directions)
     }
diff --git a/app/src/main/res/layout/main_activity.xml b/app/src/main/res/layout/main_activity.xml
index 684e7ba..ade2931 100644
--- a/app/src/main/res/layout/main_activity.xml
+++ b/app/src/main/res/layout/main_activity.xml
@@ -6,37 +6,35 @@
 	style="?drawerLayoutStyle"
 	android:layout_width="match_parent"
 	android:layout_height="match_parent"
-	tools:context=".ui.activity.MainActivity"
-	tools:openDrawer="start">
+	tools:context=".ui.activity.MainActivity">
 
-	<androidx.coordinatorlayout.widget.CoordinatorLayout
+	<androidx.constraintlayout.widget.ConstraintLayout
 		android:layout_width="match_parent"
 		android:layout_height="match_parent">
 
-		<com.google.android.material.appbar.AppBarLayout
-			android:id="@+id/toolbar_holder"
-			android:layout_width="match_parent"
+		<gq.kirmanak.mealient.ui.activity.ToolbarView
+			android:id="@+id/toolbar"
+			android:layout_width="0dp"
 			android:layout_height="wrap_content"
 			android:layout_marginHorizontal="@dimen/margin_medium"
 			android:background="@drawable/bg_toolbar"
-			app:liftOnScroll="true">
-
-			<gq.kirmanak.mealient.ui.activity.ToolbarView
-				android:id="@+id/toolbar"
-				android:layout_width="match_parent"
-				android:layout_height="wrap_content"
-				app:layout_scrollFlags="scroll|snap|enterAlways" />
-		</com.google.android.material.appbar.AppBarLayout>
+			app:layout_constraintEnd_toEndOf="parent"
+			app:layout_constraintStart_toStartOf="parent"
+			app:layout_constraintTop_toTopOf="parent" />
 
 		<androidx.fragment.app.FragmentContainerView
 			android:id="@+id/nav_host"
 			android:name="androidx.navigation.fragment.NavHostFragment"
-			android:layout_width="match_parent"
-			android:layout_height="match_parent"
+			android:layout_width="0dp"
+			android:layout_height="0dp"
 			android:layout_marginTop="@dimen/margin_small"
 			app:defaultNavHost="true"
-			app:layout_behavior="@string/appbar_scrolling_view_behavior" />
-	</androidx.coordinatorlayout.widget.CoordinatorLayout>
+			app:layout_constraintBottom_toBottomOf="parent"
+			app:layout_constraintEnd_toEndOf="parent"
+			app:layout_constraintStart_toStartOf="parent"
+			app:layout_constraintTop_toBottomOf="@id/toolbar"
+			tools:layout="@layout/fragment_recipes_list" />
+	</androidx.constraintlayout.widget.ConstraintLayout>
 
 	<com.google.android.material.navigation.NavigationView
 		android:id="@+id/navigation_view"