diff --git a/lib/widgets/navigation_scaffold/components/navigation_body.dart b/lib/widgets/navigation_scaffold/components/navigation_body.dart
index cb7d79c..4bf3d9e 100644
--- a/lib/widgets/navigation_scaffold/components/navigation_body.dart
+++ b/lib/widgets/navigation_scaffold/components/navigation_body.dart
@@ -139,7 +139,7 @@ class _NavigationBodyState extends ConsumerState<NavigationBody> {
             },
             icon: const Icon(IconsaxBold.menu),
           ),
-          if (AdaptiveLayout.of(context).isDesktop) ...[
+          if (AdaptiveLayout.of(context).size == ScreenLayout.dual) ...[
             const SizedBox(height: 8),
             AnimatedFadeSize(
               child: AnimatedSwitcher(
diff --git a/lib/widgets/navigation_scaffold/components/navigation_drawer.dart b/lib/widgets/navigation_scaffold/components/navigation_drawer.dart
index 1f1c0a7..678ce36 100644
--- a/lib/widgets/navigation_scaffold/components/navigation_drawer.dart
+++ b/lib/widgets/navigation_scaffold/components/navigation_drawer.dart
@@ -92,7 +92,7 @@ class NestedNavigationDrawer extends ConsumerWidget {
           ),
           ...views.map((library) => DrawerListButton(
               label: library.name,
-              selected: checkLibrary(context, library.id),
+              selected: context.router.currentUrl.contains(library.id),
               actions: [
                 ItemActionButton(
                   label: Text(context.localized.scanLibrary),
@@ -151,13 +151,4 @@ class NestedNavigationDrawer extends ConsumerWidget {
       ],
     );
   }
-
-  bool checkLibrary(BuildContext context, String id) {
-    try {
-      return context.router.current.name == LibrarySearchRoute().routeName &&
-          (context.routeData.queryParams.isNotEmpty && context.routeData.queryParams.getString('parentId') == id);
-    } catch (e) {
-      return false;
-    }
-  }
 }
diff --git a/lib/widgets/navigation_scaffold/navigation_scaffold.dart b/lib/widgets/navigation_scaffold/navigation_scaffold.dart
index bb0ef94..c0c57c3 100644
--- a/lib/widgets/navigation_scaffold/navigation_scaffold.dart
+++ b/lib/widgets/navigation_scaffold/navigation_scaffold.dart
@@ -65,7 +65,7 @@ class _NavigationScaffoldState extends ConsumerState<NavigationScaffold> {
         extendBody: true,
         floatingActionButtonLocation:
             playerState == VideoPlayerState.minimized ? FloatingActionButtonLocation.centerFloat : null,
-        floatingActionButton: AdaptiveLayout.of(context).layout == LayoutState.phone
+        floatingActionButton: AdaptiveLayout.of(context).size == ScreenLayout.single
             ? switch (playerState) {
                 VideoPlayerState.minimized => const Padding(
                     padding: EdgeInsets.symmetric(horizontal: 8),