diff --git a/app/src/main/res/drawable/ic_arrow_forward.xml b/app/src/main/res/drawable/ic_arrow_forward.xml
new file mode 100644
index 000000000..8d3848e66
--- /dev/null
+++ b/app/src/main/res/drawable/ic_arrow_forward.xml
@@ -0,0 +1,5 @@
+<vector android:autoMirrored="true" android:height="24dp"
+    android:tint="#000000" android:viewportHeight="24"
+    android:viewportWidth="24" android:width="24dp" xmlns:android="http://schemas.android.com/apk/res/android">
+    <path android:fillColor="@android:color/white" android:pathData="M12,4l-1.41,1.41L16.17,11H4v2h12.17l-5.58,5.59L12,20l8,-8z"/>
+</vector>
diff --git a/app/src/main/res/drawable/ic_explore.xml b/app/src/main/res/drawable/ic_explore.xml
new file mode 100644
index 000000000..a68dec7c6
--- /dev/null
+++ b/app/src/main/res/drawable/ic_explore.xml
@@ -0,0 +1,5 @@
+<vector android:height="24dp" android:tint="#000000"
+    android:viewportHeight="24" android:viewportWidth="24"
+    android:width="24dp" xmlns:android="http://schemas.android.com/apk/res/android">
+    <path android:fillColor="@android:color/white" android:pathData="M12,2C6.48,2 2,6.48 2,12s4.48,10 10,10 10,-4.48 10,-10S17.52,2 12,2zM12,20c-4.41,0 -8,-3.59 -8,-8s3.59,-8 8,-8 8,3.59 8,8 -3.59,8 -8,8zM6.5,17.5l7.51,-3.49L17.5,6.5 9.99,9.99 6.5,17.5zM12,10.9c0.61,0 1.1,0.49 1.1,1.1s-0.49,1.1 -1.1,1.1 -1.1,-0.49 -1.1,-1.1 0.49,-1.1 1.1,-1.1z"/>
+</vector>
diff --git a/app/src/main/res/drawable/ic_local_library.xml b/app/src/main/res/drawable/ic_local_library.xml
new file mode 100644
index 000000000..f7b156e43
--- /dev/null
+++ b/app/src/main/res/drawable/ic_local_library.xml
@@ -0,0 +1,5 @@
+<vector android:height="24dp" android:tint="#000000"
+    android:viewportHeight="24" android:viewportWidth="24"
+    android:width="24dp" xmlns:android="http://schemas.android.com/apk/res/android">
+    <path android:fillColor="@android:color/white" android:pathData="M12,9c2.21,0 4,-1.79 4,-4s-1.79,-4 -4,-4 -4,1.79 -4,4 1.79,4 4,4zM12,3c1.1,0 2,0.9 2,2s-0.9,2 -2,2 -2,-0.9 -2,-2 0.9,-2 2,-2zM12,11.55C9.64,9.35 6.48,8 3,8v11c3.48,0 6.64,1.35 9,3.55 2.36,-2.19 5.52,-3.55 9,-3.55L21,8c-3.48,0 -6.64,1.35 -9,3.55zM19,17.13c-2.53,0.34 -4.93,1.3 -7,2.82 -2.06,-1.52 -4.47,-2.49 -7,-2.83v-6.95c2.1,0.38 4.05,1.35 5.64,2.83L12,14.28l1.36,-1.27c1.59,-1.48 3.54,-2.45 5.64,-2.83v6.95z"/>
+</vector>
diff --git a/app/src/main/res/layout-w720dp-land/activity_main.xml b/app/src/main/res/layout-w720dp-land/activity_main.xml
index a442269b3..63d11c39b 100644
--- a/app/src/main/res/layout-w720dp-land/activity_main.xml
+++ b/app/src/main/res/layout-w720dp-land/activity_main.xml
@@ -60,14 +60,15 @@
 						style="@style/Widget.Kotatsu.SearchView"
 						android:layout_width="match_parent"
 						android:layout_height="match_parent"
+						android:layout_marginEnd="4dp"
 						android:background="@null"
 						android:drawablePadding="16dp"
-						android:layout_marginEnd="4dp"
 						android:gravity="center_vertical"
 						android:hint="@string/search_manga"
 						android:imeOptions="actionSearch"
 						android:importantForAutofill="no"
-						android:singleLine="true" />
+						android:singleLine="true"
+						tools:ignore="TouchTargetSizeCheck" />
 
 				</com.google.android.material.appbar.MaterialToolbar>
 
@@ -91,4 +92,5 @@
 			tools:visibility="visible" />
 
 	</androidx.coordinatorlayout.widget.CoordinatorLayout>
+
 </LinearLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/activity_main.xml b/app/src/main/res/layout/activity_main.xml
index 6314cf7ef..5697b0d35 100644
--- a/app/src/main/res/layout/activity_main.xml
+++ b/app/src/main/res/layout/activity_main.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<androidx.drawerlayout.widget.DrawerLayout
+<androidx.coordinatorlayout.widget.CoordinatorLayout
 	xmlns:android="http://schemas.android.com/apk/res/android"
 	xmlns:app="http://schemas.android.com/apk/res-auto"
 	xmlns:tools="http://schemas.android.com/tools"
@@ -7,88 +7,86 @@
 	android:layout_height="match_parent"
 	tools:context=".main.ui.MainActivity">
 
-	<androidx.coordinatorlayout.widget.CoordinatorLayout
+	<androidx.fragment.app.FragmentContainerView
+		android:id="@id/container"
 		android:layout_width="match_parent"
-		android:layout_height="match_parent">
-
-		<androidx.fragment.app.FragmentContainerView
-			android:id="@id/container"
-			android:layout_width="match_parent"
-			android:layout_height="match_parent"
-			app:layout_behavior="com.google.android.material.appbar.AppBarLayout$ScrollingViewBehavior"
-			tools:layout="@layout/fragment_list" />
-
-		<com.google.android.material.appbar.AppBarLayout
-			android:id="@+id/appbar"
-			android:layout_width="match_parent"
-			android:layout_height="wrap_content"
-			android:background="@null"
-			android:clipToPadding="false"
-			android:paddingLeft="16dp"
-			android:paddingRight="16dp"
-			android:stateListAnimator="@null">
-
-			<FrameLayout
-				android:id="@+id/toolbar_card"
-				android:layout_width="match_parent"
-				android:layout_height="48dp"
-				android:layout_marginVertical="8dp"
-				android:background="@drawable/toolbar_background"
-				android:theme="@style/ThemeOverlay.Kotatsu.MainToolbar"
-				app:layout_scrollFlags="scroll|enterAlways">
-
-				<com.google.android.material.appbar.MaterialToolbar
-					android:id="@id/toolbar"
-					android:layout_width="match_parent"
-					android:layout_height="wrap_content"
-					android:background="@null"
-					android:focusable="true"
-					android:focusableInTouchMode="true"
-					app:contentInsetStartWithNavigation="0dp">
-
-					<org.koitharu.kotatsu.search.ui.widget.SearchEditText
-						android:id="@+id/searchView"
-						style="@style/Widget.Kotatsu.SearchView"
-						android:layout_width="match_parent"
-						android:layout_height="match_parent"
-						android:layout_marginEnd="4dp"
-						android:background="@null"
-						android:gravity="center_vertical"
-						android:hint="@string/search_manga"
-						android:imeOptions="actionSearch"
-						android:importantForAutofill="no"
-						android:singleLine="true"
-						tools:drawableEnd="@drawable/abc_ic_clear_material" />
-
-				</com.google.android.material.appbar.MaterialToolbar>
-
-			</FrameLayout>
-
-		</com.google.android.material.appbar.AppBarLayout>
-
-		<com.google.android.material.floatingactionbutton.ExtendedFloatingActionButton
-			android:id="@+id/fab"
-			android:layout_width="wrap_content"
-			android:layout_height="wrap_content"
-			android:layout_margin="16dp"
-			android:text="@string/_continue"
-			android:visibility="gone"
-			app:backgroundTint="?attr/colorContainer"
-			app:icon="@drawable/ic_read"
-			app:layout_anchor="@id/container"
-			app:layout_anchorGravity="bottom|end"
-			app:layout_behavior="org.koitharu.kotatsu.base.ui.util.ShrinkOnScrollBehavior"
-			app:layout_dodgeInsetEdges="bottom"
-			tools:visibility="visible" />
-
-	</androidx.coordinatorlayout.widget.CoordinatorLayout>
-
-	<com.google.android.material.navigation.NavigationView
-		android:id="@+id/navigationView"
-		android:layout_width="wrap_content"
 		android:layout_height="match_parent"
-		android:layout_gravity="start"
-		android:fitsSystemWindows="true"
-		app:menu="@menu/nav_drawer" />
+		app:layout_behavior="com.google.android.material.appbar.AppBarLayout$ScrollingViewBehavior"
+		tools:layout="@layout/fragment_list" />
 
-</androidx.drawerlayout.widget.DrawerLayout>
\ No newline at end of file
+	<com.google.android.material.appbar.AppBarLayout
+		android:id="@+id/appbar"
+		android:layout_width="match_parent"
+		android:layout_height="wrap_content"
+		android:background="@null"
+		android:clipToPadding="false"
+		android:paddingLeft="16dp"
+		android:paddingRight="16dp"
+		android:stateListAnimator="@null">
+
+		<com.google.android.material.card.MaterialCardView
+			android:id="@+id/toolbar_card"
+			style="@style/Widget.Material3.CardView.Elevated"
+			android:layout_width="match_parent"
+			android:layout_height="48dp"
+			android:layout_marginVertical="8dp"
+			android:theme="@style/ThemeOverlay.Kotatsu.MainToolbar"
+			app:cardCornerRadius="50dp"
+			app:cardElevation="2dp"
+			app:layout_scrollFlags="scroll|enterAlways">
+
+			<com.google.android.material.appbar.MaterialToolbar
+				android:id="@id/toolbar"
+				android:layout_width="match_parent"
+				android:layout_height="wrap_content"
+				android:background="@null"
+				android:focusable="true"
+				android:focusableInTouchMode="true"
+				app:contentInsetStartWithNavigation="0dp">
+
+				<org.koitharu.kotatsu.search.ui.widget.SearchEditText
+					android:id="@+id/searchView"
+					style="@style/Widget.Kotatsu.SearchView"
+					android:layout_width="match_parent"
+					android:layout_height="match_parent"
+					android:layout_marginEnd="8dp"
+					android:background="@null"
+					android:gravity="center_vertical"
+					android:hint="@string/search_manga"
+					android:imeOptions="actionSearch"
+					android:importantForAutofill="no"
+					android:singleLine="true"
+					tools:drawableEnd="@drawable/abc_ic_clear_material" />
+
+			</com.google.android.material.appbar.MaterialToolbar>
+
+		</com.google.android.material.card.MaterialCardView>
+
+	</com.google.android.material.appbar.AppBarLayout>
+
+	<com.google.android.material.floatingactionbutton.ExtendedFloatingActionButton
+		android:id="@+id/fab"
+		android:layout_width="wrap_content"
+		android:layout_height="wrap_content"
+		android:layout_margin="16dp"
+		android:text="@string/_continue"
+		android:visibility="gone"
+		app:backgroundTint="?attr/colorContainer"
+		app:icon="@drawable/ic_read"
+		app:layout_anchor="@id/container"
+		app:layout_anchorGravity="bottom|end"
+		app:layout_behavior="org.koitharu.kotatsu.base.ui.util.ShrinkOnScrollBehavior"
+		app:layout_dodgeInsetEdges="bottom"
+		tools:visibility="visible" />
+
+	<com.google.android.material.bottomnavigation.BottomNavigationView
+		android:id="@+id/bottomNav"
+		android:layout_width="match_parent"
+		android:layout_height="wrap_content"
+		android:layout_gravity="bottom"
+		android:clickable="true"
+		app:layout_insetEdge="bottom"
+		app:menu="@menu/nav_menu"
+		tools:ignore="KeyboardInaccessibleWidget" />
+
+</androidx.coordinatorlayout.widget.CoordinatorLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/item_main_header.xml b/app/src/main/res/layout/item_main_header.xml
new file mode 100644
index 000000000..4304f62d5
--- /dev/null
+++ b/app/src/main/res/layout/item_main_header.xml
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="utf-8"?>
+<TextView
+	xmlns:android="http://schemas.android.com/apk/res/android"
+	xmlns:app="http://schemas.android.com/apk/res-auto"
+	android:layout_width="match_parent"
+	android:layout_height="wrap_content"
+	xmlns:tools="http://schemas.android.com/tools"
+	android:textAppearance="@style/TextAppearance.AppCompat"
+	android:textSize="24sp"
+	tools:text="History"
+	android:padding="12dp"
+	app:drawableEndCompat="@drawable/ic_arrow_forward"
+	app:drawableTint="?attr/colorPrimary" />
\ No newline at end of file
diff --git a/app/src/main/res/menu/nav_menu.xml b/app/src/main/res/menu/nav_menu.xml
new file mode 100644
index 000000000..a2bf3bf25
--- /dev/null
+++ b/app/src/main/res/menu/nav_menu.xml
@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="utf-8"?>
+<menu
+	xmlns:android="http://schemas.android.com/apk/res/android">
+
+	<item
+		android:id="@+id/nav_local_storage"
+		android:icon="@drawable/ic_storage"
+		android:title="Library" />
+
+	<item
+		android:id="@+id/nav_favourites"
+		android:icon="@drawable/ic_local_library"
+		android:title="Explore" />
+
+</menu>
\ No newline at end of file
diff --git a/app/src/main/res/values-w600dp/dimens.xml b/app/src/main/res/values-w600dp/dimens.xml
index cff6a860c..7bbb84b8b 100644
--- a/app/src/main/res/values-w600dp/dimens.xml
+++ b/app/src/main/res/values-w600dp/dimens.xml
@@ -4,4 +4,5 @@
 	<dimen name="grid_spacing_outer">2dp</dimen>
 	<dimen name="preferred_grid_width">140dp</dimen>
 	<dimen name="bottom_sheet_width">420dp</dimen>
+	<dimen name="fragment_horizontal_margin">48dp</dimen>
 </resources>
\ No newline at end of file