diff --git a/app/src/main/java/org/kiwix/kiwixmobile/nav/destination/reader/ReaderFragment.kt b/app/src/main/java/org/kiwix/kiwixmobile/nav/destination/reader/ReaderFragment.kt
index aff1491e0..e544774a3 100644
--- a/app/src/main/java/org/kiwix/kiwixmobile/nav/destination/reader/ReaderFragment.kt
+++ b/app/src/main/java/org/kiwix/kiwixmobile/nav/destination/reader/ReaderFragment.kt
@@ -24,6 +24,7 @@ import android.os.Bundle
 import android.util.Log
 import android.view.Menu
 import android.view.MenuInflater
+import android.view.ViewGroup
 import androidx.appcompat.app.AppCompatActivity
 import androidx.core.net.toFile
 import androidx.core.net.toUri
@@ -73,6 +74,15 @@ class ReaderFragment : CoreReaderFragment() {
     }
   }
 
+  override fun onPause() {
+    super.onPause()
+    // ScrollingViewWithBottomNavigationBehavior changes the margin to the size of the nav bar,
+    // this resets the margin to zero, before fragment navigation.
+    val params = parentFragment?.view?.layoutParams as ViewGroup.MarginLayoutParams?
+    params?.bottomMargin = 0
+    parentFragment?.view?.requestLayout()
+  }
+
   override fun onCreateOptionsMenu(menu: Menu, menuInflater: MenuInflater) {
     super.onCreateOptionsMenu(menu, menuInflater)
     menu.findItem(R.id.menu_new_navigation)?.isVisible = false
diff --git a/app/src/main/res/layout/activity_new_navigation.xml b/app/src/main/res/layout/activity_new_navigation.xml
index 13fd44600..05089530f 100644
--- a/app/src/main/res/layout/activity_new_navigation.xml
+++ b/app/src/main/res/layout/activity_new_navigation.xml
@@ -33,10 +33,8 @@
       android:name="org.kiwix.kiwixmobile.main.NavigationHostFragment"
       android:layout_width="match_parent"
       android:layout_height="match_parent"
-      android:layout_gravity="bottom"
       app:defaultNavHost="true"
       app:layout_behavior=".nav.helper.ScrollingViewWithBottomNavigationBehavior"
-      app:layout_dodgeInsetEdges="bottom"
       app:navGraph="@navigation/kiwix_nav_graph"
       tools:ignore="FragmentTagUsage" />
 
@@ -46,6 +44,7 @@
       android:layout_height="wrap_content"
       android:layout_gravity="bottom"
       app:layout_behavior="@string/hide_bottom_view_on_scroll_behavior"
+      app:layout_scrollFlags="scroll|enterAlways"
       app:menu="@menu/menu_bottom_nav" />
   </org.kiwix.kiwixmobile.core.utils.NestedCoordinatorLayout>
 
diff --git a/app/src/main/res/layout/fragment_destination_download.xml b/app/src/main/res/layout/fragment_destination_download.xml
index ba33eae7e..bc2ae79f3 100644
--- a/app/src/main/res/layout/fragment_destination_download.xml
+++ b/app/src/main/res/layout/fragment_destination_download.xml
@@ -16,32 +16,31 @@
   ~
   -->
 
-<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+<androidx.constraintlayout.widget.ConstraintLayout 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="match_parent"
-  android:orientation="vertical">
+  android:layout_height="match_parent">
 
-  <include layout="@layout/layout_toolbar" />
-
-  <androidx.constraintlayout.widget.ConstraintLayout
+  <org.kiwix.kiwixmobile.core.utils.NestedCoordinatorLayout
     android:layout_width="match_parent"
-    android:layout_height="match_parent">
+    android:layout_height="match_parent"
+    app:layout_constraintBottom_toBottomOf="parent"
+    app:layout_constraintEnd_toEndOf="parent"
+    app:layout_constraintStart_toStartOf="parent"
+    app:layout_constraintTop_toTopOf="parent">
 
-    <TextView
-      android:id="@+id/libraryErrorText"
-      style="@style/no_list_content_text"
-      app:layout_constraintBottom_toBottomOf="parent"
-      app:layout_constraintEnd_toEndOf="parent"
-      app:layout_constraintStart_toStartOf="parent"
-      app:layout_constraintTop_toTopOf="parent" />
+    <com.google.android.material.appbar.AppBarLayout
+      android:layout_width="match_parent"
+      android:layout_height="wrap_content">
+
+      <include layout="@layout/layout_scrolling_toolbar" />
+    </com.google.android.material.appbar.AppBarLayout>
 
     <androidx.swiperefreshlayout.widget.SwipeRefreshLayout
       android:id="@+id/librarySwipeRefresh"
       android:layout_width="match_parent"
       android:layout_height="match_parent"
-      app:layout_constraintStart_toStartOf="parent"
-      app:layout_constraintTop_toTopOf="parent">
+      app:layout_behavior="@string/appbar_scrolling_view_behavior">
 
       <androidx.recyclerview.widget.RecyclerView
         android:id="@+id/libraryList"
@@ -50,6 +49,16 @@
         app:layout_behavior="@string/appbar_scrolling_view_behavior" />
 
     </androidx.swiperefreshlayout.widget.SwipeRefreshLayout>
-  </androidx.constraintlayout.widget.ConstraintLayout>
+  </org.kiwix.kiwixmobile.core.utils.NestedCoordinatorLayout>
 
-</LinearLayout>
+
+  <TextView
+    android:id="@+id/libraryErrorText"
+    style="@style/no_list_content_text"
+    app:layout_constraintBottom_toBottomOf="parent"
+    app:layout_constraintEnd_toEndOf="parent"
+    app:layout_constraintStart_toStartOf="parent"
+    app:layout_constraintTop_toTopOf="parent" />
+
+
+</androidx.constraintlayout.widget.ConstraintLayout>
diff --git a/app/src/main/res/layout/fragment_destination_library.xml b/app/src/main/res/layout/fragment_destination_library.xml
index 8e15f2bc0..e30da2a82 100644
--- a/app/src/main/res/layout/fragment_destination_library.xml
+++ b/app/src/main/res/layout/fragment_destination_library.xml
@@ -16,52 +16,61 @@
   ~
   -->
 
-<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+<androidx.constraintlayout.widget.ConstraintLayout 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="match_parent"
-  android:orientation="vertical">
+  android:layout_height="match_parent">
 
-  <include layout="@layout/layout_toolbar" />
-
-  <androidx.constraintlayout.widget.ConstraintLayout
+  <org.kiwix.kiwixmobile.core.utils.NestedCoordinatorLayout
     android:layout_width="match_parent"
-    android:layout_height="match_parent">
+    android:layout_height="match_parent"
+    app:layout_constraintBottom_toBottomOf="parent"
+    app:layout_constraintEnd_toEndOf="parent"
+    app:layout_constraintStart_toStartOf="parent"
+    app:layout_constraintTop_toTopOf="parent">
 
+    <com.google.android.material.appbar.AppBarLayout
+      android:layout_width="match_parent"
+      android:layout_height="wrap_content">
 
-    <TextView
-      android:id="@+id/file_management_no_files"
-      style="@style/no_list_content_text"
-      android:layout_gravity="center"
-      android:text="@string/no_files_here"
-      app:layout_constraintEnd_toEndOf="parent"
-      app:layout_constraintStart_toStartOf="parent"
-      app:layout_constraintTop_toTopOf="parent" />
+      <include layout="@layout/layout_scrolling_toolbar" />
+    </com.google.android.material.appbar.AppBarLayout>
 
-    <Button
-      android:id="@+id/go_to_downloads_button_no_files"
-      android:layout_width="wrap_content"
-      android:layout_height="wrap_content"
-      android:text="@string/download_books"
-      android:visibility="gone"
-      app:layout_constraintEnd_toEndOf="parent"
-      app:layout_constraintStart_toStartOf="parent"
-      app:layout_constraintTop_toBottomOf="@+id/file_management_no_files" />
 
     <androidx.swiperefreshlayout.widget.SwipeRefreshLayout
       android:id="@+id/zim_swiperefresh"
       android:layout_width="match_parent"
-      android:layout_height="match_parent">
+      android:layout_height="match_parent"
+      app:layout_behavior="@string/appbar_scrolling_view_behavior">
 
       <androidx.recyclerview.widget.RecyclerView
         android:id="@+id/zimfilelist"
         android:layout_width="match_parent"
-        android:layout_height="match_parent"
-        app:layout_behavior="@string/appbar_scrolling_view_behavior" />
+        android:layout_height="match_parent" />
 
     </androidx.swiperefreshlayout.widget.SwipeRefreshLayout>
 
+  </org.kiwix.kiwixmobile.core.utils.NestedCoordinatorLayout>
 
-  </androidx.constraintlayout.widget.ConstraintLayout>
 
-</LinearLayout>
+  <TextView
+    android:id="@+id/file_management_no_files"
+    style="@style/no_list_content_text"
+    android:layout_gravity="center"
+    android:text="@string/no_files_here"
+    app:layout_constraintEnd_toEndOf="parent"
+    app:layout_constraintStart_toStartOf="parent"
+    app:layout_constraintTop_toTopOf="parent" />
+
+  <Button
+    android:id="@+id/go_to_downloads_button_no_files"
+    android:layout_width="wrap_content"
+    android:layout_height="wrap_content"
+    android:text="@string/download_books"
+    android:visibility="gone"
+    app:layout_constraintEnd_toEndOf="parent"
+    app:layout_constraintStart_toStartOf="parent"
+    app:layout_constraintTop_toBottomOf="@+id/file_management_no_files" />
+
+
+</androidx.constraintlayout.widget.ConstraintLayout>
diff --git a/core/src/main/java/org/kiwix/kiwixmobile/core/main/CoreReaderFragment.java b/core/src/main/java/org/kiwix/kiwixmobile/core/main/CoreReaderFragment.java
index 55d0e3d96..9d5eef4f7 100644
--- a/core/src/main/java/org/kiwix/kiwixmobile/core/main/CoreReaderFragment.java
+++ b/core/src/main/java/org/kiwix/kiwixmobile/core/main/CoreReaderFragment.java
@@ -871,7 +871,7 @@ public abstract class CoreReaderFragment extends BaseFragment
     }
     tabsAdapter.notifyItemRemoved(index);
     tabsAdapter.notifyDataSetChanged();
-    Snackbar.make(tabSwitcherRoot, R.string.tab_closed, Snackbar.LENGTH_LONG)
+    Snackbar.make(snackbarRoot, R.string.tab_closed, Snackbar.LENGTH_LONG)
       .setAction(R.string.undo, v -> {
         webViewList.add(index, tempForUndo);
         tabsAdapter.notifyItemInserted(index);
diff --git a/core/src/main/res/layout/layout_scrolling_toolbar.xml b/core/src/main/res/layout/layout_scrolling_toolbar.xml
new file mode 100644
index 000000000..c512b1e3b
--- /dev/null
+++ b/core/src/main/res/layout/layout_scrolling_toolbar.xml
@@ -0,0 +1,29 @@
+<?xml version="1.0" encoding="utf-8"?><!--
+  ~ Kiwix Android
+  ~ Copyright (c) 2020 Kiwix <android.kiwix.org>
+  ~ This program is free software: you can redistribute it and/or modify
+  ~ it under the terms of the GNU General Public License as published by
+  ~ the Free Software Foundation, either version 3 of the License, or
+  ~ (at your option) any later version.
+  ~
+  ~ This program is distributed in the hope that it will be useful,
+  ~ but WITHOUT ANY WARRANTY; without even the implied warranty of
+  ~ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+  ~ GNU General Public License for more details.
+  ~
+  ~ You should have received a copy of the GNU General Public License
+  ~ along with this program. If not, see <http://www.gnu.org/licenses/>.
+  ~
+  -->
+<merge xmlns:android="http://schemas.android.com/apk/res/android"
+  xmlns:app="http://schemas.android.com/apk/res-auto">
+
+  <androidx.appcompat.widget.Toolbar
+    android:id="@+id/toolbar"
+    android:layout_height="wrap_content"
+    android:layout_width="match_parent"
+    app:layout_scrollFlags="scroll|enterAlways"
+    app:popupTheme="@style/KiwixTheme"
+    app:theme="@style/ThemeOverlay.MaterialComponents.Dark.ActionBar" />
+
+</merge>
diff --git a/core/src/main/res/layout/main_fragment_content.xml b/core/src/main/res/layout/main_fragment_content.xml
index e61e9a20f..9b0221395 100644
--- a/core/src/main/res/layout/main_fragment_content.xml
+++ b/core/src/main/res/layout/main_fragment_content.xml
@@ -34,13 +34,7 @@
       android:layout_width="match_parent"
       android:layout_height="wrap_content">
 
-      <androidx.appcompat.widget.Toolbar
-        android:id="@+id/toolbar"
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        app:layout_scrollFlags="scroll|enterAlways"
-        app:popupTheme="@style/KiwixTheme"
-        app:theme="@style/ThemeOverlay.MaterialComponents.Dark.ActionBar" />
+      <include layout="@layout/layout_scrolling_toolbar" />
 
       <androidx.core.widget.ContentLoadingProgressBar
         android:id="@+id/main_fragment_progress_view"
@@ -135,8 +129,9 @@
     android:id="@+id/snackbar_root"
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
-    app:layout_constraintBottom_toTopOf="@id/activity_main_button_pause_tts"
-    app:layout_constraintEnd_toEndOf="parent" />
+    app:layout_constraintBottom_toBottomOf="parent"
+    app:layout_constraintEnd_toStartOf="parent"
+    app:layout_constraintStart_toStartOf="parent" />
 
   <include
     android:id="@+id/activity_main_tab_switcher"