diff --git a/app/src/main/java/dev/jdtech/jellyfin/MainActivity.kt b/app/src/main/java/dev/jdtech/jellyfin/MainActivity.kt
index 87689ee1..3ec726e1 100644
--- a/app/src/main/java/dev/jdtech/jellyfin/MainActivity.kt
+++ b/app/src/main/java/dev/jdtech/jellyfin/MainActivity.kt
@@ -38,4 +38,9 @@ class MainActivity : AppCompatActivity() {
         setupActionBarWithNavController(navController, appBarConfiguration)
         navView.setupWithNavController(navController)
     }
+
+    override fun onSupportNavigateUp(): Boolean {
+        onBackPressed()
+        return true
+    }
 }
\ No newline at end of file
diff --git a/app/src/main/java/dev/jdtech/jellyfin/fragments/MediaFragment.kt b/app/src/main/java/dev/jdtech/jellyfin/fragments/MediaFragment.kt
index be955d98..7285e6c8 100644
--- a/app/src/main/java/dev/jdtech/jellyfin/fragments/MediaFragment.kt
+++ b/app/src/main/java/dev/jdtech/jellyfin/fragments/MediaFragment.kt
@@ -26,7 +26,8 @@ class MediaFragment : Fragment() {
             CollectionListAdapter(CollectionListAdapter.OnClickListener { library ->
                 findNavController().navigate(
                     MediaFragmentDirections.actionNavigationMediaToLibraryFragment(
-                        library.id
+                        library.id,
+                        library.name
                     )
                 )
 
diff --git a/app/src/main/res/navigation/main_navigation.xml b/app/src/main/res/navigation/main_navigation.xml
index 4ed9c2b9..570f6d4b 100644
--- a/app/src/main/res/navigation/main_navigation.xml
+++ b/app/src/main/res/navigation/main_navigation.xml
@@ -15,7 +15,7 @@
         android:id="@+id/navigation_media"
         android:name="dev.jdtech.jellyfin.fragments.MediaFragment"
         android:label="@string/title_media"
-        tools:layout="@layout/fragment_media" >
+        tools:layout="@layout/fragment_media">
         <action
             android:id="@+id/action_navigation_media_to_libraryFragment"
             app:destination="@id/libraryFragment" />
@@ -29,10 +29,15 @@
     <fragment
         android:id="@+id/libraryFragment"
         android:name="dev.jdtech.jellyfin.fragments.LibraryFragment"
-        android:label="library_fragment"
-        tools:layout="@layout/fragment_library" >
+        android:label="{libraryName}"
+        tools:layout="@layout/fragment_library">
         <argument
             android:name="libraryId"
             app:argType="java.util.UUID" />
+        <argument
+            android:name="libraryName"
+            android:defaultValue="Library"
+            app:argType="string"
+            app:nullable="true" />
     </fragment>
 </navigation>
\ No newline at end of file