diff --git a/lib/app/view/create_master_items.dart b/lib/app/view/create_master_items.dart
new file mode 100644
index 000000000..de5db08f1
--- /dev/null
+++ b/lib/app/view/create_master_items.dart
@@ -0,0 +1,140 @@
+import 'package:flutter/material.dart';
+import 'package:watch_it/watch_it.dart';
+
+import '../../app_config.dart';
+import '../../common/data/audio_type.dart';
+import '../../common/page_ids.dart';
+import '../../common/view/icons.dart';
+import '../../common/view/side_bar_fall_back_image.dart';
+import '../../common/view/theme.dart';
+import '../../custom_content/view/custom_content_page.dart';
+import '../../extensions/string_x.dart';
+import '../../home/home_page.dart';
+import '../../l10n/l10n.dart';
+import '../../library/library_model.dart';
+import '../../local_audio/view/album_page.dart';
+import '../../local_audio/view/local_audio_page.dart';
+import '../../playlists/view/liked_audio_page.dart';
+import '../../playlists/view/playlist_page.dart';
+import '../../podcasts/view/lazy_podcast_page.dart';
+import '../../podcasts/view/podcast_page_side_bar_icon.dart';
+import '../../podcasts/view/podcast_page_title.dart';
+import '../../podcasts/view/podcasts_page.dart';
+import '../../radio/view/radio_page.dart';
+import '../../radio/view/station_page.dart';
+import '../../radio/view/station_page_icon.dart';
+import '../../radio/view/station_title.dart';
+import '../../search/view/search_page.dart';
+import '../../settings/view/settings_page.dart';
+import 'main_page_icon.dart';
+import 'master_items.dart';
+
+List<MasterItem> createMasterItems() {
+  final libraryModel = di<LibraryModel>();
+  return [
+    MasterItem(
+      titleBuilder: (context) => Text(context.l10n.search),
+      pageBuilder: (_) => const SearchPage(),
+      iconBuilder: (_) => Icon(Iconz.search),
+      pageId: PageIDs.searchPage,
+    ),
+    MasterItem(
+      titleBuilder: (context) => Text(context.l10n.local),
+      pageBuilder: (_) => const LocalAudioPage(),
+      iconBuilder: (selected) => MainPageIcon(
+        audioType: AudioType.local,
+        selected: selected,
+      ),
+      pageId: PageIDs.localAudio,
+    ),
+    MasterItem(
+      titleBuilder: (context) => Text(context.l10n.radio),
+      pageBuilder: (_) => const RadioPage(),
+      iconBuilder: (selected) => MainPageIcon(
+        audioType: AudioType.radio,
+        selected: selected,
+      ),
+      pageId: PageIDs.radio,
+    ),
+    MasterItem(
+      titleBuilder: (context) => Text(context.l10n.podcasts),
+      pageBuilder: (_) => const PodcastsPage(),
+      iconBuilder: (selected) => MainPageIcon(
+        audioType: AudioType.podcast,
+        selected: selected,
+      ),
+      pageId: PageIDs.podcasts,
+    ),
+    if (AppConfig.isMobilePlatform)
+      MasterItem(
+        titleBuilder: (context) => Text(context.l10n.settings),
+        iconBuilder: (selected) =>
+            Icon(selected ? Iconz.settingsFilled : Iconz.settings),
+        pageBuilder: (context) => const SettingsPage(),
+        pageId: PageIDs.settings,
+      ),
+    if (AppConfig.isMobilePlatform)
+      MasterItem(
+        titleBuilder: (context) => Text(context.l10n.home),
+        iconBuilder: (selected) =>
+            Icon(selected ? Iconz.homeFilled : Iconz.home),
+        pageBuilder: (context) => const HomePage(),
+        pageId: PageIDs.homePage,
+      ),
+    MasterItem(
+      iconBuilder: (selected) => Icon(Iconz.plus),
+      titleBuilder: (context) => Text(context.l10n.add),
+      pageBuilder: (_) => const CustomContentPage(),
+      pageId: PageIDs.customContent,
+    ),
+    MasterItem(
+      titleBuilder: (context) => Text(context.l10n.likedSongs),
+      pageId: PageIDs.likedAudios,
+      pageBuilder: (_) => const LikedAudioPage(),
+      subtitleBuilder: (context) => Text(context.l10n.playlist),
+      iconBuilder: (selected) => LikedAudioPageIcon(selected: selected),
+    ),
+    for (final id in libraryModel.playlistIDs)
+      MasterItem(
+        titleBuilder: (context) => Text(id),
+        subtitleBuilder: (context) => Text(context.l10n.playlist),
+        pageId: id,
+        pageBuilder: (_) => PlaylistPage(pageId: id),
+        iconBuilder: (selected) => SideBarFallBackImage(
+          color: getAlphabetColor(id),
+          child: Icon(Iconz.playlist),
+        ),
+      ),
+    for (final feedUrl in libraryModel.podcastFeedUrls)
+      MasterItem(
+        titleBuilder: (_) => PodcastPageTitle(
+          feedUrl: feedUrl,
+        ),
+        subtitleBuilder: (context) => PodcastPageSubTitle(feedUrl: feedUrl),
+        pageId: feedUrl,
+        pageBuilder: (_) => LazyPodcastPage(feedUrl: feedUrl),
+        iconBuilder: (selected) => PodcastPageSideBarIcon(feedUrl: feedUrl),
+      ),
+    for (final id in libraryModel.favoriteAlbums)
+      MasterItem(
+        titleBuilder: (context) => Text(id.albumOfId),
+        subtitleBuilder: (context) => Text(id.artistOfId),
+        pageId: id,
+        pageBuilder: (_) => AlbumPage(id: id),
+        iconBuilder: (selected) => AlbumPageSideBarIcon(
+          albumId: id,
+        ),
+      ),
+    for (final uuid in libraryModel.starredStations.where((e) => e.isNotEmpty))
+      MasterItem(
+        titleBuilder: (context) => StationTitle(uuid: uuid),
+        subtitleBuilder: (context) => Text(context.l10n.station),
+        pageId: uuid,
+        pageBuilder: (_) => StationPage(uuid: uuid),
+        iconBuilder: (selected) => StationPageIcon(
+          uuid: uuid,
+          selected: selected,
+        ),
+      ),
+  ];
+}
diff --git a/lib/app/view/desktop_home_page.dart b/lib/app/view/desktop_home_page.dart
index e65e6a175..531f1bf33 100644
--- a/lib/app/view/desktop_home_page.dart
+++ b/lib/app/view/desktop_home_page.dart
@@ -38,8 +38,8 @@ class _DesktopHomePageState extends State<DesktopHomePage> {
           builder: (_) => PatchNotesDialog(
             onClose: () {
               if ((di<LocalAudioModel>().audios?.isNotEmpty ?? false) &&
-                  di<LibraryModel>().playlists.isNotEmpty &&
-                  di<LibraryModel>().pinnedAlbums.isNotEmpty &&
+                  di<LibraryModel>().playlistIDs.isNotEmpty &&
+                  di<LibraryModel>().favoriteAlbums.isNotEmpty &&
                   di<AppModel>().isBackupScreenNeeded &&
                   !di<AppModel>().wasBackupSaved &&
                   mounted) {
diff --git a/lib/app/view/master_detail_page.dart b/lib/app/view/master_detail_page.dart
index a676d177a..abf1ee76c 100644
--- a/lib/app/view/master_detail_page.dart
+++ b/lib/app/view/master_detail_page.dart
@@ -3,34 +3,30 @@ import 'dart:io';
 import 'package:collection/collection.dart';
 import 'package:flutter/material.dart';
 import 'package:watch_it/watch_it.dart';
-import 'package:yaru/yaru.dart';
 
 import '../../app_config.dart';
 import '../../common/page_ids.dart';
 import '../../common/view/back_gesture.dart';
 import '../../common/view/global_keys.dart';
-import '../../common/view/header_bar.dart';
 import '../../common/view/icons.dart';
 import '../../common/view/ui_constants.dart';
 import '../../extensions/build_context_x.dart';
 import '../../library/library_model.dart';
-import '../../settings/view/settings_action.dart';
-import 'master_items.dart';
-import 'master_tile.dart';
+import 'create_master_items.dart';
+import 'master_panel.dart';
 
-class MasterDetailPage extends StatelessWidget with WatchItMixin {
+class MasterDetailPage extends StatelessWidget {
   const MasterDetailPage({super.key});
 
   @override
   Widget build(BuildContext context) {
-    final libraryModel = watchIt<LibraryModel>();
-    final masterItems = createMasterItems(libraryModel: libraryModel);
+    final libraryModel = di<LibraryModel>();
 
     final drawer = Drawer(
       width: kMasterDetailSideBarWidth,
       child: Stack(
         children: [
-          MasterPanel(masterItems: masterItems, libraryModel: libraryModel),
+          const MasterPanel(),
           Positioned(
             left: Platform.isMacOS ? 5 : null,
             top: 5,
@@ -55,11 +51,7 @@ class MasterDetailPage extends StatelessWidget with WatchItMixin {
       drawer: Platform.isMacOS ? null : drawer,
       body: Row(
         children: [
-          if (context.showMasterPanel)
-            MasterPanel(
-              masterItems: masterItems,
-              libraryModel: libraryModel,
-            ),
+          if (context.showMasterPanel) const MasterPanel(),
           if (context.showMasterPanel) const VerticalDivider(),
           Expanded(
             child: Navigator(
@@ -68,6 +60,7 @@ class MasterDetailPage extends StatelessWidget with WatchItMixin {
               key: libraryModel.masterNavigatorKey,
               observers: [libraryModel],
               onGenerateRoute: (settings) {
+                final masterItems = createMasterItems();
                 final page = (masterItems.firstWhereOrNull(
                           (e) => e.pageId == settings.name,
                         ) ??
@@ -88,66 +81,3 @@ class MasterDetailPage extends StatelessWidget with WatchItMixin {
     );
   }
 }
-
-class MasterPanel extends StatelessWidget {
-  const MasterPanel({
-    super.key,
-    required this.masterItems,
-    required this.libraryModel,
-  });
-
-  final List<MasterItem> masterItems;
-  final LibraryModel libraryModel;
-
-  @override
-  Widget build(BuildContext context) {
-    return SizedBox(
-      width: kMasterDetailSideBarWidth,
-      child: Column(
-        children: [
-          const HeaderBar(
-            includeBackButton: false,
-            includeSidebarButton: false,
-            backgroundColor: Colors.transparent,
-            style: YaruTitleBarStyle.undecorated,
-            adaptive: false,
-            title: Text(AppConfig.appTitle),
-          ),
-          Expanded(
-            child: ListView.separated(
-              itemCount: masterItems.length,
-              itemBuilder: (context, index) {
-                final item = masterItems.elementAt(index);
-                return MasterTile(
-                  key: ValueKey(item.pageId),
-                  onTap: () {
-                    libraryModel.push(pageId: item.pageId);
-
-                    if (!context.showMasterPanel) {
-                      if (Platform.isMacOS) {
-                        masterScaffoldKey.currentState?.closeEndDrawer();
-                      } else {
-                        masterScaffoldKey.currentState?.closeDrawer();
-                      }
-                    }
-                  },
-                  pageId: item.pageId,
-                  libraryModel: libraryModel,
-                  leading: item.iconBuilder
-                      ?.call(libraryModel.selectedPageId == item.pageId),
-                  title: item.titleBuilder(context),
-                  subtitle: item.subtitleBuilder?.call(context),
-                  selected: libraryModel.selectedPageId == item.pageId,
-                );
-              },
-              separatorBuilder: (_, __) => const SizedBox(
-                height: 5,
-              ),
-            ),
-          ),
-          const SettingsButton.tile(),
-        ],
-      ),
-    );
-  }
-}
diff --git a/lib/app/view/master_items.dart b/lib/app/view/master_items.dart
index 989db7c3a..7ec67acfa 100644
--- a/lib/app/view/master_items.dart
+++ b/lib/app/view/master_items.dart
@@ -1,31 +1,5 @@
-import 'package:collection/collection.dart';
 import 'package:flutter/material.dart';
 
-import '../../app_config.dart';
-import '../../common/data/audio_type.dart';
-import '../../common/page_ids.dart';
-import '../../common/view/icons.dart';
-import '../../common/view/side_bar_fall_back_image.dart';
-import '../../common/view/theme.dart';
-import '../../custom_content/view/custom_content_page.dart';
-import '../../home/home_page.dart';
-import '../../l10n/l10n.dart';
-import '../../library/library_model.dart';
-import '../../local_audio/view/album_page.dart';
-import '../../local_audio/view/local_audio_page.dart';
-import '../../playlists/view/liked_audio_page.dart';
-import '../../playlists/view/playlist_page.dart';
-import '../../podcasts/view/lazy_podcast_page.dart';
-import '../../podcasts/view/podcast_page_side_bar_icon.dart';
-import '../../podcasts/view/podcast_page_title.dart';
-import '../../podcasts/view/podcasts_page.dart';
-import '../../radio/view/radio_page.dart';
-import '../../radio/view/station_page.dart';
-import '../../radio/view/station_page_icon.dart';
-import '../../search/view/search_page.dart';
-import '../../settings/view/settings_page.dart';
-import 'main_page_icon.dart';
-
 class MasterItem {
   MasterItem({
     required this.titleBuilder,
@@ -41,135 +15,3 @@ class MasterItem {
   final Widget Function(bool selected)? iconBuilder;
   final String pageId;
 }
-
-List<MasterItem> createMasterItems({required LibraryModel libraryModel}) {
-  return [
-    MasterItem(
-      titleBuilder: (context) => Text(context.l10n.search),
-      pageBuilder: (_) => const SearchPage(),
-      iconBuilder: (_) => Icon(Iconz.search),
-      pageId: PageIDs.searchPage,
-    ),
-    MasterItem(
-      titleBuilder: (context) => Text(context.l10n.local),
-      pageBuilder: (_) => const LocalAudioPage(),
-      iconBuilder: (selected) => MainPageIcon(
-        audioType: AudioType.local,
-        selected: selected,
-      ),
-      pageId: PageIDs.localAudio,
-    ),
-    MasterItem(
-      titleBuilder: (context) => Text(context.l10n.radio),
-      pageBuilder: (_) => const RadioPage(),
-      iconBuilder: (selected) => MainPageIcon(
-        audioType: AudioType.radio,
-        selected: selected,
-      ),
-      pageId: PageIDs.radio,
-    ),
-    MasterItem(
-      titleBuilder: (context) => Text(context.l10n.podcasts),
-      pageBuilder: (_) => const PodcastsPage(),
-      iconBuilder: (selected) => MainPageIcon(
-        audioType: AudioType.podcast,
-        selected: selected,
-      ),
-      pageId: PageIDs.podcasts,
-    ),
-    if (AppConfig.isMobilePlatform)
-      MasterItem(
-        titleBuilder: (context) => Text(context.l10n.settings),
-        iconBuilder: (selected) =>
-            Icon(selected ? Iconz.settingsFilled : Iconz.settings),
-        pageBuilder: (context) => const SettingsPage(),
-        pageId: PageIDs.settings,
-      ),
-    if (AppConfig.isMobilePlatform)
-      MasterItem(
-        titleBuilder: (context) => Text(context.l10n.home),
-        iconBuilder: (selected) =>
-            Icon(selected ? Iconz.homeFilled : Iconz.home),
-        pageBuilder: (context) => const HomePage(),
-        pageId: PageIDs.homePage,
-      ),
-    MasterItem(
-      iconBuilder: (selected) => Icon(Iconz.plus),
-      titleBuilder: (context) => Text(context.l10n.add),
-      pageBuilder: (_) => const CustomContentPage(),
-      pageId: PageIDs.customContent,
-    ),
-    MasterItem(
-      titleBuilder: (context) => Text(context.l10n.likedSongs),
-      pageId: PageIDs.likedAudios,
-      pageBuilder: (_) => const LikedAudioPage(),
-      subtitleBuilder: (context) => Text(context.l10n.playlist),
-      iconBuilder: (selected) => LikedAudioPageIcon(selected: selected),
-    ),
-    for (final playlist in libraryModel.playlists.entries)
-      MasterItem(
-        titleBuilder: (context) => Text(playlist.key),
-        subtitleBuilder: (context) => Text(context.l10n.playlist),
-        pageId: playlist.key,
-        pageBuilder: (_) => PlaylistPage(pageId: playlist.key),
-        iconBuilder: (selected) => SideBarFallBackImage(
-          color: getAlphabetColor(playlist.key),
-          child: Icon(
-            Iconz.playlist,
-          ),
-        ),
-      ),
-    for (final podcast in libraryModel.podcasts.entries)
-      MasterItem(
-        titleBuilder: (_) => PodcastPageTitle(
-          feedUrl: podcast.key,
-          title: podcast.value.firstOrNull?.album ??
-              podcast.value.firstOrNull?.title ??
-              podcast.value.firstOrNull.toString(),
-        ),
-        subtitleBuilder: (context) => Text(
-          podcast.value.firstOrNull?.artist ?? context.l10n.podcast,
-        ),
-        pageId: podcast.key,
-        pageBuilder: (_) => LazyPodcastPage(feedUrl: podcast.key),
-        iconBuilder: (selected) => PodcastPageSideBarIcon(
-          imageUrl: podcast.value.firstOrNull?.albumArtUrl ??
-              podcast.value.firstOrNull?.imageUrl,
-        ),
-      ),
-    for (final album in libraryModel.pinnedAlbums.entries)
-      MasterItem(
-        titleBuilder: (context) => Text(
-          album.value.firstOrNull?.album ?? album.key,
-        ),
-        subtitleBuilder: (context) =>
-            Text(album.value.firstOrNull?.artist ?? context.l10n.album),
-        pageId: album.key,
-        pageBuilder: (_) => AlbumPage(
-          album: album.value,
-          id: album.key,
-        ),
-        iconBuilder: (selected) => AlbumPageSideBarIcon(
-          audio: album.value.firstOrNull,
-        ),
-      ),
-    for (final station in libraryModel.starredStations.entries
-        .where((e) => e.value.isNotEmpty))
-      MasterItem(
-        titleBuilder: (context) =>
-            Text(station.value.first.title ?? station.key),
-        subtitleBuilder: (context) {
-          return Text(context.l10n.station);
-        },
-        pageId: station.key,
-        pageBuilder: (_) => StationPage(
-          station: station.value.first,
-        ),
-        iconBuilder: (selected) => StationPageIcon(
-          imageUrl: station.value.first.imageUrl,
-          fallBackColor: getAlphabetColor(station.value.first.title ?? 'a'),
-          selected: selected,
-        ),
-      ),
-  ];
-}
diff --git a/lib/app/view/master_panel.dart b/lib/app/view/master_panel.dart
new file mode 100644
index 000000000..4ec14e0b8
--- /dev/null
+++ b/lib/app/view/master_panel.dart
@@ -0,0 +1,68 @@
+import 'package:flutter/material.dart';
+import 'package:watch_it/watch_it.dart';
+import 'package:yaru/yaru.dart';
+
+import '../../app_config.dart';
+import '../../common/view/header_bar.dart';
+import '../../common/view/ui_constants.dart';
+import '../../library/library_model.dart';
+import '../../settings/view/settings_action.dart';
+import 'create_master_items.dart';
+import 'master_tile.dart';
+
+class MasterPanel extends StatelessWidget {
+  const MasterPanel({super.key});
+
+  @override
+  Widget build(BuildContext context) => const SizedBox(
+        width: kMasterDetailSideBarWidth,
+        child: Column(
+          children: [
+            HeaderBar(
+              includeBackButton: false,
+              includeSidebarButton: false,
+              backgroundColor: Colors.transparent,
+              style: YaruTitleBarStyle.undecorated,
+              adaptive: false,
+              title: Text(AppConfig.appTitle),
+            ),
+            Expanded(child: MasterList()),
+            SettingsButton.tile(),
+          ],
+        ),
+      );
+}
+
+class MasterList extends StatelessWidget with WatchItMixin {
+  const MasterList({super.key});
+
+  @override
+  Widget build(BuildContext context) {
+    watchPropertyValue((LibraryModel m) => m.playlistsLength);
+    watchPropertyValue((LibraryModel m) => m.starredStationsLength);
+    watchPropertyValue((LibraryModel m) => m.favoriteAlbumsLength);
+    watchPropertyValue((LibraryModel m) => m.podcastsLength);
+    final selectedPageId =
+        watchPropertyValue((LibraryModel m) => m.selectedPageId);
+    final masterItems = createMasterItems();
+    final libraryModel = di<LibraryModel>();
+    return ListView.separated(
+      itemCount: masterItems.length,
+      itemBuilder: (context, index) {
+        final item = masterItems.elementAt(index);
+        return MasterTile(
+          key: ValueKey(item.pageId),
+          onTap: () => libraryModel.push(pageId: item.pageId),
+          pageId: item.pageId,
+          leading: item.iconBuilder?.call(selectedPageId == item.pageId),
+          title: item.titleBuilder(context),
+          subtitle: item.subtitleBuilder?.call(context),
+          selected: selectedPageId == item.pageId,
+        );
+      },
+      separatorBuilder: (_, __) => const SizedBox(
+        height: 5,
+      ),
+    );
+  }
+}
diff --git a/lib/app/view/master_tile.dart b/lib/app/view/master_tile.dart
index 770569a55..c7beda9f6 100644
--- a/lib/app/view/master_tile.dart
+++ b/lib/app/view/master_tile.dart
@@ -2,13 +2,16 @@ import 'package:flutter/material.dart';
 import 'package:watch_it/watch_it.dart';
 import 'package:yaru/yaru.dart';
 
+import '../../common/data/audio.dart';
 import '../../common/data/audio_type.dart';
 import '../../common/page_ids.dart';
+import '../../common/view/global_keys.dart';
 import '../../common/view/icons.dart';
 import '../../common/view/spaced_divider.dart';
 import '../../common/view/ui_constants.dart';
 import '../../extensions/build_context_x.dart';
 import '../../library/library_model.dart';
+import '../../local_audio/local_audio_model.dart';
 import '../../player/player_model.dart';
 import '../../radio/radio_model.dart';
 
@@ -20,7 +23,6 @@ class MasterTile extends StatelessWidget {
     required this.title,
     this.subtitle,
     this.trailing,
-    required this.libraryModel,
     required this.pageId,
     required this.onTap,
   });
@@ -30,7 +32,6 @@ class MasterTile extends StatelessWidget {
   final Widget? title;
   final Widget? subtitle;
   final Widget? trailing;
-  final LibraryModel libraryModel;
   final String pageId;
   final void Function() onTap;
 
@@ -38,7 +39,12 @@ class MasterTile extends StatelessWidget {
   Widget build(BuildContext context) {
     final yaruMasterTile = YaruMasterTile(
       title: title,
-      onTap: onTap,
+      onTap: () {
+        masterScaffoldKey.currentState
+          ?..closeEndDrawer()
+          ..closeDrawer();
+        onTap();
+      },
       selected: selected,
       leading: leading,
       subtitle: subtitle,
@@ -56,7 +62,6 @@ class MasterTile extends StatelessWidget {
       selected: selected,
       pageId: pageId,
       tile: tile,
-      libraryModel: libraryModel,
     );
   }
 }
@@ -99,13 +104,11 @@ class _PlayAbleMasterTile extends StatefulWidget
     required this.pageId,
     required this.tile,
     this.selected,
-    required this.libraryModel,
   });
 
   final String pageId;
   final Widget tile;
   final bool? selected;
-  final LibraryModel libraryModel;
 
   @override
   State<_PlayAbleMasterTile> createState() => __PlayAbleMasterTileState();
@@ -116,9 +119,7 @@ class __PlayAbleMasterTileState extends State<_PlayAbleMasterTile> {
 
   @override
   Widget build(BuildContext context) {
-    final audios = widget.libraryModel.getAudiosById(widget.pageId);
-
-    if (audios == null || audios.isEmpty) {
+    if (PageIDs.permanent.contains(widget.pageId)) {
       return widget.tile;
     }
 
@@ -128,26 +129,6 @@ class __PlayAbleMasterTileState extends State<_PlayAbleMasterTile> {
     final isPlaying = watchPropertyValue((PlayerModel m) => m.isPlaying);
     final playerModel = di<PlayerModel>();
 
-    void onPlay() {
-      if (audios.first.audioType == AudioType.radio) {
-        di<RadioModel>().clickStation(audios.first);
-      }
-      if (isEnQueued) {
-        isPlaying ? playerModel.pause() : playerModel.resume();
-      } else {
-        playerModel
-            .startPlaylist(
-              audios: audios,
-              listName: widget.pageId,
-            )
-            .then(
-              (_) => widget.libraryModel.removePodcastUpdate(
-                widget.pageId,
-              ),
-            );
-      }
-    }
-
     return MouseRegion(
       onEnter: (e) => setState(() => _hovered = true),
       onExit: (e) => setState(() => _hovered = false),
@@ -161,7 +142,26 @@ class __PlayAbleMasterTileState extends State<_PlayAbleMasterTile> {
               child: CircleAvatar(
                 radius: kTinyButtonSize / 2,
                 child: IconButton(
-                  onPressed: onPlay,
+                  onPressed: () async {
+                    final audios = await getAudiosById(widget.pageId);
+                    if (audios?.firstOrNull?.audioType == AudioType.radio) {
+                      di<RadioModel>().clickStation(audios?.firstOrNull);
+                    }
+                    if (isEnQueued) {
+                      isPlaying ? playerModel.pause() : playerModel.resume();
+                    } else if (audios != null) {
+                      playerModel
+                          .startPlaylist(
+                            audios: audios,
+                            listName: widget.pageId,
+                          )
+                          .then(
+                            (_) => di<LibraryModel>().removePodcastUpdate(
+                              widget.pageId,
+                            ),
+                          );
+                    }
+                  },
                   icon: Icon(
                     isPlaying && isEnQueued ? Iconz.pause : Iconz.playFilled,
                     size: kTinyButtonIconSize,
@@ -174,4 +174,17 @@ class __PlayAbleMasterTileState extends State<_PlayAbleMasterTile> {
       ),
     );
   }
+
+  Future<List<Audio>?> getAudiosById(String pageId) async {
+    final libraryModel = di<LibraryModel>();
+
+    if (libraryModel.isStarredStation(pageId)) {
+      var audio = await di<RadioModel>().getStationByUUID(pageId);
+      return audio == null ? [] : [audio];
+    }
+
+    return libraryModel.getPodcast(pageId) ??
+        libraryModel.getPlaylistById(pageId) ??
+        di<LocalAudioModel>().findAlbum(pageId);
+  }
 }
diff --git a/lib/app/view/mobile_musicpod_app.dart b/lib/app/view/mobile_musicpod_app.dart
index 8aa0b0c29..77dab6834 100644
--- a/lib/app/view/mobile_musicpod_app.dart
+++ b/lib/app/view/mobile_musicpod_app.dart
@@ -11,7 +11,7 @@ import '../../common/view/theme.dart';
 import '../../l10n/l10n.dart';
 import '../../library/library_model.dart';
 import '../../settings/settings_model.dart';
-import 'master_items.dart';
+import 'create_master_items.dart';
 import 'mobile_page.dart';
 
 class MobileMusicPodApp extends StatelessWidget with WatchItMixin {
@@ -25,7 +25,11 @@ class MobileMusicPodApp extends StatelessWidget with WatchItMixin {
     final phoenix = phoenixTheme(color: accent ?? Colors.greenAccent);
 
     final libraryModel = watchIt<LibraryModel>();
-    final masterItems = createMasterItems(libraryModel: libraryModel);
+    final masterItems = createMasterItems();
+    watchPropertyValue((LibraryModel m) => m.playlistsLength);
+    watchPropertyValue((LibraryModel m) => m.starredStationsLength);
+    watchPropertyValue((LibraryModel m) => m.favoriteAlbumsLength);
+    watchPropertyValue((LibraryModel m) => m.podcastsLength);
 
     return MaterialApp(
       navigatorKey: libraryModel.masterNavigatorKey,
diff --git a/lib/common/data/audio.dart b/lib/common/data/audio.dart
index 68f2b4bbf..38db5746c 100644
--- a/lib/common/data/audio.dart
+++ b/lib/common/data/audio.dart
@@ -406,16 +406,27 @@ class Audio {
   String? get albumId {
     final albumName = album;
     final artistName = artist;
-    final id = albumName == null && artistName == null
+    return albumName == null && artistName == null
         ? null
-        : AppConfig.isMobilePlatform
-            ? '${artistName ?? ''}_${albumName ?? ''}'
-            : '${artistName ?? ''}:${albumName ?? ''}';
-    return AppConfig.isMobilePlatform ? id?.replaceAll(' ', '_') : id;
+        : '${artistName ?? ''}$albumIdSplitter${albumName ?? ''}'.replaceAll(
+            albumIdReplacement,
+            albumIdReplacer,
+          );
   }
 
-  bool get hasPathAndId =>
-      albumId?.isNotEmpty == true &&
+  // Note this assumes that no artist or no album includes ___ on their own =)
+  static const String albumIdSplitter =
+      '$albumIdReplacer${AppConfig.appId}$albumIdReplacer';
+  static const String albumIdReplacer = '___';
+  static const String albumIdReplacement = ' ';
+
+  bool get canHaveLocalCover =>
+      albumId != null &&
+      albumId!.isNotEmpty &&
       path != null &&
       audioType == AudioType.local;
+
+  bool get isLocal => audioType == AudioType.local;
+  bool get isPodcast => audioType == AudioType.podcast;
+  bool get isRadio => audioType == AudioType.radio;
 }
diff --git a/lib/common/file_names.dart b/lib/common/file_names.dart
index 2d954eafb..f1f1306b0 100644
--- a/lib/common/file_names.dart
+++ b/lib/common/file_names.dart
@@ -1,29 +1,21 @@
 class FileNames {
   static const likedAudios = 'likedAudios.json';
   static const playlists = 'playlists.json';
-  static const pinnedAlbums = 'finallyFixedPinnedAlbums.json';
   static const podcasts = 'podcasts.json';
   static const podcastUpdates = 'podcastsupdates.json';
-  static const starredStations = 'uuidStarredStations.json';
   static const lastPositions = 'lastPositions.json';
   static const playerState = 'playerstate.json';
-  static const appState = 'appstate.json';
   static const downloads = 'downloads.json';
   static const feedsWithDownloads = 'feedswithdownloads.json';
-  static const coverStore = 'coverStore.json';
 
   static const all = {
     likedAudios,
     playlists,
-    pinnedAlbums,
     podcasts,
     podcastUpdates,
-    starredStations,
     lastPositions,
     playerState,
-    appState,
     downloads,
     feedsWithDownloads,
-    coverStore,
   };
 }
diff --git a/lib/common/page_ids.dart b/lib/common/page_ids.dart
index b3ec3c665..33fa129bd 100644
--- a/lib/common/page_ids.dart
+++ b/lib/common/page_ids.dart
@@ -1,7 +1,6 @@
 class PageIDs {
   static const settings = 'settings';
   static const homePage = 'homePage';
-  static const selectedPage = 'selectedPageId';
   static const localAudio = 'localAudio';
   static const podcasts = 'podcasts';
   static const radio = 'radio';
diff --git a/lib/common/view/audio_filter.dart b/lib/common/view/audio_filter.dart
index 60fcc3d4d..7c81bb186 100644
--- a/lib/common/view/audio_filter.dart
+++ b/lib/common/view/audio_filter.dart
@@ -1,7 +1,6 @@
 import 'package:collection/collection.dart';
 
 import '../data/audio.dart';
-import 'package:intl/intl.dart';
 
 enum AudioFilter {
   trackNumber,
@@ -13,20 +12,6 @@ enum AudioFilter {
   diskNumber;
 }
 
-int _compareStrings(String a, String b) {
-  final r = RegExp('\\d+');
-  final f = NumberFormat('0' * 16);
-  final aNew = a.replaceAllMapped(
-    r,
-    (match) => f.format(int.tryParse(match[0] ?? '0') ?? 0),
-  );
-  final bNew = b.replaceAllMapped(
-    r,
-    (match) => f.format(int.tryParse(match[0] ?? '0') ?? 0),
-  );
-  return aNew.compareTo(bNew);
-}
-
 Iterable<Audio> splitByDiscs(
   Iterable<Audio> audios,
 ) {
@@ -56,8 +41,8 @@ void sortListByAudioFilter({
       audios.sort((a, b) {
         if (a.artist != null && b.artist != null) {
           return descending
-              ? _compareStrings(b.artist!, a.artist!)
-              : _compareStrings(a.artist!, b.artist!);
+              ? compareNatural(b.artist!, a.artist!)
+              : compareNatural(a.artist!, b.artist!);
         }
         return 0;
       });
@@ -65,8 +50,8 @@ void sortListByAudioFilter({
       audios.sort((a, b) {
         if (a.title != null && b.title != null) {
           return descending
-              ? _compareStrings(b.title!, a.title!)
-              : _compareStrings(a.title!, b.title!);
+              ? compareNatural(b.title!, a.title!)
+              : compareNatural(a.title!, b.title!);
         }
         return 0;
       });
@@ -83,8 +68,8 @@ void sortListByAudioFilter({
       audios.sort((a, b) {
         if (a.album != null && b.album != null) {
           final albumComp = descending
-              ? _compareStrings(b.album!, a.album!)
-              : _compareStrings(a.album!, b.album!);
+              ? compareNatural(b.album!, a.album!)
+              : compareNatural(a.album!, b.album!);
           if (albumComp == 0 &&
               a.trackNumber != null &&
               b.trackNumber != null) {
@@ -111,8 +96,8 @@ void sortListByAudioFilter({
       audios.sort((a, b) {
         if (a.genre != null && b.genre != null) {
           return descending
-              ? _compareStrings(b.genre!, a.genre!)
-              : _compareStrings(a.genre!, b.genre!);
+              ? compareNatural(b.genre!, a.genre!)
+              : compareNatural(a.genre!, b.genre!);
         }
         return 0;
       });
diff --git a/lib/common/view/audio_tile.dart b/lib/common/view/audio_tile.dart
index 0045b83ec..1c58f89e7 100644
--- a/lib/common/view/audio_tile.dart
+++ b/lib/common/view/audio_tile.dart
@@ -201,7 +201,7 @@ class _AudioTileTrail extends StatelessWidget with WatchItMixin {
 
   @override
   Widget build(BuildContext context) {
-    final liked = watchPropertyValue((LibraryModel m) => m.liked(audio));
+    final liked = watchPropertyValue((LibraryModel m) => m.isLikedAudio(audio));
     final starred = watchPropertyValue(
       (LibraryModel m) => m.isStarredStation(audio.uuid),
     );
diff --git a/lib/common/view/audio_tile_bottom_sheet.dart b/lib/common/view/audio_tile_bottom_sheet.dart
index e8ce4f79a..7c7edbbdb 100644
--- a/lib/common/view/audio_tile_bottom_sheet.dart
+++ b/lib/common/view/audio_tile_bottom_sheet.dart
@@ -162,6 +162,7 @@ class AudioTileBottomSheet extends StatelessWidget {
                                     builder: (context) =>
                                         MetaDataContent.dialog(
                                       audio: audios.first,
+                                      pageId: playlistId,
                                     ),
                                   );
                                 },
@@ -193,16 +194,10 @@ class AudioTileBottomSheet extends StatelessWidget {
                           onTap: () {
                             final artistId = audios.firstOrNull?.artist;
                             if (artistId != null) {
-                              final artistAudios = di<LocalAudioModel>()
-                                  .findTitlesOfArtist(artistId);
-                              if (artistAudios != null) {
-                                libraryModel.push(
-                                  pageId: artistId,
-                                  builder: (c) => ArtistPage(
-                                    artistAudios: artistAudios,
-                                  ),
-                                );
-                              }
+                              libraryModel.push(
+                                pageId: artistId,
+                                builder: (c) => ArtistPage(pageId: artistId),
+                              );
                             }
                           },
                         ),
@@ -216,17 +211,13 @@ class AudioTileBottomSheet extends StatelessWidget {
                           title: Text(l10n.showAlbumPage),
                           onTap: () {
                             final albumId = audios.firstOrNull?.albumId;
-                            final albumName = audios.firstOrNull?.album;
-                            if (albumName != null) {
+                            if (albumId != null) {
                               final albumAudios =
-                                  di<LocalAudioModel>().findAlbum(albumName);
-                              if (albumId != null && albumAudios != null) {
+                                  di<LocalAudioModel>().findAlbum(albumId);
+                              if (albumAudios != null) {
                                 libraryModel.push(
                                   pageId: albumId,
-                                  builder: (context) => AlbumPage(
-                                    id: albumId,
-                                    album: albumAudios,
-                                  ),
+                                  builder: (context) => AlbumPage(id: albumId),
                                 );
                               }
                             }
diff --git a/lib/common/view/audio_tile_image.dart b/lib/common/view/audio_tile_image.dart
index 47b1e0de7..3606bac08 100644
--- a/lib/common/view/audio_tile_image.dart
+++ b/lib/common/view/audio_tile_image.dart
@@ -20,7 +20,7 @@ class AudioTileImage extends StatelessWidget {
   Widget build(BuildContext context) {
     final fallbackIcon = AudioFallBackIcon(audio: audio, iconSize: size / 1.65);
     Widget image;
-    if (audio?.hasPathAndId == true) {
+    if (audio?.canHaveLocalCover == true) {
       image = LocalCover(
         albumId: audio!.albumId!,
         path: audio!.path!,
diff --git a/lib/common/view/audio_tile_option_button.dart b/lib/common/view/audio_tile_option_button.dart
index 72ba1b433..08689bb73 100644
--- a/lib/common/view/audio_tile_option_button.dart
+++ b/lib/common/view/audio_tile_option_button.dart
@@ -127,8 +127,10 @@ class AudioTileOptionButton extends StatelessWidget {
             PopupMenuItem(
               onTap: () => showDialog(
                 context: context,
-                builder: (context) =>
-                    MetaDataContent.dialog(audio: audios.first),
+                builder: (context) => MetaDataContent.dialog(
+                  audio: audios.first,
+                  pageId: playlistId,
+                ),
               ),
               child: YaruTile(
                 leading: Icon(Iconz.info),
diff --git a/lib/common/view/avatar_play_button.dart b/lib/common/view/avatar_play_button.dart
index 6e2d0d7cf..4c08f7a5a 100644
--- a/lib/common/view/avatar_play_button.dart
+++ b/lib/common/view/avatar_play_button.dart
@@ -24,6 +24,7 @@ class AvatarPlayButton extends StatelessWidget with WatchItMixin {
   Widget build(BuildContext context) {
     final theme = context.theme;
     final playerModel = di<PlayerModel>();
+    final disabled = pageId.isEmpty || audios.isEmpty;
     final isPlayerPlaying = watchPropertyValue((PlayerModel m) => m.isPlaying);
     final pageIsQueue = watchPropertyValue(
       (PlayerModel m) => m.queueName != null && m.queueName == pageId,
@@ -38,11 +39,11 @@ class AvatarPlayButton extends StatelessWidget with WatchItMixin {
       child: CircleAvatar(
         radius: bigAvatarButtonRadius,
         backgroundColor: theme.colorScheme.inverseSurface.withAlpha(
-          pageId.isEmpty ? 180 : 255,
+          disabled ? 50 : 255,
         ),
         child: IconButton(
           tooltip: context.l10n.playAll,
-          onPressed: pageId.isEmpty
+          onPressed: disabled
               ? null
               : () {
                   if (audios.isNotEmpty &&
@@ -72,7 +73,7 @@ class AvatarPlayButton extends StatelessWidget with WatchItMixin {
                 },
           icon: Icon(
             iconData,
-            color: theme.colorScheme.onInverseSurface,
+            color: disabled ? null : theme.colorScheme.onInverseSurface,
           ),
         ),
       ),
diff --git a/lib/common/view/like_all_icon.dart b/lib/common/view/like_all_icon.dart
index d9ff631b9..f5e9fd49e 100644
--- a/lib/common/view/like_all_icon.dart
+++ b/lib/common/view/like_all_icon.dart
@@ -12,10 +12,9 @@ class LikeAllIcon extends StatelessWidget with WatchItMixin {
 
   @override
   Widget build(BuildContext context) {
-    final likedAudios = watchPropertyValue((LibraryModel m) => m.likedAudios);
+    final liked =
+        watchPropertyValue((LibraryModel m) => m.isLikedAudios(audios));
     final libraryModel = di<LibraryModel>();
-
-    final liked = Set.from(likedAudios).containsAll(audios);
     return IconButton(
       onPressed: () => liked
           ? libraryModel.removeLikedAudios(audios)
diff --git a/lib/common/view/like_icon.dart b/lib/common/view/like_icon.dart
index 78bb336a1..8cb572eef 100644
--- a/lib/common/view/like_icon.dart
+++ b/lib/common/view/like_icon.dart
@@ -23,9 +23,9 @@ class LikeIcon extends StatelessWidget with WatchItMixin {
   Widget build(BuildContext context) {
     final libraryModel = di<LibraryModel>();
 
-    watchPropertyValue((LibraryModel m) => m.likedAudios.length);
+    watchPropertyValue((LibraryModel m) => m.likedAudiosLength);
 
-    final liked = libraryModel.liked(audio);
+    final liked = libraryModel.isLikedAudio(audio);
 
     final void Function()? onLike;
     if (audio == null) {
@@ -33,9 +33,9 @@ class LikeIcon extends StatelessWidget with WatchItMixin {
     } else {
       onLike = () {
         if (liked) {
-          libraryModel.removeLikedAudio(audio!, true);
+          libraryModel.removeLikedAudio(audio!);
         } else {
-          libraryModel.addLikedAudio(audio!, true);
+          libraryModel.addLikedAudio(audio!);
           showAddedToPlaylistSnackBar(
             context: context,
             libraryModel: libraryModel,
@@ -86,7 +86,6 @@ class RadioLikeIcon extends StatelessWidget with WatchItMixin {
             ? libraryModel.unStarStation(audio!.uuid!)
             : libraryModel.addStarredStation(
                 audio!.uuid!,
-                [audio!],
               );
       };
     }
diff --git a/lib/common/view/local_metadata_covers.dart b/lib/common/view/local_metadata_covers.dart
new file mode 100644
index 000000000..724296646
--- /dev/null
+++ b/lib/common/view/local_metadata_covers.dart
@@ -0,0 +1,234 @@
+import 'dart:io';
+
+import 'package:audio_metadata_reader/audio_metadata_reader.dart';
+import 'package:flutter/material.dart';
+import 'package:mime/mime.dart';
+import 'package:watch_it/watch_it.dart';
+import 'package:yaru/yaru.dart';
+
+import '../../extensions/build_context_x.dart';
+import '../../extensions/picture_type_x.dart';
+import '../../external_path/external_path_service.dart';
+import '../../l10n/l10n.dart';
+import '../../local_audio/local_audio_model.dart';
+import '../../local_audio/view/local_cover.dart';
+import '../data/audio.dart';
+import 'drop_down_arrow.dart';
+import 'icons.dart';
+import 'meta_data_dialog.dart';
+import 'ui_constants.dart';
+
+class LocalMetadataCovers extends StatefulWidget {
+  const LocalMetadataCovers({
+    super.key,
+    required this.audio,
+  });
+
+  final Audio audio;
+
+  @override
+  State<LocalMetadataCovers> createState() => _LocalMetadataCoversState();
+}
+
+class _LocalMetadataCoversState extends State<LocalMetadataCovers> {
+  AudioMetadata? data;
+  @override
+  void initState() {
+    super.initState();
+    if (widget.audio.path != null) {
+      data = readMetadata(File(widget.audio.path!), getImage: true);
+    }
+  }
+
+  @override
+  Widget build(BuildContext context) {
+    const dimension = MetaDataContent.dimension;
+    return Padding(
+      padding: const EdgeInsets.only(
+        bottom: kLargestSpace,
+      ),
+      child: ClipRRect(
+        borderRadius: BorderRadius.circular(kMediumSpace),
+        child: Stack(
+          children: [
+            data == null || data!.pictures.isEmpty
+                ? widget.audio.path == null || widget.audio.albumId == null
+                    ? const SizedBox.shrink()
+                    : LocalCover(
+                        path: widget.audio.path!,
+                        albumId: widget.audio.albumId!,
+                        fallback: Icon(
+                          Iconz.musicNote,
+                          size: dimension / 2,
+                        ),
+                        width: dimension,
+                        height: dimension,
+                        fit: BoxFit.cover,
+                      )
+                : YaruCarousel(
+                    height: dimension,
+                    width: dimension,
+                    placeIndicatorMarginTop: 0,
+                    placeIndicator: false,
+                    navigationControls: true,
+                    controller: YaruCarouselController(
+                      viewportFraction: 1,
+                    ),
+                    children: data!.pictures
+                        .map(
+                          (picture) => Stack(
+                            fit: StackFit.expand,
+                            alignment: Alignment.center,
+                            children: [
+                              Image.memory(
+                                picture.bytes,
+                                width: dimension,
+                                height: dimension,
+                                fit: BoxFit.cover,
+                              ),
+                              Positioned(
+                                bottom: kMediumSpace,
+                                child: Material(
+                                  shape: RoundedRectangleBorder(
+                                    side: BorderSide(
+                                      color: context.colorScheme.outline,
+                                      width: 1,
+                                    ),
+                                    borderRadius: BorderRadius.circular(
+                                      20,
+                                    ),
+                                  ),
+                                  child: DropdownButton(
+                                    padding: const EdgeInsets.symmetric(
+                                      horizontal: kMediumSpace,
+                                    ),
+                                    borderRadius: BorderRadius.circular(
+                                      20,
+                                    ),
+                                    isDense: true,
+                                    icon: const DropDownArrow(),
+                                    underline: const SizedBox.shrink(),
+                                    value: picture.pictureType,
+                                    items: PictureType.values
+                                        .map(
+                                          (e) => DropdownMenuItem(
+                                            value: e,
+                                            child: SizedBox(
+                                              width: dimension / 2,
+                                              child: Tooltip(
+                                                message: e.localize(
+                                                  context.l10n,
+                                                ),
+                                                child: Text(
+                                                  e.localize(context.l10n),
+                                                  overflow:
+                                                      TextOverflow.ellipsis,
+                                                ),
+                                              ),
+                                            ),
+                                          ),
+                                        )
+                                        .toList(),
+                                    onChanged: (v) {
+                                      di<LocalAudioModel>().changeMetadata(
+                                        widget.audio,
+                                        pictures: [
+                                          if (data?.pictures != null)
+                                            ...data!.pictures.map(
+                                              (e) {
+                                                if (v != null &&
+                                                    e.pictureType != v &&
+                                                    File.fromRawPath(e.bytes)
+                                                            .path ==
+                                                        File.fromRawPath(
+                                                          picture.bytes,
+                                                        ).path) {
+                                                  return Picture(
+                                                    e.bytes,
+                                                    e.mimetype,
+                                                    v,
+                                                  );
+                                                } else {
+                                                  return e;
+                                                }
+                                              },
+                                            ),
+                                        ],
+                                      );
+                                      data = readMetadata(
+                                        File(widget.audio.path!),
+                                        getImage: true,
+                                      );
+                                      setState(() {});
+                                    },
+                                  ),
+                                ),
+                              ),
+                            ],
+                          ),
+                        )
+                        .toList(),
+                  ),
+            Positioned(
+              top: kMediumSpace,
+              right: kMediumSpace,
+              child: FloatingActionButton.small(
+                child: Icon(Iconz.plus),
+                onPressed: () async {
+                  final paths =
+                      await di<ExternalPathService>().getPathsOfFiles();
+                  di<LocalAudioModel>().changeMetadata(
+                    widget.audio,
+                    pictures: [
+                      if (data?.pictures != null) ...data!.pictures,
+                      ...paths.map(
+                        (e) => Picture(
+                          File(e).readAsBytesSync(),
+                          lookupMimeType(e) ?? '',
+                          PictureType.coverFront,
+                        ),
+                      ),
+                    ],
+                  );
+                  data = readMetadata(
+                    File(widget.audio.path!),
+                    getImage: true,
+                  );
+                  setState(() {});
+                },
+              ),
+            ),
+            Positioned(
+              top: kMediumSpace,
+              left: kMediumSpace,
+              child: FloatingActionButton.small(
+                child: Icon(Iconz.refresh),
+                onPressed: () async {
+                  final paths =
+                      await di<ExternalPathService>().getPathsOfFiles();
+                  di<LocalAudioModel>().changeMetadata(
+                    widget.audio,
+                    pictures: [
+                      ...paths.map(
+                        (e) => Picture(
+                          File(e).readAsBytesSync(),
+                          lookupMimeType(e) ?? '',
+                          PictureType.illustration,
+                        ),
+                      ),
+                    ],
+                  );
+                  data = readMetadata(
+                    File(widget.audio.path!),
+                    getImage: true,
+                  );
+                  setState(() {});
+                },
+              ),
+            ),
+          ],
+        ),
+      ),
+    );
+  }
+}
diff --git a/lib/common/view/local_metadata_tile.dart b/lib/common/view/local_metadata_tile.dart
new file mode 100644
index 000000000..bdacb02bb
--- /dev/null
+++ b/lib/common/view/local_metadata_tile.dart
@@ -0,0 +1,229 @@
+import 'package:flutter/material.dart';
+import 'package:watch_it/watch_it.dart';
+import 'package:yaru/yaru.dart';
+
+import '../../extensions/build_context_x.dart';
+import '../../l10n/l10n.dart';
+import '../../library/library_model.dart';
+import '../../local_audio/local_audio_model.dart';
+import '../data/audio.dart';
+import 'icons.dart';
+import 'ui_constants.dart';
+
+class LocalMetadataTile extends StatefulWidget with WatchItStatefulWidgetMixin {
+  const LocalMetadataTile.title({
+    super.key,
+    required this.audio,
+    this.pageId,
+  }) : type = LocalMetadataTileType.title;
+
+  const LocalMetadataTile.album({
+    super.key,
+    required this.audio,
+    this.pageId,
+  }) : type = LocalMetadataTileType.album;
+
+  const LocalMetadataTile.artist({
+    super.key,
+    required this.audio,
+    this.pageId,
+  }) : type = LocalMetadataTileType.artist;
+
+  const LocalMetadataTile.trackNumber({
+    super.key,
+    required this.audio,
+    this.pageId,
+  }) : type = LocalMetadataTileType.trackNumber;
+
+  const LocalMetadataTile.diskNumber({
+    super.key,
+    required this.audio,
+    this.pageId,
+  }) : type = LocalMetadataTileType.diskNumber;
+
+  const LocalMetadataTile.totalDisks({
+    super.key,
+    required this.audio,
+    this.pageId,
+  }) : type = LocalMetadataTileType.totalDisks;
+
+  const LocalMetadataTile.genre({
+    super.key,
+    required this.audio,
+    this.pageId,
+  }) : type = LocalMetadataTileType.genre;
+
+  final LocalMetadataTileType type;
+  final Audio audio;
+  final String? pageId;
+
+  @override
+  State<LocalMetadataTile> createState() => _LocalMetadataTileState();
+}
+
+class _LocalMetadataTileState extends State<LocalMetadataTile> {
+  late TextEditingController _controller;
+  bool wasChangedLocally = false;
+
+  @override
+  void initState() {
+    super.initState();
+    _controller = TextEditingController(
+      text: switch (widget.type) {
+        LocalMetadataTileType.title => widget.audio.title ?? '',
+        LocalMetadataTileType.album => widget.audio.album ?? '',
+        LocalMetadataTileType.artist => widget.audio.artist ?? '',
+        LocalMetadataTileType.trackNumber => widget.audio.trackNumber == null
+            ? ''
+            : widget.audio.trackNumber.toString(),
+        LocalMetadataTileType.diskNumber => widget.audio.discNumber == null
+            ? ''
+            : widget.audio.discNumber.toString(),
+        LocalMetadataTileType.totalDisks => widget.audio.discTotal == null
+            ? ''
+            : widget.audio.discTotal.toString(),
+        LocalMetadataTileType.genre => widget.audio.genre.toString(),
+      },
+    );
+  }
+
+  @override
+  void dispose() {
+    _controller.dispose();
+    super.dispose();
+  }
+
+  @override
+  Widget build(BuildContext context) {
+    watchPropertyValue((LocalAudioModel m) => m.audios.hashCode);
+    return ListTile(
+      contentPadding: const EdgeInsets.symmetric(
+        horizontal: kLargestSpace,
+      ),
+      subtitle: TextField(
+        controller: _controller,
+        onSubmitted: onSubmitted,
+        onChanged: (_) {
+          setState(() {
+            wasChangedLocally = true;
+          });
+        },
+        decoration: InputDecoration(
+          suffixIcon: ListenableBuilder(
+            listenable: _controller,
+            builder: (context, child) {
+              final wasChanged = _controller.text.isNotEmpty &&
+                  _controller.text !=
+                      switch (widget.type) {
+                        LocalMetadataTileType.title => widget.audio.title,
+                        LocalMetadataTileType.album => widget.audio.album,
+                        LocalMetadataTileType.artist => widget.audio.artist,
+                        LocalMetadataTileType.trackNumber =>
+                          widget.audio.trackNumber?.toString(),
+                        LocalMetadataTileType.diskNumber =>
+                          widget.audio.discNumber?.toString(),
+                        LocalMetadataTileType.totalDisks =>
+                          widget.audio.discTotal?.toString(),
+                        LocalMetadataTileType.genre => widget.audio.genre,
+                      };
+              return IconButton(
+                style: IconButton.styleFrom(
+                  shape: const RoundedRectangleBorder(
+                    borderRadius: BorderRadius.only(
+                      topRight: Radius.circular(kYaruButtonRadius),
+                      bottomRight: Radius.circular(kYaruButtonRadius),
+                    ),
+                  ),
+                ),
+                icon: wasChangedLocally
+                    ? Icon(
+                        Iconz.download,
+                        color: context.colorScheme.primary,
+                      )
+                    : YaruAnimatedVectorIcon(
+                        key: ValueKey(wasChangedLocally),
+                        YaruAnimatedIcons.ok_filled,
+                        color: wasChanged
+                            ? context.colorScheme.success
+                            : context.colorScheme.onSurface,
+                      ),
+                onPressed: () => onSubmitted(_controller.text),
+              );
+            },
+          ),
+          label: Text(widget.type.localize(context.l10n)),
+        ),
+      ),
+    );
+  }
+
+  void onSubmitted(String text) {
+    final model = di<LocalAudioModel>();
+    setState(() {
+      wasChangedLocally = false;
+    });
+    void onChange() {
+      setState(() {});
+      di<LibraryModel>().notifyListeners();
+      di<LocalAudioModel>().notifyListeners();
+    }
+
+    return switch (widget.type) {
+      LocalMetadataTileType.title => model.changeMetadata(
+          widget.audio,
+          title: text,
+          onChange: onChange,
+        ),
+      LocalMetadataTileType.album => model.changeMetadata(
+          widget.audio,
+          album: text,
+          onChange: onChange,
+        ),
+      LocalMetadataTileType.artist => model.changeMetadata(
+          widget.audio,
+          artist: text,
+          onChange: onChange,
+        ),
+      LocalMetadataTileType.trackNumber => model.changeMetadata(
+          widget.audio,
+          trackNumber: text,
+          onChange: onChange,
+        ),
+      LocalMetadataTileType.diskNumber => model.changeMetadata(
+          widget.audio,
+          discNumber: text,
+          onChange: onChange,
+        ),
+      LocalMetadataTileType.totalDisks => model.changeMetadata(
+          widget.audio,
+          discTotal: text,
+          onChange: onChange,
+        ),
+      LocalMetadataTileType.genre => model.changeMetadata(
+          widget.audio,
+          genre: text,
+          onChange: onChange,
+        ),
+    };
+  }
+}
+
+enum LocalMetadataTileType {
+  title,
+  album,
+  artist,
+  trackNumber,
+  diskNumber,
+  totalDisks,
+  genre;
+
+  String localize(AppLocalizations l10n) => switch (this) {
+        title => l10n.title,
+        album => l10n.album,
+        artist => l10n.artist,
+        trackNumber => l10n.trackNumber,
+        diskNumber => l10n.diskNumber,
+        totalDisks => l10n.totalDisks,
+        genre => l10n.genre,
+      };
+}
diff --git a/lib/common/view/meta_data_dialog.dart b/lib/common/view/meta_data_dialog.dart
index bbe407d61..6fac20f2c 100644
--- a/lib/common/view/meta_data_dialog.dart
+++ b/lib/common/view/meta_data_dialog.dart
@@ -1,105 +1,87 @@
+import 'dart:io';
+
 import 'package:flutter/material.dart';
 import 'package:url_launcher/url_launcher.dart';
 import 'package:yaru/yaru.dart';
 
 import '../../l10n/l10n.dart';
+import '../../radio/view/radio_page_tag_bar.dart';
 import '../data/audio.dart';
 import '../data/audio_type.dart';
 import 'copy_clipboard_content.dart';
+import 'local_metadata_covers.dart';
+import 'local_metadata_tile.dart';
 import 'modals.dart';
 import 'snackbars.dart';
+import 'ui_constants.dart';
 
-class MetaDataContent extends StatelessWidget {
+class MetaDataContent extends StatefulWidget {
   const MetaDataContent.dialog({
     super.key,
     required this.audio,
+    required this.pageId,
   }) : _mode = ModalMode.dialog;
 
   const MetaDataContent.bottomSheet({
     super.key,
     required this.audio,
+    required this.pageId,
   }) : _mode = ModalMode.bottomSheet;
 
   final Audio audio;
   final ModalMode _mode;
+  final String pageId;
+
+  static const double dimension = 300.0;
+
+  @override
+  State<MetaDataContent> createState() => _MetaDataContentState();
+}
+
+class _MetaDataContentState extends State<MetaDataContent> {
+  late Audio audio;
+
+  @override
+  void initState() {
+    super.initState();
+    setAudio();
+  }
+
+  void setAudio() {
+    if (widget.audio.path != null) {
+      audio = widget.audio.isLocal && widget.audio.path != null
+          ? Audio.local(File(widget.audio.path!))
+          : widget.audio;
+    } else {
+      audio = widget.audio;
+    }
+  }
 
   @override
   Widget build(BuildContext context) {
-    final radio = audio.audioType == AudioType.radio;
     final l10n = context.l10n;
-    final items = <(String, String)>{
-      (
-        radio ? l10n.stationName : l10n.title,
-        '${audio.title}',
-      ),
-      (
-        radio ? l10n.tags : l10n.album,
-        '${radio ? audio.album?.replaceAll(',', ', ') : audio.album}',
-      ),
-      (
-        radio ? l10n.language : l10n.artist,
-        '${radio ? audio.language : audio.artist}',
-      ),
-      (
-        radio ? l10n.quality : l10n.albumArtists,
-        '${audio.albumArtist}',
-      ),
-      if (!radio)
-        (
-          l10n.trackNumber,
-          '${audio.trackNumber}',
-        ),
-      if (!radio)
-        (
-          l10n.diskNumber,
-          '${audio.discNumber}',
-        ),
-      (
-        radio ? l10n.clicks : l10n.totalDisks,
-        '${radio ? audio.clicks : audio.discTotal}',
-      ),
-      if (!radio)
-        (
-          l10n.genre,
-          '${audio.genre}',
-        ),
-      (
-        l10n.url,
-        audio.url ?? '',
-      ),
-    };
 
-    const edgeInsets = EdgeInsets.only(bottom: 12);
-
-    final body = Column(
-      crossAxisAlignment: CrossAxisAlignment.start,
-      children: items
-          .map(
-            (e) => ListTile(
-              dense: true,
-              title: Text(e.$1),
-              subtitle: Text(e.$2),
-              onTap: e.$1 == l10n.url
-                  ? () {
-                      final maybeUri = Uri.tryParse(e.$2);
-                      if (maybeUri != null) {
-                        showSnackBar(
-                          context: context,
-                          content: CopyClipboardContent(
-                            text: maybeUri.toString(),
-                            onSearch: () => launchUrl(maybeUri),
-                          ),
-                        );
-                        Navigator.of(context).pop();
-                      }
-                    }
-                  : null,
+    final body = SizedBox(
+      width: MetaDataContent.dimension,
+      child: Column(
+        crossAxisAlignment: CrossAxisAlignment.start,
+        children: [
+          if (audio.isLocal && audio.path != null && audio.albumId != null)
+            Padding(
+              padding: const EdgeInsets.symmetric(
+                horizontal: kLargestSpace,
+              ),
+              child: SizedBox.square(
+                dimension: MetaDataContent.dimension,
+                child: LocalMetadataCovers(audio: audio),
+              ),
             ),
-          )
-          .toList(),
+          ...createItems(audio, context),
+        ],
+      ),
     );
 
-    return switch (_mode) {
+    return switch (widget._mode) {
       ModalMode.dialog => AlertDialog(
           title: YaruDialogTitleBar(
             title: Text(l10n.metadata),
@@ -107,7 +89,7 @@ class MetaDataContent extends StatelessWidget {
             backgroundColor: Colors.transparent,
           ),
           titlePadding: EdgeInsets.zero,
-          contentPadding: edgeInsets,
+          contentPadding: const EdgeInsets.only(bottom: 12),
           scrollable: true,
           content: body,
         ),
@@ -117,4 +99,95 @@ class MetaDataContent extends StatelessWidget {
         )
     };
   }
+
+  List<Widget> createItems(Audio audio, BuildContext context) {
+    final l10n = context.l10n;
+
+    return switch (audio.audioType) {
+      AudioType.radio => <Widget>[
+          ListTile(
+            title: Text(l10n.stationName),
+            subtitle: Text('${audio.title}'),
+          ),
+          ListTile(
+            title: Text(l10n.tags),
+            subtitle: Align(
+              alignment: Alignment.centerLeft,
+              child: RadioPageTagBar(
+                station: audio,
+                onTap: (_) {
+                  if (context.mounted) {
+                    Navigator.of(context).pop();
+                  }
+                },
+              ),
+            ),
+          ),
+          ListTile(
+            title: Text(l10n.language),
+            subtitle: Text(audio.language),
+          ),
+          ListTile(
+            title: Text(l10n.quality),
+            subtitle: Text('${audio.albumArtist}'),
+          ),
+          ListTile(
+            title: Text(l10n.clicks),
+            subtitle: Text('${audio.clicks}'),
+          ),
+          ListTile(
+            title: Text(l10n.url),
+            subtitle: Text(audio.url ?? ''),
+            onTap: () => showSnackBar(
+              context: context,
+              content: CopyClipboardContent(
+                text: audio.title ?? '',
+                onSearch: () => launchUrl(Uri.parse(audio.url!)),
+              ),
+            ),
+          ),
+        ],
+      AudioType.local => <Widget>[
+          ListTile(
+            contentPadding: const EdgeInsets.symmetric(
+              horizontal: kLargestSpace,
+            ),
+            title: TextField(
+              readOnly: true,
+              decoration: InputDecoration(
+                labelText: l10n.path,
+                suffixIcon: IconButton(
+                  style: IconButton.styleFrom(
+                    shape: const RoundedRectangleBorder(
+                      borderRadius: BorderRadius.only(
+                        topRight: Radius.circular(kYaruButtonRadius),
+                        bottomRight: Radius.circular(kYaruButtonRadius),
+                      ),
+                    ),
+                  ),
+                  icon: const Icon(Icons.copy),
+                  onPressed: () {
+                    if (audio.path != null) {
+                      showSnackBar(
+                        context: context,
+                        content: CopyClipboardContent(text: audio.path!),
+                      );
+                    }
+                  },
+                ),
+              ),
+              controller: TextEditingController(text: audio.path),
+            ),
+          ),
+          LocalMetadataTile.title(audio: audio),
+          LocalMetadataTile.album(audio: audio),
+          LocalMetadataTile.artist(audio: audio),
+          LocalMetadataTile.trackNumber(audio: audio),
+          LocalMetadataTile.diskNumber(audio: audio),
+          LocalMetadataTile.totalDisks(audio: audio),
+          LocalMetadataTile.genre(audio: audio),
+        ],
+      _ => [],
+    };
+  }
 }
diff --git a/lib/common/view/sliver_audio_page.dart b/lib/common/view/sliver_audio_page.dart
index 5e04e4da7..3d92bbbf1 100644
--- a/lib/common/view/sliver_audio_page.dart
+++ b/lib/common/view/sliver_audio_page.dart
@@ -2,6 +2,7 @@ import 'package:flutter/material.dart';
 import 'package:watch_it/watch_it.dart';
 
 import '../../app_config.dart';
+import '../../l10n/l10n.dart';
 import '../../library/library_model.dart';
 import '../../search/search_model.dart';
 import '../../search/search_type.dart';
@@ -87,26 +88,13 @@ class SliverAudioPage extends StatelessWidget {
             min: AppConfig.isMobilePlatform ? 5 : 15,
           );
 
-          if (audios == null) {
-            return const Center(
-              child: Progress(),
-            );
-          }
-
-          if (audios!.isEmpty) {
-            return NoSearchResultPage(
-              message: noSearchResultMessage,
-              icon: noSearchResultIcons,
-            );
-          }
-
           return CustomScrollView(
             slivers: [
               SliverPadding(
                 padding: padding,
                 sliver: SliverToBoxAdapter(
                   child: AudioPageHeader(
-                    title: pageTitle ?? pageId,
+                    title: pageTitle ?? context.l10n.album,
                     image: image,
                     subTitle: pageSubTitle,
                     label: pageLabel,
@@ -131,6 +119,13 @@ class SliverAudioPage extends StatelessWidget {
                     child: Progress(),
                   ),
                 )
+              else if (audios!.isEmpty)
+                SliverToBoxAdapter(
+                  child: NoSearchResultPage(
+                    message: noSearchResultMessage,
+                    icon: noSearchResultIcons,
+                  ),
+                )
               else
                 SliverPadding(
                   padding: padding.copyWith(
diff --git a/lib/custom_content/custom_content_model.dart b/lib/custom_content/custom_content_model.dart
index 0e8241af2..c4ff69088 100644
--- a/lib/custom_content/custom_content_model.dart
+++ b/lib/custom_content/custom_content_model.dart
@@ -14,24 +14,24 @@ import '../common/logging.dart';
 import '../extensions/media_file_x.dart';
 import '../external_path/external_path_service.dart';
 import '../library/library_service.dart';
+import '../local_audio/local_audio_service.dart';
 import '../podcasts/podcast_service.dart';
-import '../radio/radio_service.dart';
 
 class CustomContentModel extends SafeChangeNotifier {
   CustomContentModel({
     required ExternalPathService externalPathService,
     required LibraryService libraryService,
+    required LocalAudioService localAudioService,
     required PodcastService podcastService,
-    required RadioService radioService,
   })  : _externalPathService = externalPathService,
         _libraryService = libraryService,
         _podcastService = podcastService,
-        _radioService = radioService;
+        _localAudioService = localAudioService;
 
   final ExternalPathService _externalPathService;
   final LibraryService _libraryService;
   final PodcastService _podcastService;
-  final RadioService _radioService;
+  final LocalAudioService _localAudioService;
 
   List<({List<Audio> audios, String id})> _playlists = [];
   List<({List<Audio> audios, String id})> get playlists => _playlists;
@@ -64,14 +64,14 @@ class CustomContentModel extends SafeChangeNotifier {
           lists.add(
             (
               id: basename(path),
-              audios: await _parseM3uPlaylist(path),
+              audios: await compute(_parseM3uPlaylist, path),
             ),
           );
         } else if (path.endsWith('.pls')) {
           lists.add(
             (
               id: basename(path),
-              audios: await _parsePlsPlaylist(path),
+              audios: await compute(_parsePlsPlaylist, path),
             ),
           );
         }
@@ -83,54 +83,6 @@ class CustomContentModel extends SafeChangeNotifier {
     return lists;
   }
 
-  Future<List<Audio>> _parseM3uPlaylist(String path) async {
-    final audios = <Audio>[];
-    final playlist = await compute(M3uList.loadFromFile, path);
-
-    for (var e in playlist.items) {
-      if (e.link.startsWith('http')) {
-        audios.add(
-          Audio(
-            title: e.title,
-            url: e.link,
-            description: e.link,
-            audioType: AudioType.radio,
-          ),
-        );
-      } else if (e.link.isNotEmpty) {
-        final file = File(e.link.replaceAll('file://', ''));
-        audios.add(Audio.local(file, getImage: true));
-      }
-    }
-
-    return audios;
-  }
-
-  Future<List<Audio>> _parsePlsPlaylist(String path) async {
-    final audios = <Audio>[];
-    final playlist = PlsPlaylist.parse(File(path).readAsStringSync());
-
-    for (var e in playlist.entries) {
-      if (e.file?.startsWith('http') == true) {
-        audios.add(
-          Audio(
-            title: e.title,
-            url: e.file,
-            description: e.file,
-            audioType: AudioType.radio,
-          ),
-        );
-      } else if (e.file?.isNotEmpty == true) {
-        final file = File(e.file!);
-        if (file.existsSync() && file.isPlayable) {
-          audios.add(Audio.local(file, getImage: true));
-        }
-      }
-    }
-
-    return audios;
-  }
-
   Future<void> exportPlaylistToM3u({
     required String id,
     required List<Audio> audios,
@@ -141,15 +93,15 @@ class CustomContentModel extends SafeChangeNotifier {
   }
 
   bool get isExportingPlaylistsAndPinnedAlbumsToM3UsNeeded =>
-      _libraryService.playlists.isNotEmpty ||
-      _libraryService.pinnedAlbums.isNotEmpty;
+      _libraryService.playlistIDs.isNotEmpty ||
+      _libraryService.favoriteAlbums.isNotEmpty;
   Future<bool> exportPlaylistsAndPinnedAlbumsToM3Us() async {
     final List<({String id, List<Audio> audios})> list = [
-      ..._libraryService.playlists.entries.map(
-        (e) => (id: e.key, audios: e.value),
+      ..._libraryService.playlistIDs.map(
+        (e) => (id: e, audios: _libraryService.getPlaylistById(e) ?? []),
       ),
-      ..._libraryService.pinnedAlbums.entries.map(
-        (e) => (id: e.key, audios: e.value),
+      ..._libraryService.favoriteAlbums.map(
+        (e) => (id: e, audios: _localAudioService.findAlbum(e) ?? []),
       ),
     ];
 
@@ -277,13 +229,9 @@ class CustomContentModel extends SafeChangeNotifier {
     final body = <OpmlOutline>[];
     final category = OpmlOutlineBuilder();
 
-    for (var station in _libraryService.starredStations.entries) {
+    for (var station in _libraryService.starredStations) {
       category.addChild(
-        OpmlOutlineBuilder()
-            .title(station.value.firstOrNull?.title ?? '')
-            .text(station.value.firstOrNull?.uuid ?? '')
-            .htmlUrl(station.value.firstOrNull?.url ?? '')
-            .build(),
+        OpmlOutlineBuilder().text(station).build(),
       );
     }
 
@@ -317,14 +265,9 @@ class CustomContentModel extends SafeChangeNotifier {
 
     for (var category in doc.body.where((e) => e.children != null)) {
       final children = category.children!.where((e) => e.text != null);
-      final starredStations = <(String uuid, List<Audio> audios)>[];
+      final starredStations = <String>[];
       for (var feed in children) {
-        final stations = await _radioService.search(uuid: feed.text!, limit: 1);
-        if (stations != null && stations.isNotEmpty) {
-          starredStations.add(
-            (feed.text!, stations.map((e) => Audio.fromStation(e)).toList()),
-          );
-        }
+        starredStations.add(feed.text!);
       }
       if (starredStations.isNotEmpty) {
         _libraryService.addStarredStations(starredStations);
@@ -348,3 +291,51 @@ class CustomContentModel extends SafeChangeNotifier {
     notifyListeners();
   }
 }
+
+Future<List<Audio>> _parseM3uPlaylist(String path) async {
+  final audios = <Audio>[];
+  final playlist = await compute(M3uList.loadFromFile, path);
+
+  for (var e in playlist.items) {
+    if (e.link.startsWith('http')) {
+      audios.add(
+        Audio(
+          title: e.title,
+          url: e.link,
+          description: e.link,
+          audioType: AudioType.radio,
+        ),
+      );
+    } else if (e.link.isNotEmpty) {
+      final file = File(e.link.replaceAll('file://', ''));
+      audios.add(Audio.local(file));
+    }
+  }
+
+  return audios;
+}
+
+Future<List<Audio>> _parsePlsPlaylist(String path) async {
+  final audios = <Audio>[];
+  final playlist = PlsPlaylist.parse(File(path).readAsStringSync());
+
+  for (var e in playlist.entries) {
+    if (e.file?.startsWith('http') == true) {
+      audios.add(
+        Audio(
+          title: e.title,
+          url: e.file,
+          description: e.file,
+          audioType: AudioType.radio,
+        ),
+      );
+    } else if (e.file?.isNotEmpty == true) {
+      final file = File(e.file!);
+      if (file.existsSync() && file.isPlayable) {
+        audios.add(Audio.local(file));
+      }
+    }
+  }
+
+  return audios;
+}
diff --git a/lib/custom_content/view/custom_station_section.dart b/lib/custom_content/view/custom_station_section.dart
index 09c9177ee..47468ea56 100644
--- a/lib/custom_content/view/custom_station_section.dart
+++ b/lib/custom_content/view/custom_station_section.dart
@@ -1,11 +1,12 @@
 import 'package:flutter/material.dart';
 import 'package:watch_it/watch_it.dart';
 
-import '../../common/data/audio.dart';
 import '../../common/view/common_widgets.dart';
+import '../../common/view/snackbars.dart';
 import '../../common/view/ui_constants.dart';
 import '../../l10n/l10n.dart';
 import '../../library/library_model.dart';
+import '../../radio/radio_service.dart';
 
 class CustomStationSection extends StatefulWidget {
   const CustomStationSection({super.key});
@@ -68,13 +69,26 @@ class _AddStationDialogState extends State<CustomStationSection> {
                             _nameController.text.isEmpty
                         ? null
                         : () {
-                            di<LibraryModel>()
-                                .addStarredStation(_urlController.text, [
-                              Audio(
-                                url: _urlController.text,
-                                title: _nameController.text,
-                              ),
-                            ]);
+                            di<RadioService>()
+                                .getStationsByUrl(_urlController.text)
+                                .then(
+                              (v) {
+                                if (v?.stationUUID == null) {
+                                  if (context.mounted) {
+                                    showSnackBar(
+                                      context: context,
+                                      content:
+                                          Text(context.l10n.noStationFound),
+                                    );
+                                  }
+                                  return;
+                                } else {
+                                  di<LibraryModel>()
+                                      .addStarredStation(v!.stationUUID);
+                                }
+                              },
+                            );
+
                             Navigator.pop(context);
                           },
                     child: Text(
diff --git a/lib/extensions/picture_type_x.dart b/lib/extensions/picture_type_x.dart
new file mode 100644
index 000000000..7b556ccdb
--- /dev/null
+++ b/lib/extensions/picture_type_x.dart
@@ -0,0 +1,33 @@
+import 'package:audio_metadata_reader/audio_metadata_reader.dart';
+
+import '../l10n/l10n.dart';
+
+extension PictureTypeX on PictureType {
+  String localize(AppLocalizations l10n) {
+    return switch (this) {
+      PictureType.other => l10n.localPictureTypeOther,
+      PictureType.fileIcon32x32 => l10n.localPictureTypeFileIcon32x32,
+      PictureType.otherFileIcon => l10n.localPictureTypeOtherFileIcon,
+      PictureType.coverFront => l10n.localPictureTypeCoverFront,
+      PictureType.coverBack => l10n.localPictureTypeCoverBack,
+      PictureType.leafletPage => l10n.localPictureTypeLeafletPage,
+      PictureType.mediaLabelCD => l10n.localPictureTypeMediaLabelCD,
+      PictureType.leadArtist => l10n.localPictureTypeLeadArtist,
+      PictureType.artistPerformer => l10n.localPictureTypeArtistPerformer,
+      PictureType.conductor => l10n.localPictureTypeConductor,
+      PictureType.bandOrchestra => l10n.localPictureTypeBandOrchestra,
+      PictureType.composer => l10n.localPictureTypeComposer,
+      PictureType.lyricistTextWriter => l10n.localPictureTypeLyricistTextWriter,
+      PictureType.recordingLocation => l10n.localPictureTypeRecordingLocation,
+      PictureType.duringRecording => l10n.localPictureTypeDuringRecording,
+      PictureType.duringPerformance => l10n.localPictureTypeDuringPerformance,
+      PictureType.movieVideoScreenCapture =>
+        l10n.localPictureTypeMovieVideoScreenCapture,
+      PictureType.brightColouredFish => l10n.localPictureTypeBrightColouredFish,
+      PictureType.illustration => l10n.localPictureTypeIllustration,
+      PictureType.bandArtistLogotype => l10n.localPictureTypebandArtistLogotype,
+      PictureType.publisherStudioLogotype =>
+        l10n.localPictureTypepublisherStudioLogotype,
+    };
+  }
+}
diff --git a/lib/extensions/shared_preferences_x.dart b/lib/extensions/shared_preferences_x.dart
index b8dbd516e..de8b4c6cf 100644
--- a/lib/extensions/shared_preferences_x.dart
+++ b/lib/extensions/shared_preferences_x.dart
@@ -34,7 +34,11 @@ extension SPKeys on SharedPreferences {
   static const windowFullscreen = 'windowFullscreen';
   static const forcedUpdateVersionThreshold = 'forcedUpdateVersionThreshold';
   static const backupSaved = 'backupSaved_';
-  // TODO: #1201 chore: migrate pinned albums to shared preferences
-  static const pinnedMusicpodAlbumPrefix = 'pinnedMusicpodAlbumPrefix___';
   static const externalPlaylists = 'externalPlaylists';
+  static const favoriteAlbums = 'favoriteAlbums';
+  static const favoriteAudios = 'favoriteAudios';
+  static const starredStations = 'starredStations';
+  static const podcastUpdates = 'podcastUpdates';
+  static const playlistIDs = 'playlistIDs';
+  static const selectedPage = 'selectedPageId';
 }
diff --git a/lib/extensions/string_x.dart b/lib/extensions/string_x.dart
index 1a77ac75c..940be66b2 100644
--- a/lib/extensions/string_x.dart
+++ b/lib/extensions/string_x.dart
@@ -1,3 +1,5 @@
+import '../common/data/audio.dart';
+
 extension StringExtension on String {
   String get capitalized {
     return isEmpty
@@ -38,6 +40,11 @@ extension StringExtension on String {
     }
     return (songName: songName, artist: artist);
   }
+
+  String get albumOfId => (split(Audio.albumIdSplitter).lastOrNull ?? '')
+      .replaceAll(Audio.albumIdReplacer, Audio.albumIdReplacement);
+  String get artistOfId => (split(Audio.albumIdSplitter).firstOrNull ?? '')
+      .replaceAll(Audio.albumIdReplacer, Audio.albumIdReplacement);
 }
 
 extension NullableStringX on String? {
diff --git a/lib/home/home_page.dart b/lib/home/home_page.dart
index cfcab5843..6e7e87d5f 100644
--- a/lib/home/home_page.dart
+++ b/lib/home/home_page.dart
@@ -26,9 +26,7 @@ class HomePage extends StatelessWidget with WatchItMixin {
   @override
   Widget build(BuildContext context) {
     final l10n = context.l10n;
-    final playlists = watchPropertyValue(
-      (LibraryModel m) => m.playlists.keys.toList(),
-    );
+    final playlists = watchPropertyValue((LibraryModel m) => m.playlistIDs);
     const textPadding = EdgeInsets.only(
       right: kMediumSpace,
       left: kSmallestSpace,
diff --git a/lib/l10n/app_en.arb b/lib/l10n/app_en.arb
index 761b8d3a9..849f1af6f 100644
--- a/lib/l10n/app_en.arb
+++ b/lib/l10n/app_en.arb
@@ -680,5 +680,31 @@
     "localAudioWatchDialogTitle": "Local audio directory was modified",
     "localAudioWatchDialogDescription": "Do you want to reload the local audio directory?",
     "external": "external",
-    "externalPlaylist": "External playlist"
+    "externalPlaylist": "External playlist",
+    "pictures": "Pictures",
+    "localPictureTypeOther": "Other",
+    "localPictureTypeFileIcon32x32": "Icon 32x32",
+    "localPictureTypeOtherFileIcon": "Other file icon",
+    "localPictureTypeCoverFront": "Cover front",
+    "localPictureTypeCoverBack": "Cover back",
+    "localPictureTypeLeafletPage": "Leaflet page",
+    "localPictureTypeMediaLabelCD": "Media label CD",
+    "localPictureTypeLeadArtist": "Lead artist",
+    "localPictureTypeArtistPerformer": "Artist/Performer",
+    "localPictureTypeConductor": "Conductor",
+    "localPictureTypeBandOrchestra": "Band/Orchestra",
+    "localPictureTypeComposer": "Composer",
+    "localPictureTypeLyricistTextWriter": "Lyricist/Text writer",
+    "localPictureTypeRecordingLocation": "Recording location",
+    "localPictureTypeDuringRecording": "During recording",
+    "localPictureTypeDuringPerformance": "During performance",
+    "localPictureTypeMovieVideoScreenCapture": "Movie/Video screen capture",
+    "localPictureTypeBrightColouredFish": "Bright coloured fish",
+    "localPictureTypeIllustration": "Illustration",
+    "localPictureTypebandArtistLogotype": "Band/Artist logotype",
+    "localPictureTypepublisherStudioLogotype": "Publisher/Studio logotype",
+    "cantPinEmptyAlbum": "You can't pin albums without empty album metadata!",
+    "cantUnpinEmptyAlbum": "You can't unpin albums without empty album metadata!",
+    "path": "Path",
+    "albumNotFound": "This album does not exist or you have removed the external playlist (M3U/PLS file) where it has been loaded from."
 }
diff --git a/lib/library/library_model.dart b/lib/library/library_model.dart
index 4eb43cfef..260483679 100644
--- a/lib/library/library_model.dart
+++ b/lib/library/library_model.dart
@@ -7,7 +7,6 @@ import '../app/view/mobile_page.dart';
 import '../app_config.dart';
 import '../common/data/audio.dart';
 import '../common/logging.dart';
-import '../common/page_ids.dart';
 import '../common/view/back_gesture.dart';
 import '../local_audio/local_audio_service.dart';
 import 'library_service.dart';
@@ -32,30 +31,20 @@ class LibraryModel extends SafeChangeNotifier implements NavigatorObserver {
     super.dispose();
   }
 
-  List<Audio>? getAudiosById(String pageId) {
-    if (pageId == PageIDs.likedAudios) {
-      return likedAudios;
-    } else {
-      return playlists[pageId] ??
-          pinnedAlbums[pageId] ??
-          getPodcast(pageId) ??
-          starredStations[pageId];
-    }
-  }
-
   bool isPageInLibrary(String? pageId) => _service.isPageInLibrary(pageId);
 
   //
   // Liked Audios
   //
+  int get likedAudiosLength => _service.likedAudiosLength;
   List<Audio> get likedAudios => _service.likedAudios;
-
-  void addLikedAudio(Audio audio, [bool notify = true]) =>
-      _service.addLikedAudio(audio, notify);
+  void addLikedAudio(Audio audio) => _service.addLikedAudio(audio);
   void addLikedAudios(List<Audio> audios) => _service.addLikedAudios(audios);
   void removeLikedAudios(List<Audio> audios) =>
       _service.removeLikedAudios(audios);
-  bool liked(Audio? audio) => audio == null ? false : _service.liked(audio);
+  bool isLikedAudio(Audio? audio) =>
+      audio == null ? false : _service.isLiked(audio);
+  bool isLikedAudios(List<Audio> audios) => _service.isLikedAudios(audios);
   void removeLikedAudio(Audio audio, [bool notify = true]) =>
       _service.removeLikedAudio(audio, notify);
 
@@ -63,11 +52,10 @@ class LibraryModel extends SafeChangeNotifier implements NavigatorObserver {
   // Starred stations
   //
 
-  Map<String, List<Audio>> get starredStations => _service.starredStations;
+  List<String> get starredStations => _service.starredStations;
   int get starredStationsLength => _service.starredStations.length;
-  void addStarredStation(String uuid, List<Audio> audios) =>
-      _service.addStarredStation(uuid, audios);
-  void unStarStation(String uuid) => _service.unStarStation(uuid);
+  void addStarredStation(String uuid) => _service.addStarredStation(uuid);
+  void unStarStation(String uuid) => _service.removeStarredStation(uuid);
   void unStarAllStations() => _service.unStarAllStations();
 
   bool isStarredStation(String? uuid) =>
@@ -98,11 +86,11 @@ class LibraryModel extends SafeChangeNotifier implements NavigatorObserver {
   // Playlists
   //
 
-  Map<String, List<Audio>> get playlists => _service.playlists;
-  int get playlistsLength => playlists.length;
-  List<Audio> getPlaylistAt(int index) =>
-      playlists.entries.elementAt(index).value.toList();
-  List<Audio>? getPlaylistById(String id) => _service.playlists[id];
+  List<String> get playlistIDs => _service.playlistIDs;
+  int get playlistsLength => playlistIDs.length;
+  List<Audio>? getPlaylistById(String id) => _service.getPlaylistById(id);
+  List<String> get externalPlaylists => _service.externalPlaylistIDs;
+
   bool isPlaylistSaved(String? id) => _service.isPlaylistSaved(id);
   Future<void> addPlaylist(String name, List<Audio> audios) async =>
       _service.addPlaylist(name, audios);
@@ -124,40 +112,45 @@ class LibraryModel extends SafeChangeNotifier implements NavigatorObserver {
     }
   }
 
-  Future<void> updatePlaylist(String id, List<Audio> audios) async =>
-      _service.updatePlaylist(id, audios);
+  Future<void> updatePlaylist({
+    required String id,
+    required List<Audio> audios,
+    bool external = false,
+  }) async =>
+      _service.updatePlaylist(id: id, audios: audios, external: external);
   Future<void> removePlaylist(String id) => _service.removePlaylist(id);
 
   void updatePlaylistName(String oldName, String newName) =>
       _service.updatePlaylistName(oldName, newName);
   void addAudiosToPlaylist({
-    required String playlist,
+    required String id,
     required List<Audio> audios,
   }) =>
-      _service.addAudiosToPlaylist(id: playlist, audios: audios);
-  void removeAudiosFromPlaylist({
+      _service.addAudiosToPlaylist(id: id, audios: audios);
+  Future<void> removeAudiosFromPlaylist({
     required String id,
     required List<Audio> audios,
-  }) =>
+  }) async =>
       _service.removeAudiosFromPlaylist(id: id, audios: audios);
+
   void clearPlaylist(String id) => _service.clearPlaylist(id);
   void moveAudioInPlaylist({
     required int oldIndex,
     required int newIndex,
     required String id,
-  }) =>
-      _service.moveAudioInPlaylist(
-        oldIndex: oldIndex,
-        newIndex: newIndex,
-        id: id,
-      );
+  }) {
+    _service.moveAudioInPlaylist(
+      oldIndex: oldIndex,
+      newIndex: newIndex,
+      id: id,
+    );
+  }
 
   //
   // Podcasts
   //
 
-  Map<String, List<Audio>> get podcasts => _service.podcasts;
-  List<String> get podcastFeedUrls => _service.podcasts.keys.toList();
+  List<String> get podcastFeedUrls => _service.podcastFeedUrls;
   List<Audio>? getPodcast(String? feedUrl) => _service.podcasts[feedUrl];
   int get podcastsLength => _service.podcasts.length;
   void addPodcast(String feedUrl, List<Audio> audios) =>
@@ -192,14 +185,16 @@ class LibraryModel extends SafeChangeNotifier implements NavigatorObserver {
   // Albums
   //
 
-  Map<String, List<Audio>> get pinnedAlbums => _service.pinnedAlbums;
-  int get pinnedAlbumsLength => pinnedAlbums.length;
-  List<Audio> getAlbumAt(int index) =>
-      pinnedAlbums.entries.elementAt(index).value.toList();
-  bool isPinnedAlbum(String name) => pinnedAlbums.containsKey(name);
-  void addPinnedAlbum(String name, List<Audio> audios) =>
-      _service.addPinnedAlbum(name, audios);
-  void removePinnedAlbum(String name) => _service.removePinnedAlbum(name);
+  List<String> get favoriteAlbums => _service.favoriteAlbums;
+  int get favoriteAlbumsLength => _service.favoriteAlbums.length;
+
+  bool isFavoriteAlbum(String id) => _service.isFavoriteAlbum(id);
+
+  void addFavoriteAlbum(String id, {required Function() onFail}) =>
+      _service.addFavoriteAlbum(id, onFail: onFail);
+
+  void removeFavoriteAlbum(String id, {required Function() onFail}) =>
+      _service.removeFavoriteAlbum(id, onFail: onFail);
 
   //
   // Navigation inside the Library
diff --git a/lib/library/library_service.dart b/lib/library/library_service.dart
index a7590f548..bdd8051a7 100644
--- a/lib/library/library_service.dart
+++ b/lib/library/library_service.dart
@@ -1,7 +1,6 @@
 import 'dart:async';
 import 'dart:io';
 
-import 'package:collection/collection.dart';
 import 'package:shared_preferences/shared_preferences.dart';
 
 import '../common/data/audio.dart';
@@ -26,30 +25,34 @@ class LibraryService {
   //
   List<Audio> _likedAudios = [];
   List<Audio> get likedAudios => _likedAudios;
-
-  void addLikedAudio(Audio audio, [bool notify = true]) {
+  int get likedAudiosLength => _likedAudios.length;
+  void addLikedAudio(Audio audio) {
     if (_likedAudios.contains(audio)) return;
     _likedAudios.add(audio);
-    if (notify) {
-      writeAudioMap(
-        map: {PageIDs.likedAudios: _likedAudios},
-        fileName: FileNames.likedAudios,
-      ).then((value) => _propertiesChangedController.add(true));
-    }
+    writeAudioMap(
+      map: {PageIDs.likedAudios: _likedAudios},
+      fileName: FileNames.likedAudios,
+    ).then((_) => _propertiesChangedController.add(true));
   }
 
   void addLikedAudios(List<Audio> audios) {
     for (var audio in audios) {
-      addLikedAudio(audio, false);
+      _likedAudios.add(audio);
     }
     writeAudioMap(
       map: {PageIDs.likedAudios: _likedAudios},
       fileName: FileNames.likedAudios,
-    ).then((value) => _propertiesChangedController.add(true));
+    ).then((_) => _propertiesChangedController.add(true));
   }
 
-  bool liked(Audio audio) {
-    return likedAudios.contains(audio);
+  bool isLiked(Audio audio) => _likedAudios.contains(audio);
+
+  bool isLikedAudios(List<Audio> audios) {
+    if (audios.isEmpty) return false;
+    for (var audio in audios) {
+      if (!_likedAudios.contains(audio)) return false;
+    }
+    return true;
   }
 
   void removeLikedAudio(Audio audio, [bool notify = true]) {
@@ -58,7 +61,7 @@ class LibraryService {
       writeAudioMap(
         map: {PageIDs.likedAudios: _likedAudios},
         fileName: FileNames.likedAudios,
-      ).then((value) => _propertiesChangedController.add(true));
+      ).then((_) => _propertiesChangedController.add(true));
     }
   }
 
@@ -69,53 +72,57 @@ class LibraryService {
     writeAudioMap(
       map: {PageIDs.likedAudios: _likedAudios},
       fileName: FileNames.likedAudios,
-    ).then((value) => _propertiesChangedController.add(true));
+    ).then((_) => _propertiesChangedController.add(true));
   }
 
   //
   // Starred stations
   //
 
-  Map<String, List<Audio>> _starredStations = {};
-  Map<String, List<Audio>> get starredStations => _starredStations;
-  int get starredStationsLength => _starredStations.length;
-
-  void addStarredStation(String uuid, List<Audio> audios) {
-    _starredStations.putIfAbsent(uuid, () => audios);
-    writeAudioMap(map: _starredStations, fileName: FileNames.starredStations)
-        .then((_) => _propertiesChangedController.add(true));
+  List<String> get starredStations =>
+      _sharedPreferences.getStringList(
+        SPKeys.starredStations,
+      ) ??
+      [];
+  int get starredStationsLength => starredStations.length;
+
+  void addStarredStation(String uuid) {
+    if (starredStations.contains(uuid)) return;
+    final List<String> starred = List.from(starredStations);
+    starred.add(uuid);
+    _sharedPreferences
+        .setStringList(SPKeys.starredStations, starred)
+        .then(notify);
   }
 
-  void addStarredStations(
-    List<(String uuid, List<Audio> audios)> stations,
-  ) {
-    if (stations.isEmpty) return;
-    for (var station in stations) {
-      if (!_starredStations.containsKey(station.$1)) {
-        _starredStations.putIfAbsent(station.$1, () => station.$2);
+  void addStarredStations(List<String?> uuids) {
+    if (uuids.isEmpty) return;
+    final List<String> starred = List.from(starredStations);
+    for (var uuid in uuids) {
+      if (uuid != null && uuid.isNotEmpty && !starred.contains(uuid)) {
+        starred.add(uuid);
       }
     }
-    writeAudioMap(map: _starredStations, fileName: FileNames.starredStations)
-        .then((_) => _propertiesChangedController.add(true));
+    _sharedPreferences
+        .setStringList(SPKeys.starredStations, starred)
+        .then(notify);
   }
 
-  void unStarStation(String uuid) {
-    _starredStations.remove(uuid);
-    writeAudioMap(map: _starredStations, fileName: FileNames.starredStations)
-        .then((_) => _propertiesChangedController.add(true));
+  void removeStarredStation(String uuid) {
+    if (!starredStations.contains(uuid)) return;
+    final List<String> starred = List.from(starredStations);
+    starred.remove(uuid);
+    _sharedPreferences
+        .setStringList(SPKeys.starredStations, starred)
+        .then(notify);
   }
 
-  Future<void> unStarAllStations() async {
-    _starredStations.clear();
-    return writeAudioMap(
-      map: _starredStations,
-      fileName: FileNames.starredStations,
-    ).then((_) => _propertiesChangedController.add(true));
+  void unStarAllStations() {
+    if (starredStations.isEmpty) return;
+    _sharedPreferences.setStringList(SPKeys.starredStations, []).then(notify);
   }
 
-  bool isStarredStation(String? uuid) {
-    return uuid == null ? false : _starredStations.containsKey(uuid);
-  }
+  bool isStarredStation(String? uuid) => starredStations.contains(uuid);
 
   Set<String> get favRadioTags =>
       _sharedPreferences.getStringList(SPKeys.favRadioTags)?.toSet() ?? {};
@@ -125,32 +132,24 @@ class LibraryService {
     if (favRadioTags.contains(name)) return;
     final Set<String> tags = favRadioTags;
     tags.add(name);
-    _sharedPreferences.setStringList(SPKeys.favRadioTags, tags.toList()).then(
-      (saved) {
-        if (saved) _propertiesChangedController.add(true);
-      },
-    );
+    _sharedPreferences
+        .setStringList(SPKeys.favRadioTags, tags.toList())
+        .then(notify);
   }
 
   void removeFavRadioTag(String name) {
     if (!favRadioTags.contains(name)) return;
     final Set<String> tags = favRadioTags;
     tags.remove(name);
-    _sharedPreferences.setStringList(SPKeys.favRadioTags, tags.toList()).then(
-      (saved) {
-        if (saved) _propertiesChangedController.add(true);
-      },
-    );
+    _sharedPreferences
+        .setStringList(SPKeys.favRadioTags, tags.toList())
+        .then(notify);
   }
 
   String? get lastCountryCode =>
       _sharedPreferences.getString(SPKeys.lastCountryCode);
   void setLastCountryCode(String value) {
-    _sharedPreferences.setString(SPKeys.lastCountryCode, value).then(
-      (saved) {
-        if (saved) _propertiesChangedController.add(true);
-      },
-    );
+    _sharedPreferences.setString(SPKeys.lastCountryCode, value).then(notify);
   }
 
   Set<String> get favCountryCodes =>
@@ -163,9 +162,7 @@ class LibraryService {
     favCodes.add(name);
     _sharedPreferences
         .setStringList(SPKeys.favCountryCodes, favCodes.toList())
-        .then((saved) {
-      if (saved) _propertiesChangedController.add(true);
-    });
+        .then(notify);
   }
 
   void removeFavCountryCode(String name) {
@@ -174,17 +171,13 @@ class LibraryService {
     favCodes.remove(name);
     _sharedPreferences
         .setStringList(SPKeys.favCountryCodes, favCodes.toList())
-        .then((saved) {
-      if (saved) _propertiesChangedController.add(true);
-    });
+        .then(notify);
   }
 
   String? get lastLanguageCode =>
       _sharedPreferences.getString(SPKeys.lastLanguageCode);
   void setLastLanguageCode(String value) {
-    _sharedPreferences.setString(SPKeys.lastLanguageCode, value).then((saved) {
-      if (saved) _propertiesChangedController.add(true);
-    });
+    _sharedPreferences.setString(SPKeys.lastLanguageCode, value).then(notify);
   }
 
   Set<String> get favLanguageCodes =>
@@ -197,11 +190,7 @@ class LibraryService {
     favLangs.add(name);
     _sharedPreferences
         .setStringList(SPKeys.favLanguageCodes, favLangs.toList())
-        .then(
-      (saved) {
-        if (saved) _propertiesChangedController.add(true);
-      },
-    );
+        .then(notify);
   }
 
   void removeFavLanguageCode(String name) {
@@ -210,11 +199,7 @@ class LibraryService {
     favLangs.remove(name);
     _sharedPreferences
         .setStringList(SPKeys.favLanguageCodes, favLangs.toList())
-        .then(
-      (saved) {
-        if (saved) _propertiesChangedController.add(true);
-      },
-    );
+        .then(notify);
   }
 
   //
@@ -222,6 +207,9 @@ class LibraryService {
   //
 
   Map<String, List<Audio>> _playlists = {};
+  List<String> get playlistIDs => _playlists.keys.toList();
+  List<Audio>? getPlaylistById(String id) =>
+      id == PageIDs.likedAudios ? _likedAudios : _playlists[id];
   Map<String, List<Audio>> get playlists => _playlists;
   bool isPlaylistSaved(String? id) =>
       id == null ? false : _playlists.containsKey(id);
@@ -243,14 +231,7 @@ class LibraryService {
       if (!_playlists.containsKey(playlist.id)) {
         _playlists.putIfAbsent(playlist.id, () => playlist.audios);
         if (external) {
-          final externalPlaylists =
-              _sharedPreferences.getStringList(SPKeys.externalPlaylists);
-          final newList = List<String>.from(externalPlaylists ?? []);
-          newList.add(playlist.id);
-          await _sharedPreferences.setStringList(
-            SPKeys.externalPlaylists,
-            newList,
-          );
+          addExternalPlaylistID(playlist.id);
         }
       }
     }
@@ -258,8 +239,15 @@ class LibraryService {
         .then((_) => _propertiesChangedController.add(true));
   }
 
-  Future<void> updatePlaylist(String id, List<Audio> audios) async {
+  Future<void> updatePlaylist({
+    required String id,
+    required List<Audio> audios,
+    bool external = false,
+  }) async {
     if (_playlists.containsKey(id)) {
+      if (external) {
+        addExternalPlaylistID(id);
+      }
       await writeAudioMap(map: _playlists, fileName: FileNames.playlists)
           .then((_) {
         _playlists.update(
@@ -274,19 +262,7 @@ class LibraryService {
   Future<void> removePlaylist(String id) async {
     if (_playlists.containsKey(id)) {
       _playlists.remove(id);
-      if (_sharedPreferences
-              .getStringList(SPKeys.externalPlaylists)
-              ?.contains(id) ??
-          false) {
-        final newList = List<String>.from(
-          _sharedPreferences.getStringList(SPKeys.externalPlaylists) ?? [],
-        );
-        newList.remove(id);
-        await _sharedPreferences.setStringList(
-          SPKeys.externalPlaylists,
-          newList,
-        );
-      }
+      removeExternalPlaylistID(id);
       return writeAudioMap(map: _playlists, fileName: FileNames.playlists).then(
         (_) => _propertiesChangedController.add(true),
       );
@@ -299,6 +275,7 @@ class LibraryService {
     if (oldList != null) {
       _playlists.remove(oldName);
       _playlists.putIfAbsent(newName, () => oldList);
+      updateExternalPlaylistID(oldName, newName);
       writeAudioMap(map: _playlists, fileName: FileNames.playlists)
           .then((_) => _propertiesChangedController.add(true));
     }
@@ -310,7 +287,7 @@ class LibraryService {
     required String id,
   }) {
     final audios = id == PageIDs.likedAudios
-        ? likedAudios.toList()
+        ? _likedAudios.toList()
         : playlists[id]?.toList();
 
     if (audios == null ||
@@ -331,8 +308,8 @@ class LibraryService {
         map: {PageIDs.likedAudios: _likedAudios},
         fileName: FileNames.likedAudios,
       ).then((value) {
-        likedAudios.clear();
-        likedAudios.addAll(audios);
+        _likedAudios.clear();
+        _likedAudios.addAll(audios);
         _propertiesChangedController.add(true);
       });
     } else {
@@ -381,6 +358,53 @@ class LibraryService {
     }
   }
 
+  List<String> get externalPlaylistIDs =>
+      _sharedPreferences.getStringList(SPKeys.externalPlaylists) ?? [];
+
+  List<Audio> get externalPlaylistAudios {
+    if (externalPlaylistIDs.isEmpty) return [];
+
+    return [
+      for (var e in externalPlaylistIDs) ...getPlaylistById(e) ?? [],
+    ];
+  }
+
+  List<Audio> get playlistsAudios {
+    if (_playlists.isEmpty) return [];
+    return [
+      for (var e in _playlists.entries) ...e.value,
+    ];
+  }
+
+  void addExternalPlaylistID(String value) {
+    final lists = List<String>.from(externalPlaylistIDs);
+    if (lists.contains(value)) return;
+    lists.add(value);
+    _sharedPreferences
+        .setStringList(SPKeys.externalPlaylists, lists)
+        .then(notify);
+  }
+
+  void removeExternalPlaylistID(String value) {
+    final lists = List<String>.from(externalPlaylistIDs);
+    if (!lists.contains(value)) return;
+    lists.remove(value);
+    _sharedPreferences
+        .setStringList(SPKeys.externalPlaylists, lists)
+        .then(notify);
+  }
+
+  void updateExternalPlaylistID(String oldName, String newName) {
+    final lists = List<String>.from(externalPlaylistIDs);
+    if (lists.contains(oldName)) {
+      lists.remove(oldName);
+      lists.add(newName);
+      _sharedPreferences
+          .setStringList(SPKeys.externalPlaylists, lists)
+          .then(notify);
+    }
+  }
+
   ///
   /// Podcasts
   ///
@@ -464,6 +488,7 @@ class LibraryService {
 
   Map<String, List<Audio>> _podcasts = {};
   bool isPodcastSubscribed(String feedUrl) => _podcasts.containsKey(feedUrl);
+  List<String> get podcastFeedUrls => _podcasts.keys.toList();
   Map<String, List<Audio>> get podcasts => _podcasts;
   int get podcastsLength => _podcasts.length;
 
@@ -587,62 +612,67 @@ class LibraryService {
   // Albums
   //
 
-  Map<String, List<Audio>> _pinnedAlbums = {};
-  Map<String, List<Audio>> get pinnedAlbums => _pinnedAlbums;
-  int get pinnedAlbumsLength => _pinnedAlbums.length;
+  List<String> get favoriteAlbums =>
+      _sharedPreferences.getStringList(SPKeys.favoriteAlbums) ?? [];
 
-  List<Audio> getAlbumAt(int index) =>
-      _pinnedAlbums.entries.elementAt(index).value.toList();
+  bool isFavoriteAlbum(String id) => favoriteAlbums.contains(id);
 
-  bool isPinnedAlbum(String name) => _pinnedAlbums.containsKey(name);
-
-  void addPinnedAlbum(String name, List<Audio> audios) {
-    _pinnedAlbums.putIfAbsent(name, () => audios);
-    writeAudioMap(map: _pinnedAlbums, fileName: FileNames.pinnedAlbums)
-        .then((_) => _propertiesChangedController.add(true));
+  void addFavoriteAlbum(String id, {required Function() onFail}) {
+    if (id.isEmpty) {
+      onFail();
+      return;
+    }
+    if (favoriteAlbums.contains(id)) return;
+    final List<String> favorites = List.from(favoriteAlbums);
+    favorites.add(id);
+    _sharedPreferences
+        .setStringList(SPKeys.favoriteAlbums, favorites)
+        .then(notify);
   }
 
-  void removePinnedAlbum(String name) {
-    _pinnedAlbums.remove(name);
-    writeAudioMap(map: _pinnedAlbums, fileName: FileNames.pinnedAlbums)
-        .then((_) => _propertiesChangedController.add(true));
+  void removeFavoriteAlbum(String id, {required Function() onFail}) {
+    if (id.isEmpty) {
+      onFail();
+      return;
+    }
+    if (!favoriteAlbums.contains(id)) return;
+    final List<String> favorites = List.from(favoriteAlbums);
+    favorites.remove(id);
+    _sharedPreferences
+        .setStringList(SPKeys.favoriteAlbums, favorites)
+        .then(notify);
   }
 
-  bool? _libraryInitialized;
-  Future<bool> init() async {
-    // Ensure [init] is only called once
-    if (_libraryInitialized == true) return _libraryInitialized!;
+  bool notify(bool saved) {
+    if (saved) _propertiesChangedController.add(true);
+    return saved;
+  }
 
+  Future<void> init() async {
     _playlists = await readAudioMap(FileNames.playlists);
-    _pinnedAlbums = await readAudioMap(FileNames.pinnedAlbums);
+    _likedAudios = (await readAudioMap(FileNames.likedAudios))
+            .entries
+            .firstOrNull
+            ?.value ??
+        <Audio>[];
     _podcasts = await readAudioMap(FileNames.podcasts);
     _podcastUpdates = Set.from(
       await readStringIterable(filename: FileNames.podcastUpdates) ??
           <String>{},
     );
     _podcastUpdates ??= {};
-    _starredStations = await readAudioMap(FileNames.starredStations);
-
-    _likedAudios = (await readAudioMap(FileNames.likedAudios))
-            .entries
-            .firstOrNull
-            ?.value ??
-        <Audio>[];
-
     _downloads = await readStringMap(FileNames.downloads);
     _feedsWithDownloads = Set.from(
       await readStringIterable(filename: FileNames.feedsWithDownloads) ??
           <String>{},
     );
-
-    return true;
   }
 
   String? get selectedPageId =>
-      _sharedPreferences.getString(PageIDs.selectedPage);
+      _sharedPreferences.getString(SPKeys.selectedPage);
   Future<void> setSelectedPageId(String value) async {
     final success =
-        await _sharedPreferences.setString(PageIDs.selectedPage, value);
+        await _sharedPreferences.setString(SPKeys.selectedPage, value);
     if (success) {
       _propertiesChangedController.add(true);
     }
@@ -655,7 +685,7 @@ class LibraryService {
   bool isPageInLibrary(String? pageId) =>
       pageId != null &&
       (PageIDs.permanent.contains(pageId) ||
-          isPinnedAlbum(pageId) ||
+          favoriteAlbums.contains(pageId) ||
           isStarredStation(pageId) ||
           isPlaylistSaved(pageId) ||
           isPodcastSubscribed(pageId));
diff --git a/lib/local_audio/local_audio_model.dart b/lib/local_audio/local_audio_model.dart
index 7dbb493d9..e86191201 100644
--- a/lib/local_audio/local_audio_model.dart
+++ b/lib/local_audio/local_audio_model.dart
@@ -1,33 +1,59 @@
 import 'dart:async';
 import 'dart:typed_data';
 
+import 'package:audio_metadata_reader/audio_metadata_reader.dart';
 import 'package:safe_change_notifier/safe_change_notifier.dart';
 import 'package:watcher/watcher.dart';
 
 import '../common/data/audio.dart';
 import '../common/view/audio_filter.dart';
-import '../library/library_service.dart';
 import '../settings/settings_service.dart';
 import 'local_audio_service.dart';
 
 class LocalAudioModel extends SafeChangeNotifier {
   LocalAudioModel({
     required LocalAudioService localAudioService,
-    required LibraryService libraryService,
     required SettingsService settingsService,
   })  : _localAudioService = localAudioService,
-        _settingsService = settingsService,
-        _libraryService = libraryService {
+        _settingsService = settingsService {
     _audiosChangedSub ??=
         _localAudioService.audiosChanged.listen((_) => notifyListeners());
   }
 
   final LocalAudioService _localAudioService;
-  final LibraryService _libraryService;
   final SettingsService _settingsService;
   StreamSubscription<bool>? _audiosChangedSub;
   FileWatcher? get fileWatcher => _localAudioService.fileWatcher;
 
+  void changeMetadata(
+    Audio audio, {
+    Function? onChange,
+    String? title,
+    String? artist,
+    String? album,
+    String? genre,
+    String? discTotal,
+    String? discNumber,
+    String? trackNumber,
+    String? durationMs,
+    String? year,
+    List<Picture>? pictures,
+  }) =>
+      _localAudioService.changeMetadata(
+        audio,
+        onChange: onChange,
+        title: title,
+        artist: artist,
+        album: album,
+        genre: genre,
+        discTotal: discTotal,
+        discNumber: discNumber,
+        trackNumber: trackNumber,
+        durationMs: durationMs,
+        year: year,
+        pictures: pictures,
+      );
+
   int get localAudioindex => _settingsService.localAudioIndex;
   set localAudioindex(int value) {
     if (value == localAudioindex) return;
@@ -55,15 +81,14 @@ class LocalAudioModel extends SafeChangeNotifier {
 
   List<Audio>? get audios => _localAudioService.audios;
   List<String>? get allArtists => _localAudioService.allArtists;
-  List<String>? get allAlbumArtists => _localAudioService.allAlbumArtists;
   List<String>? get allGenres => _localAudioService.allGenres;
-  List<String>? get allAlbums => _localAudioService.allAlbums;
+  List<String>? get allAlbumIDs => _localAudioService.allAlbumIDs;
 
   List<Audio>? findAlbum(
-    String albumName, [
+    String albumId, [
     AudioFilter audioFilter = AudioFilter.trackNumber,
   ]) =>
-      _localAudioService.findAlbum(albumName, audioFilter);
+      _localAudioService.findAlbum(albumId, audioFilter);
 
   List<Audio>? findTitlesOfArtist(
     String artist, [
@@ -71,12 +96,6 @@ class LocalAudioModel extends SafeChangeNotifier {
   ]) =>
       _localAudioService.findTitlesOfArtist(artist, audioFilter);
 
-  List<Audio>? findTitlesOfAlbumArtists(
-    String artist, [
-    AudioFilter audioFilter = AudioFilter.album,
-  ]) =>
-      _localAudioService.findTitlesOfAlbumArtists(artist, audioFilter);
-
   List<String>? findArtistsOfGenre(String genre) =>
       _localAudioService.findArtistsOfGenre(genre);
 
@@ -91,29 +110,19 @@ class LocalAudioModel extends SafeChangeNotifier {
 
   List<String>? get failedImports => _localAudioService.failedImports;
 
-  List<String>? findAllAlbums({
-    Iterable<Audio>? newAudios,
+  List<String>? findAllAlbumIDs({
+    String? artist,
     bool clean = true,
   }) =>
-      _localAudioService.findAllAlbums(newAudios: newAudios, clean: clean);
+      _localAudioService.findAllAlbumIDs(artist: artist, clean: clean);
 
   bool get importing => _localAudioService.audios == null;
 
-  Future<void> init({
-    bool forceInit = false,
-    String? directory,
-  }) async {
-    await _localAudioService.init(
-      forceInit: forceInit,
-      newDirectory: directory,
-    );
-    if (_libraryService.playlists.isEmpty) return;
-    for (var playlist in _libraryService.playlists.entries.where(
-      (e) => _settingsService.externalPlaylists.contains(e.key),
-    )) {
-      _localAudioService.addAudios(playlist.value);
-    }
-  }
+  Future<void> init({bool forceInit = false, String? directory}) async =>
+      _localAudioService.init(
+        forceInit: forceInit,
+        newDirectory: directory,
+      );
 
   @override
   Future<void> dispose() async {
diff --git a/lib/local_audio/local_audio_service.dart b/lib/local_audio/local_audio_service.dart
index 1ac8b23aa..dabff588a 100644
--- a/lib/local_audio/local_audio_service.dart
+++ b/lib/local_audio/local_audio_service.dart
@@ -1,6 +1,7 @@
 import 'dart:async';
 import 'dart:io';
 
+import 'package:audio_metadata_reader/audio_metadata_reader.dart';
 import 'package:collection/collection.dart';
 import 'package:flutter/foundation.dart';
 import 'package:watcher/watcher.dart';
@@ -9,6 +10,8 @@ import '../common/data/audio.dart';
 import '../common/logging.dart';
 import '../common/view/audio_filter.dart';
 import '../extensions/media_file_x.dart';
+import '../extensions/string_x.dart';
+import '../library/library_service.dart';
 import '../settings/settings_service.dart';
 import 'local_cover_service.dart';
 
@@ -16,7 +19,6 @@ class LocalSearchResult {
   const LocalSearchResult({
     required this.titles,
     required this.artists,
-    required this.albumArtists,
     required this.albums,
     required this.genres,
     required this.playlists,
@@ -24,7 +26,7 @@ class LocalSearchResult {
 
   final List<Audio>? titles;
   final List<String>? artists;
-  final List<String>? albumArtists;
+
   final List<String>? albums;
   final List<String>? genres;
   final List<String>? playlists;
@@ -33,12 +35,15 @@ class LocalSearchResult {
 class LocalAudioService {
   final SettingsService? _settingsService;
   final LocalCoverService _localCoverService;
+  final LibraryService? _libraryService;
 
   LocalAudioService({
     required LocalCoverService localCoverService,
     SettingsService? settingsService,
+    LibraryService? libraryService,
   })  : _settingsService = settingsService,
-        _localCoverService = localCoverService;
+        _localCoverService = localCoverService,
+        _libraryService = libraryService;
 
   List<Audio>? _audios;
   List<Audio>? get audios => _audios;
@@ -49,13 +54,10 @@ class LocalAudioService {
 
   void _sortAllTitles() {
     if (_audios == null) return;
-    final list = _audios!.toList();
     sortListByAudioFilter(
       audioFilter: AudioFilter.title,
-      audios: list,
+      audios: _audios!,
     );
-
-    _audios = List.from(list);
   }
 
   List<String>? _allArtists;
@@ -73,27 +75,11 @@ class LocalAudioService {
     _allArtists?.sort();
   }
 
-  List<String>? _allAlbumArtists;
-  List<String>? get allAlbumArtists => _allAlbumArtists;
-  void _findAllAlbumArtists() {
-    if (_audios == null) return;
-    final albumArtists = <String>[];
-    for (var a in audios!) {
-      final albumArtist = a.albumArtist;
-      if (albumArtist?.isNotEmpty == true &&
-          !albumArtists.contains(albumArtist)) {
-        albumArtists.add(albumArtist!);
-      }
-    }
-    _allAlbumArtists = albumArtists;
-    _allAlbumArtists?.sort();
-  }
-
   List<String>? _allGenres;
   List<String>? get allGenres => _allGenres;
   void _findAllGenres() {
     if (_audios == null) return;
-    final genresResult = <String>{};
+    final genresResult = <String>[];
     for (var a in audios!) {
       if (genresResult.none(
             (e) => e == a.genre,
@@ -102,40 +88,44 @@ class LocalAudioService {
         genresResult.add(a.genre!);
       }
     }
-    final list = genresResult.toList();
-    list.sort();
-
-    _allGenres = List.from(list);
+    genresResult.sort();
+    _allGenres = genresResult;
   }
 
-  List<String>? _allAlbums;
-  List<String>? get allAlbums => _allAlbums;
-  List<String>? findAllAlbums({Iterable<Audio>? newAudios, bool clean = true}) {
-    final theAudios = newAudios ?? audios;
+  List<String>? _allAlbumIDs;
+  List<String>? get allAlbumIDs => _allAlbumIDs;
+  List<String>? findAllAlbumIDs({
+    String? artist,
+    bool clean = true,
+  }) {
+    final theAudios = artist == null || artist.isEmpty
+        ? audios
+        : audios?.where((e) => e.artist == artist);
     if (theAudios == null) return null;
     final albumsResult = <String>[];
     for (var a in theAudios) {
-      if (a.album != null && albumsResult.none((e) => e == a.album)) {
-        albumsResult.add(a.album!);
+      if (a.albumId != null && albumsResult.none((e) => e == a.albumId)) {
+        albumsResult.add(a.albumId!);
       }
     }
-    final list = albumsResult.toList();
-    list.sort();
+    albumsResult.sort(
+      (a, b) => compareNatural(a.albumOfId, b.albumOfId),
+    );
 
     if (clean) {
-      _allAlbums = List.from(list);
-      return _allAlbums;
+      _allAlbumIDs = albumsResult;
+      return _allAlbumIDs;
     } else {
-      return List.from(list);
+      return albumsResult;
     }
   }
 
   List<Audio>? findAlbum(
-    String albumName, [
+    String albumId, [
     AudioFilter audioFilter = AudioFilter.trackNumber,
   ]) {
     final album = audios?.where(
-      (a) => a.album != null && a.album == albumName,
+      (a) => a.albumId != null && a.albumId == albumId,
     );
 
     var albumList = album?.toList();
@@ -170,30 +160,11 @@ class LocalAudioService {
     return artistList != null ? List.from(artistList) : null;
   }
 
-  List<Audio>? findTitlesOfAlbumArtists(
-    String albumArtist, [
-    AudioFilter audioFilter = AudioFilter.album,
-  ]) {
-    final album = audios?.where(
-      (a) => a.albumArtist != null && a.albumArtist == albumArtist,
-    );
-
-    var albumArtistList = album?.toList();
-    if (albumArtistList != null) {
-      sortListByAudioFilter(
-        audioFilter: audioFilter,
-        audios: albumArtistList,
-      );
-      albumArtistList = splitByDiscs(albumArtistList).toList();
-    }
-    return albumArtistList != null ? List.from(albumArtistList) : null;
-  }
-
   List<String>? findArtistsOfGenre(String genre) {
-    if (audios == null) return null;
+    if (_audios == null) return null;
     final artistsOfGenre = <String>[];
 
-    for (var artistAudio in audios!) {
+    for (var artistAudio in _audios!) {
       if (artistAudio.genre?.trim().isNotEmpty == true &&
           artistAudio.genre == genre &&
           artistsOfGenre.none((e) => e == artistAudio.artist)) {
@@ -238,15 +209,14 @@ class LocalAudioService {
       return const LocalSearchResult(
         titles: [],
         artists: [],
-        albumArtists: [],
         albums: [],
         genres: [],
         playlists: [],
       );
     }
 
-    final allAlbumsFindings =
-        allAlbums?.where((e) => e.toLowerCase().contains(query.toLowerCase()));
+    final allAlbumsFindings = allAlbumIDs
+        ?.where((e) => e.albumOfId.toLowerCase().contains(query.toLowerCase()));
 
     final albumsResult = <String>[];
     if (allAlbumsFindings != null) {
@@ -287,9 +257,6 @@ class LocalAudioService {
       artists: allArtists
           ?.where((a) => a.toLowerCase().contains(query.toLowerCase()))
           .toList(),
-      albumArtists: allAlbumArtists
-          ?.where((a) => a.toLowerCase().contains(query.toLowerCase()))
-          .toList(),
       playlists: [],
     );
   }
@@ -297,10 +264,7 @@ class LocalAudioService {
   FileWatcher? _fileWatcher;
   FileWatcher? get fileWatcher => _fileWatcher;
 
-  Future<void> init({
-    String? newDirectory,
-    bool forceInit = false,
-  }) async {
+  Future<void> init({String? newDirectory, bool forceInit = false}) async {
     if (forceInit == false && _audios?.isNotEmpty == true) return;
 
     if (newDirectory != null && newDirectory != _settingsService?.directory) {
@@ -308,28 +272,32 @@ class LocalAudioService {
     }
     final dir = newDirectory ?? _settingsService?.directory;
 
-    final result = await compute(
-      _readAudiosFromDirectory,
-      dir,
-    );
-    if (dir != null && Directory(dir).existsSync()) {
+    final result = await compute(_readAudiosFromDirectory, dir);
+    _failedImports = result.failedImports;
+
+    if (dir != null &&
+        Directory(dir).existsSync() &&
+        (_fileWatcher == null || _fileWatcher!.path != dir)) {
       _fileWatcher = FileWatcher(dir);
     }
 
     addAudios(
       result.audios,
       forceInit: forceInit,
-      failedImports: result.failedImports,
     );
+
+    final additionalAudios = _libraryService?.externalPlaylistAudios;
+    if (_libraryService != null && additionalAudios!.isNotEmpty) {
+      addAudios(
+        additionalAudios.where((e) => e.isLocal).toList(),
+        forceInit: forceInit,
+      );
+    }
   }
 
   Future<void> dispose() async => _audiosController.close();
 
-  void addAudios(
-    List<Audio> newAudios, {
-    bool forceInit = false,
-    List<String>? failedImports,
-  }) {
+  void addAudios(List<Audio> newAudios, {bool forceInit = false}) {
     if (forceInit) {
       _audios = null;
       _audiosController.add(true);
@@ -340,21 +308,88 @@ class LocalAudioService {
     if (_audios!.isEmpty) {
       _audios = newAudios;
     } else {
-      for (final audio in newAudios) {
-        if (!_audios!.contains(audio)) {
-          _audios!.add(audio);
-        }
-      }
+      final set = Set<Audio>.from(_audios!);
+      set.addAll(newAudios);
+      _audios = set.toList();
     }
 
+    _buildLocalLibrary();
+  }
+
+  void _buildLocalLibrary() {
     _sortAllTitles();
     _findAllArtists();
-    _findAllAlbumArtists();
-    findAllAlbums();
+    findAllAlbumIDs();
     _findAllGenres();
-    _failedImports = failedImports;
     _audiosController.add(true);
   }
+
+  void changeMetadata(
+    Audio audio, {
+    Function? onChange,
+    String? title,
+    String? artist,
+    String? album,
+    String? genre,
+    String? discTotal,
+    String? discNumber,
+    String? trackNumber,
+    String? durationMs,
+    String? year,
+    List<Picture>? pictures,
+  }) {
+    if (audio.path != null) {
+      final file = File(audio.path!);
+      if (file.existsSync()) {
+        updateMetadata(
+          file,
+          (metadata) {
+            try {
+              if (title != null) {
+                metadata.setTitle(title);
+              }
+              if (artist != null) {
+                metadata.setArtist(artist);
+              }
+              if (album != null) {
+                metadata.setAlbum(album);
+              }
+              if (genre != null) {
+                metadata.setGenres([genre]);
+              }
+              if (trackNumber != null && int.tryParse(trackNumber) != null) {
+                metadata.setTrackNumber(int.tryParse(trackNumber));
+              }
+              if (year != null && int.tryParse(year) != null) {
+                metadata.setYear(DateTime(int.parse(year)));
+              }
+              if (pictures?.isNotEmpty ?? false) {
+                metadata.setPictures(pictures!);
+              }
+
+              // Not supported yet
+              // if (discNumber != null) {
+              //   metadata.setDiscNumber(discNumber);
+              // }
+              // if (discTotal != null) {
+              //   metadata.setDiscTotal(discTotal);
+              // }
+              // if (durationMs != null) {
+              //   metadata.setDuration(durationMs);
+              // }
+              // if (albumArtist != null) {
+              //   metadata.setAlbumArtist(albumArtist);
+              // }
+
+              onChange?.call();
+            } on Exception catch (e) {
+              printMessageInDebugMode(e);
+            }
+          },
+        );
+      }
+    }
+  }
 }
 
 FutureOr<ImportResult> _readAudiosFromDirectory(String? directory) async {
@@ -362,13 +397,14 @@ FutureOr<ImportResult> _readAudiosFromDirectory(String? directory) async {
   List<String> failedImports = [];
 
   if (directory != null && Directory(directory).existsSync()) {
-    final entities = await Directory(directory)
-        .list(recursive: true, followLinks: false)
-        .handleError((e) => failedImports.add(e.toString()))
-        .toList();
-
-    for (final e in entities) {
-      if (e is File && e.isPlayable) {
+    final files = (await Directory(directory)
+            .list(recursive: true, followLinks: false)
+            .handleError((e) => failedImports.add(e.toString()))
+            .toList())
+        .whereType<File>();
+
+    for (final e in files) {
+      if (e.isPlayable) {
         try {
           newAudios.add(Audio.local(e, onError: (p) => failedImports.add(p)));
         } on Exception catch (ex) {
diff --git a/lib/local_audio/view/album_page.dart b/lib/local_audio/view/album_page.dart
index b1f7fc45d..75c86142a 100644
--- a/lib/local_audio/view/album_page.dart
+++ b/lib/local_audio/view/album_page.dart
@@ -1,3 +1,4 @@
+import 'package:animated_emoji/animated_emoji.dart';
 import 'package:collection/collection.dart';
 import 'package:flutter/material.dart';
 import 'package:watch_it/watch_it.dart';
@@ -10,6 +11,7 @@ import '../../common/view/cover_background.dart';
 import '../../common/view/icons.dart';
 import '../../common/view/side_bar_fall_back_image.dart';
 import '../../common/view/sliver_audio_page.dart';
+import '../../common/view/snackbars.dart';
 import '../../common/view/theme.dart';
 import '../../common/view/ui_constants.dart';
 import '../../extensions/build_context_x.dart';
@@ -19,68 +21,87 @@ import '../local_audio_model.dart';
 import 'artist_page.dart';
 import 'local_cover.dart';
 
-class AlbumPage extends StatelessWidget {
+class AlbumPage extends StatefulWidget with WatchItStatefulWidgetMixin {
   const AlbumPage({
     super.key,
     required this.id,
-    required this.album,
   });
 
   final String id;
-  final List<Audio> album;
+
+  @override
+  State<AlbumPage> createState() => _AlbumPageState();
+}
+
+class _AlbumPageState extends State<AlbumPage> {
+  late List<Audio> album;
+
+  @override
+  void initState() {
+    super.initState();
+    getAlbum();
+  }
+
+  void getAlbum() => album = di<LocalAudioModel>().findAlbum(widget.id) ?? [];
 
   @override
   Widget build(BuildContext context) {
-    final model = di<LocalAudioModel>();
-
-    void onArtistTap(text) {
-      final artistName = album.firstOrNull?.artist;
-      if (artistName == null) return;
-
-      model.init().then(
-            (_) => di<LibraryModel>().push(
-              builder: (_) {
-                final artistAudios = model.findTitlesOfArtist(artistName);
-                return ArtistPage(
-                  artistAudios: artistAudios,
-                );
-              },
-              pageId: artistName,
-            ),
-          );
-    }
+    watchPropertyValue((LocalAudioModel m) {
+      setState(() => getAlbum());
+      return m.audios.hashCode;
+    });
 
     return SliverAudioPage(
-      pageId: id,
+      pageId: widget.id,
       audioPageType: AudioPageType.album,
       audios: album,
-      image: album.isEmpty ? null : AlbumPageImage(audio: album.first),
+      image: AlbumPageImage(audio: album.firstOrNull),
+      noSearchResultIcons: const AnimatedEmoji(AnimatedEmojis.bubbles),
+      noSearchResultMessage: Text(context.l10n.albumNotFound),
       pageTitle: album.firstWhereOrNull((e) => e.album != null)?.album,
       pageSubTitle: album.firstWhereOrNull((e) => e.artist != null)?.artist,
       onPageSubTitleTab: onArtistTap,
       onPageLabelTab: onArtistTap,
-      controlPanel: AlbumPageControlButton(album: album, id: id),
+      controlPanel: AlbumPageControlButton(album: album, id: widget.id),
     );
   }
+
+  void onArtistTap(String text) => di<LibraryModel>().push(
+        builder: (_) => ArtistPage(pageId: text),
+        pageId: text,
+      );
 }
 
-class AlbumPageSideBarIcon extends StatelessWidget {
-  const AlbumPageSideBarIcon({super.key, required this.audio});
+class AlbumPageSideBarIcon extends StatefulWidget {
+  const AlbumPageSideBarIcon({super.key, required this.albumId});
 
-  final Audio? audio;
+  final String albumId;
+
+  @override
+  State<AlbumPageSideBarIcon> createState() => _AlbumPageSideBarIconState();
+}
+
+class _AlbumPageSideBarIconState extends State<AlbumPageSideBarIcon> {
+  Audio? audio;
+
+  @override
+  void initState() {
+    super.initState();
+    audio = di<LocalAudioModel>().findAlbum(widget.albumId)?.firstOrNull;
+  }
 
   @override
   Widget build(BuildContext context) {
     final fallBack = SideBarFallBackImage(
       child: Icon(
         Iconz.startPlayList,
-        color: getAlphabetColor(audio?.album ?? 'c'),
+        color: getAlphabetColor(widget.albumId),
       ),
     );
 
     return ClipRRect(
       borderRadius: BorderRadius.circular(5),
-      child: audio?.hasPathAndId == false
+      child: audio == null || audio?.canHaveLocalCover == false
           ? fallBack
           : LocalCover(
               albumId: audio!.albumId!,
@@ -98,7 +119,7 @@ class AlbumPageImage extends StatelessWidget {
     required this.audio,
   });
 
-  final Audio audio;
+  final Audio? audio;
 
   @override
   Widget build(BuildContext context) {
@@ -113,24 +134,27 @@ class AlbumPageImage extends StatelessWidget {
             ),
           ),
         ),
-        if (audio.hasPathAndId == true)
-          Align(
-            alignment: Alignment.centerLeft,
-            child: LocalCover(
-              albumId: audio.albumId!,
-              path: audio.path!,
-              dimension: kMaxAudioPageHeaderHeight,
-              fallback: const CoverBackground(
-                dimension: kMaxAudioPageHeaderHeight,
-              ),
-            ),
-          ),
+        Align(
+          alignment: Alignment.centerLeft,
+          child: audio != null && audio!.canHaveLocalCover
+              ? LocalCover(
+                  albumId: audio!.albumId!,
+                  path: audio!.path!,
+                  dimension: kMaxAudioPageHeaderHeight,
+                  fallback: const CoverBackground(
+                    dimension: kMaxAudioPageHeaderHeight,
+                  ),
+                )
+              : const CoverBackground(
+                  dimension: kMaxAudioPageHeaderHeight,
+                ),
+        ),
       ],
     );
   }
 }
 
-class AlbumPageControlButton extends StatelessWidget {
+class AlbumPageControlButton extends StatelessWidget with WatchItMixin {
   const AlbumPageControlButton({
     super.key,
     required this.id,
@@ -143,7 +167,8 @@ class AlbumPageControlButton extends StatelessWidget {
   @override
   Widget build(BuildContext context) {
     final libraryModel = di<LibraryModel>();
-    final pinnedAlbum = libraryModel.isPinnedAlbum(id);
+    final pinnedAlbum =
+        watchPropertyValue((LibraryModel m) => m.isFavoriteAlbum(id));
     return Row(
       mainAxisSize: MainAxisSize.min,
       mainAxisAlignment: MainAxisAlignment.center,
@@ -152,15 +177,31 @@ class AlbumPageControlButton extends StatelessWidget {
           IconButton(
             tooltip:
                 pinnedAlbum ? context.l10n.unPinAlbum : context.l10n.pinAlbum,
-            isSelected: libraryModel.isPinnedAlbum(id),
+            isSelected: pinnedAlbum,
             icon: Icon(
               pinnedAlbum ? Iconz.pinFilled : Iconz.pin,
             ),
             onPressed: () {
-              if (libraryModel.isPinnedAlbum(id)) {
-                libraryModel.removePinnedAlbum(id);
+              if (pinnedAlbum) {
+                libraryModel.removeFavoriteAlbum(
+                  id,
+                  onFail: () {
+                    showSnackBar(
+                      context: context,
+                      content: Text(context.l10n.cantUnpinEmptyAlbum),
+                    );
+                  },
+                );
               } else {
-                libraryModel.addPinnedAlbum(id, album);
+                libraryModel.addFavoriteAlbum(
+                  id,
+                  onFail: () {
+                    showSnackBar(
+                      context: context,
+                      content: Text(context.l10n.cantPinEmptyAlbum),
+                    );
+                  },
+                );
               }
             },
           ),
diff --git a/lib/local_audio/view/album_view.dart b/lib/local_audio/view/album_view.dart
index 713e3399d..ca04b4a80 100644
--- a/lib/local_audio/view/album_view.dart
+++ b/lib/local_audio/view/album_view.dart
@@ -10,8 +10,11 @@ import '../../common/view/cover_background.dart';
 import '../../common/view/icons.dart';
 import '../../common/view/no_search_result_page.dart';
 import '../../common/view/sliver_fill_remaining_progress.dart';
+import '../../common/view/snackbars.dart';
 import '../../common/view/theme.dart';
 import '../../common/view/ui_constants.dart';
+import '../../extensions/string_x.dart';
+import '../../l10n/l10n.dart';
 import '../../library/library_model.dart';
 import '../../player/player_model.dart';
 import '../local_audio_model.dart';
@@ -21,33 +24,36 @@ import 'local_cover.dart';
 class AlbumsView extends StatelessWidget with WatchItMixin {
   const AlbumsView({
     super.key,
-    required this.albums,
+    required this.albumIDs,
     this.noResultMessage,
     this.noResultIcon,
   });
 
-  final List<String>? albums;
+  final List<String>? albumIDs;
   final Widget? noResultMessage, noResultIcon;
 
   @override
   Widget build(BuildContext context) {
-    if (albums == null) {
+    if (albumIDs == null) {
       return const SliverFillRemainingProgress();
     }
 
-    if (albums!.isEmpty) {
+    if (albumIDs!.isEmpty) {
       return SliverNoSearchResultPage(
         icon: noResultIcon,
         message: noResultMessage,
       );
     }
 
-    watchPropertyValue((LibraryModel m) => m.pinnedAlbums.hashCode);
-    final pinnedAlbums = di<LibraryModel>().pinnedAlbums;
-    final pinnedAlbumsAlbumNames =
-        pinnedAlbums.entries.map((e) => e.value.firstOrNull?.album);
-    final pinned = albums!.where((e) => pinnedAlbumsAlbumNames.contains(e));
-    final notPinned = albums!.where((e) => !pinnedAlbumsAlbumNames.contains(e));
+    watchPropertyValue((LibraryModel m) => m.favoriteAlbums.hashCode);
+
+    final pinnedAlbumsAlbumKeys = di<LibraryModel>().favoriteAlbums;
+    pinnedAlbumsAlbumKeys.sort((a, b) => a.albumOfId.compareTo(b.albumOfId));
+
+    final pinned =
+        albumIDs?.where((e) => pinnedAlbumsAlbumKeys.contains(e)) ?? [];
+    final notPinned =
+        albumIDs?.where((e) => !pinnedAlbumsAlbumKeys.contains(e)) ?? [];
     final sortedAlbums = [
       ...pinned,
       ...notPinned,
@@ -57,11 +63,11 @@ class AlbumsView extends StatelessWidget with WatchItMixin {
       itemCount: sortedAlbums.length,
       gridDelegate: audioCardGridDelegate,
       itemBuilder: (context, index) {
-        final album = sortedAlbums.elementAt(index);
+        final albumID = sortedAlbums.elementAt(index);
         return AlbumCard(
-          key: ValueKey(album),
-          album: album,
-          pinned: pinned.contains(album),
+          key: ValueKey(albumID),
+          id: albumID,
+          pinned: pinned.contains(albumID),
         );
       },
     );
@@ -71,28 +77,27 @@ class AlbumsView extends StatelessWidget with WatchItMixin {
 class AlbumCard extends StatelessWidget {
   const AlbumCard({
     super.key,
-    required this.album,
+    required this.id,
     required this.pinned,
   });
 
-  final String album;
+  final String id;
   final bool pinned;
 
   @override
   Widget build(BuildContext context) {
     final playerModel = di<PlayerModel>();
-    final albumAudios = di<LocalAudioModel>().findAlbum(album);
+    final albumAudios = di<LocalAudioModel>().findAlbum(id);
     const fallback = CoverBackground();
 
-    final id = albumAudios?.firstWhereOrNull((e) => e.albumId != null)?.albumId;
     final path = albumAudios?.firstWhereOrNull((e) => e.path != null)?.path;
 
     return Stack(
       alignment: Alignment.center,
       children: [
         AudioCard(
-          bottom: AudioCardBottom(text: album),
-          image: id != null && path != null
+          bottom: AudioCardBottom(text: id.albumOfId),
+          image: path != null
               ? LocalCover(
                   dimension: audioCardDimension,
                   albumId: id,
@@ -101,13 +106,13 @@ class AlbumCard extends StatelessWidget {
                 )
               : const CoverBackground(),
           background: fallback,
-          onTap: id == null || albumAudios == null
+          onTap: albumAudios == null
               ? null
               : () => di<LibraryModel>().push(
-                    builder: (context) => AlbumPage(id: id, album: albumAudios),
+                    builder: (context) => AlbumPage(id: id),
                     pageId: id,
                   ),
-          onPlay: albumAudios == null || albumAudios.isEmpty || id == null
+          onPlay: albumAudios == null || albumAudios.isEmpty
               ? null
               : () => playerModel.startPlaylist(
                     audios: albumAudios,
@@ -121,9 +126,13 @@ class AlbumCard extends StatelessWidget {
                 kAudioCardBottomHeight + (AppConfig.isMobilePlatform ? 25 : 13),
             child: AudioCardVignette(
               iconData: Iconz.pinFilled,
-              onTap: id == null
-                  ? null
-                  : () => di<LibraryModel>().removePinnedAlbum(id),
+              onTap: () => di<LibraryModel>().removeFavoriteAlbum(
+                id,
+                onFail: () => showSnackBar(
+                  context: context,
+                  content: Text(context.l10n.cantUnpinEmptyAlbum),
+                ),
+              ),
             ),
           ),
       ],
diff --git a/lib/local_audio/view/artist_page.dart b/lib/local_audio/view/artist_page.dart
index 619754a2c..99c3d34df 100644
--- a/lib/local_audio/view/artist_page.dart
+++ b/lib/local_audio/view/artist_page.dart
@@ -28,21 +28,35 @@ import 'album_view.dart';
 import 'artist_round_image_container.dart';
 import 'genre_page.dart';
 
-class ArtistPage extends StatelessWidget with WatchItMixin {
+class ArtistPage extends StatefulWidget with WatchItStatefulWidgetMixin {
   const ArtistPage({
     super.key,
-    required this.artistAudios,
+    required this.pageId,
   });
 
-  final List<Audio>? artistAudios;
+  final String pageId;
+
+  @override
+  State<ArtistPage> createState() => _ArtistPageState();
+}
+
+class _ArtistPageState extends State<ArtistPage> {
+  late List<Audio> artistAudios;
+
+  @override
+  void initState() {
+    super.initState();
+    artistAudios =
+        di<LocalAudioModel>().findTitlesOfArtist(widget.pageId) ?? [];
+  }
 
   @override
   Widget build(BuildContext context) {
     final model = di<LocalAudioModel>();
-    final pageId = artistAudios?.firstOrNull?.artist;
-    final albums = model.findAllAlbums(newAudios: artistAudios, clean: false);
 
-    if (pageId == null || albums == null) {
+    final albumIDs = model.findAllAlbumIDs(artist: widget.pageId, clean: false);
+
+    if (albumIDs == null) {
       return const SizedBox.shrink();
     }
 
@@ -56,10 +70,7 @@ class ArtistPage extends StatelessWidget with WatchItMixin {
       if (id == null) return;
 
       di<LibraryModel>().push(
-        builder: (_) => AlbumPage(
-          id: id,
-          album: audios,
-        ),
+        builder: (_) => AlbumPage(id: id),
         pageId: id,
       );
     }
@@ -100,13 +111,13 @@ class ArtistPage extends StatelessWidget with WatchItMixin {
                 sliver: SliverToBoxAdapter(
                   child: AudioPageHeader(
                     imageRadius: BorderRadius.circular(10000),
-                    title: artistAudios?.firstOrNull?.artist ?? '',
+                    title: widget.pageId,
                     image: ArtistRoundImageContainer(
-                      artistAudios: artistAudios,
+                      artist: widget.pageId,
                       height: kMaxAudioPageHeaderHeight,
                       width: kMaxAudioPageHeaderHeight,
                     ),
-                    subTitle: artistAudios?.firstOrNull?.genre,
+                    subTitle: artistAudios.firstOrNull?.genre,
                     label: context.l10n.artist,
                     onLabelTab: onAlbumTap,
                     onSubTitleTab: onSubTitleTab,
@@ -115,8 +126,8 @@ class ArtistPage extends StatelessWidget with WatchItMixin {
               ),
               SliverAudioPageControlPanel(
                 controlPanel: _ArtistPageControlPanel(
-                  pageId: pageId,
-                  audios: artistAudios!,
+                  pageId: widget.pageId,
+                  audios: artistAudios,
                 ),
               ),
               if (useGridView)
@@ -127,7 +138,7 @@ class ArtistPage extends StatelessWidget with WatchItMixin {
                     bottom: bottomPlayerPageGap,
                   ),
                   sliver: AlbumsView(
-                    albums: albums,
+                    albumIDs: albumIDs,
                   ),
                 )
               else
@@ -138,8 +149,8 @@ class ArtistPage extends StatelessWidget with WatchItMixin {
                     bottom: bottomPlayerPageGap,
                   ),
                   sliver: SliverAudioTileList(
-                    audios: artistAudios!,
-                    pageId: pageId,
+                    audios: artistAudios,
+                    pageId: widget.pageId,
                     audioPageType: AudioPageType.artist,
                     onSubTitleTab: onAlbumTap,
                   ),
@@ -191,9 +202,9 @@ class _ArtistPageControlPanel extends StatelessWidget with WatchItMixin {
             playlistId: pageId,
             allowRemove: false,
             selected: false,
-            searchTerm: audios.first.artist ?? '',
-            title: Text(audios.first.artist ?? ''),
-            subTitle: Text(audios.first.genre ?? ''),
+            searchTerm: audios.firstOrNull?.artist ?? '',
+            title: Text(audios.firstOrNull?.artist ?? ''),
+            subTitle: Text(audios.firstOrNull?.genre ?? ''),
           ),
         ],
       ),
diff --git a/lib/local_audio/view/artist_round_image_container.dart b/lib/local_audio/view/artist_round_image_container.dart
index 098a07d13..ee4628111 100644
--- a/lib/local_audio/view/artist_round_image_container.dart
+++ b/lib/local_audio/view/artist_round_image_container.dart
@@ -6,24 +6,39 @@ import 'local_cover.dart';
 import 'package:flutter/material.dart';
 import 'package:watch_it/watch_it.dart';
 
-class ArtistRoundImageContainer extends StatelessWidget {
+class ArtistRoundImageContainer extends StatefulWidget {
   const ArtistRoundImageContainer({
     super.key,
-    required this.artistAudios,
+    required this.artist,
     this.height,
     this.width,
   });
 
-  final List<Audio>? artistAudios;
+  final String artist;
   final double? height, width;
 
+  @override
+  State<ArtistRoundImageContainer> createState() =>
+      _ArtistRoundImageContainerState();
+}
+
+class _ArtistRoundImageContainerState extends State<ArtistRoundImageContainer> {
+  late List<Audio> artistAudios;
+
+  @override
+  void initState() {
+    super.initState();
+    artistAudios =
+        di<LocalAudioModel>().findTitlesOfArtist(widget.artist) ?? [];
+  }
+
   @override
   Widget build(BuildContext context) {
     return RoundImageContainer(
-      images: artistAudios == null
+      images: artistAudios.isEmpty
           ? []
           : di<LocalAudioModel>()
-              .findUniqueAlbumAudios(artistAudios!)
+              .findUniqueAlbumAudios(artistAudios)
               .where(
                 (e) => e.albumId != null && e.path != null,
               )
@@ -33,12 +48,12 @@ class ArtistRoundImageContainer extends StatelessWidget {
                   path: e.path!,
                   fallback: const CoverBackground(),
                   fit: BoxFit.cover,
-                  height: height,
-                  width: width,
+                  height: widget.height,
+                  width: widget.width,
                 ),
               )
               .toList(),
-      fallBackText: artistAudios?.firstOrNull?.artist ?? 'a',
+      fallBackText: widget.artist,
     );
   }
 }
diff --git a/lib/local_audio/view/artists_view.dart b/lib/local_audio/view/artists_view.dart
index a7cbb082e..9757beaa0 100644
--- a/lib/local_audio/view/artists_view.dart
+++ b/lib/local_audio/view/artists_view.dart
@@ -5,12 +5,9 @@ import 'package:yaru/yaru.dart';
 import '../../common/view/no_search_result_page.dart';
 import '../../common/view/round_image_container.dart';
 import '../../common/view/sliver_fill_remaining_progress.dart';
-import '../../common/view/snackbars.dart';
 import '../../common/view/theme.dart';
 import '../../common/view/ui_constants.dart';
-import '../../l10n/l10n.dart';
 import '../../library/library_model.dart';
-import '../local_audio_model.dart';
 import 'artist_page.dart';
 import 'artist_round_image_container.dart';
 
@@ -37,33 +34,21 @@ class ArtistsView extends StatelessWidget {
         message: noResultMessage,
       );
     }
-    final model = di<LocalAudioModel>();
 
     return SliverGrid.builder(
       itemCount: artists!.length,
       gridDelegate: kDiskGridDelegate,
       itemBuilder: (context, index) {
         final artistName = artists!.elementAt(index);
-        final artistAudios = model.findTitlesOfArtist(artistName);
 
         final text = artists!.elementAt(index);
 
         return YaruSelectableContainer(
           selected: false,
-          onTap: () {
-            final artist = artistAudios?.firstOrNull?.artist;
-            if (artist == null) {
-              showSnackBar(
-                context: context,
-                content: Text(context.l10n.unknown),
-              );
-            } else {
-              di<LibraryModel>().push(
-                builder: (_) => ArtistPage(artistAudios: artistAudios),
-                pageId: artist,
-              );
-            }
-          },
+          onTap: () => di<LibraryModel>().push(
+            builder: (_) => ArtistPage(pageId: artistName),
+            pageId: artistName,
+          ),
           borderRadius: BorderRadius.circular(300),
           child: Stack(
             alignment: Alignment.center,
@@ -72,7 +57,7 @@ class ArtistsView extends StatelessWidget {
                 width: double.infinity,
                 height: double.infinity,
                 child: ArtistRoundImageContainer(
-                  artistAudios: artistAudios,
+                  artist: artistName,
                   height: audioCardDimension,
                   width: audioCardDimension,
                 ),
@@ -109,33 +94,20 @@ class AlbumArtistsView extends StatelessWidget {
         message: noResultMessage,
       );
     }
-    final model = di<LocalAudioModel>();
 
     return SliverGrid.builder(
       itemCount: albumArtists!.length,
       gridDelegate: kDiskGridDelegate,
       itemBuilder: (context, index) {
-        final albumArtistNames = albumArtists!.elementAt(index);
-        final albumArtistsAudios =
-            model.findTitlesOfAlbumArtists(albumArtistNames);
-
-        final text = albumArtists!.elementAt(index);
+        final artist = albumArtists!.elementAt(index);
 
         return YaruSelectableContainer(
           selected: false,
           onTap: () {
-            final artist = albumArtistsAudios?.firstOrNull?.artist;
-            if (artist == null) {
-              showSnackBar(
-                context: context,
-                content: Text(context.l10n.unknown),
-              );
-            } else {
-              di<LibraryModel>().push(
-                builder: (_) => ArtistPage(artistAudios: albumArtistsAudios),
-                pageId: artist,
-              );
-            }
+            di<LibraryModel>().push(
+              builder: (_) => ArtistPage(pageId: artist),
+              pageId: artist,
+            );
           },
           borderRadius: BorderRadius.circular(300),
           child: Stack(
@@ -145,12 +117,12 @@ class AlbumArtistsView extends StatelessWidget {
                 width: double.infinity,
                 height: double.infinity,
                 child: ArtistRoundImageContainer(
-                  artistAudios: albumArtistsAudios,
+                  artist: artist,
                   height: audioCardDimension,
                   width: audioCardDimension,
                 ),
               ),
-              ArtistVignette(text: text),
+              ArtistVignette(text: artist),
             ],
           ),
         );
diff --git a/lib/local_audio/view/genre_page.dart b/lib/local_audio/view/genre_page.dart
index 52e231c80..e07b6e0d2 100644
--- a/lib/local_audio/view/genre_page.dart
+++ b/lib/local_audio/view/genre_page.dart
@@ -30,17 +30,12 @@ class _GenrePageState extends State<GenrePage> {
   @override
   void initState() {
     super.initState();
-    final model = di<LocalAudioModel>();
-    model.init().then(
-      (_) {
-        if (context.mounted) {
-          setState(
-            () =>
-                artistAudiosWithGenre = model.findArtistsOfGenre(widget.genre),
-          );
-        }
-      },
-    );
+    if (context.mounted) {
+      setState(
+        () => artistAudiosWithGenre =
+            di<LocalAudioModel>().findArtistsOfGenre(widget.genre),
+      );
+    }
   }
 
   @override
diff --git a/lib/local_audio/view/local_audio_body.dart b/lib/local_audio/view/local_audio_body.dart
index ac7466163..5d9558515 100644
--- a/lib/local_audio/view/local_audio_body.dart
+++ b/lib/local_audio/view/local_audio_body.dart
@@ -14,19 +14,18 @@ class LocalAudioBody extends StatelessWidget {
     required this.localAudioView,
     required this.titles,
     required this.artists,
-    required this.albums,
+    required this.albumIDs,
     required this.genres,
     required this.playlists,
     this.noResultMessage,
     this.noResultIcon,
-    required this.albumArtists,
   });
 
   final LocalAudioView localAudioView;
   final List<Audio>? titles;
   final List<String>? artists;
-  final List<String>? albumArtists;
-  final List<String>? albums;
+
+  final List<String>? albumIDs;
   final List<String>? genres;
   final List<String>? playlists;
   final Widget? noResultMessage, noResultIcon;
@@ -43,13 +42,8 @@ class LocalAudioBody extends StatelessWidget {
             noResultMessage: noResultMessage,
             noResultIcon: noResultIcon,
           ),
-        // LocalAudioView.albumArtists => AlbumArtistsView(
-        //     albumArtists: albumArtists,
-        //     noResultMessage: noResultMessage,
-        //     noResultIcon: noResultIcon,
-        //   ),
         LocalAudioView.albums => AlbumsView(
-            albums: albums,
+            albumIDs: albumIDs,
             noResultMessage: noResultMessage,
             noResultIcon: noResultIcon,
           ),
diff --git a/lib/local_audio/view/local_audio_page.dart b/lib/local_audio/view/local_audio_page.dart
index cbcd8ee2e..37efd7a7b 100644
--- a/lib/local_audio/view/local_audio_page.dart
+++ b/lib/local_audio/view/local_audio_page.dart
@@ -35,16 +35,14 @@ class _LocalAudioPageState extends State<LocalAudioPage> {
   @override
   void initState() {
     super.initState();
-    di<LocalAudioModel>().init().then((_) {
-      final failedImports = di<LocalAudioModel>().failedImports;
-      if (mounted && failedImports?.isNotEmpty == true) {
-        showFailedImportsSnackBar(
-          failedImports: failedImports!,
-          context: context,
-          message: context.l10n.failedToReadMetadata,
-        );
-      }
-    });
+    final failedImports = di<LocalAudioModel>().failedImports;
+    if (mounted && failedImports?.isNotEmpty == true) {
+      showFailedImportsSnackBar(
+        failedImports: failedImports!,
+        context: context,
+        message: context.l10n.failedToReadMetadata,
+      );
+    }
   }
 
   @override
@@ -52,13 +50,10 @@ class _LocalAudioPageState extends State<LocalAudioPage> {
     final l10n = context.l10n;
     final audios = watchPropertyValue((LocalAudioModel m) => m.audios);
     final allArtists = watchPropertyValue((LocalAudioModel m) => m.allArtists);
-    final allAlbumArtists =
-        watchPropertyValue((LocalAudioModel m) => m.allAlbumArtists);
-
-    final allAlbums = watchPropertyValue((LocalAudioModel m) => m.allAlbums);
+    final allAlbumIDs =
+        watchPropertyValue((LocalAudioModel m) => m.allAlbumIDs);
     final allGenres = watchPropertyValue((LocalAudioModel m) => m.allGenres);
-    final playlists =
-        watchPropertyValue((LibraryModel m) => m.playlists.keys.toList());
+    final playlists = watchPropertyValue((LibraryModel m) => m.playlistIDs);
     final index = watchPropertyValue((LocalAudioModel m) => m.localAudioindex);
     final localAudioView = LocalAudioView.values[index];
 
@@ -72,8 +67,9 @@ class _LocalAudioPageState extends State<LocalAudioPage> {
             builder: (context) => ConfirmationDialog(
               title: Text(l10n.localAudioWatchDialogTitle),
               content: Text(l10n.localAudioWatchDialogDescription),
-              onConfirm: () async =>
-                  di<LocalAudioModel>().init(forceInit: true),
+              onConfirm: () async {
+                await di<LocalAudioModel>().init(forceInit: true);
+              },
             ),
           );
         }
@@ -136,9 +132,8 @@ class _LocalAudioPageState extends State<LocalAudioPage> {
                     : LocalAudioBody(
                         localAudioView: localAudioView,
                         titles: audios,
-                        albums: allAlbums,
+                        albumIDs: allAlbumIDs,
                         artists: allArtists,
-                        albumArtists: allAlbumArtists,
                         genres: allGenres,
                         playlists: playlists,
                       ),
diff --git a/lib/local_audio/view/titles_view.dart b/lib/local_audio/view/titles_view.dart
index 98a2c9349..3c6301c60 100644
--- a/lib/local_audio/view/titles_view.dart
+++ b/lib/local_audio/view/titles_view.dart
@@ -25,7 +25,6 @@ class TitlesView extends StatelessWidget with WatchItMixin {
 
   @override
   Widget build(BuildContext context) {
-    final model = di<LocalAudioModel>();
     final importing = watchPropertyValue((LocalAudioModel m) => m.importing);
 
     if (audios == null || importing) {
@@ -43,16 +42,10 @@ class TitlesView extends StatelessWidget with WatchItMixin {
       audios: audios!,
       audioPageType: AudioPageType.allTitlesView,
       pageId: PageIDs.localAudio,
-      onSubTitleTab: (text) {
-        final artistAudios = model.findTitlesOfArtist(text);
-        final artist = artistAudios?.firstOrNull?.artist;
-        if (artist == null) return;
-
-        di<LibraryModel>().push(
-          builder: (_) => ArtistPage(artistAudios: artistAudios),
-          pageId: artist,
-        );
-      },
+      onSubTitleTab: (artist) => di<LibraryModel>().push(
+        builder: (_) => ArtistPage(pageId: artist),
+        pageId: artist,
+      ),
     );
   }
 }
diff --git a/lib/persistence_utils.dart b/lib/persistence_utils.dart
index 0343717f6..d68085293 100644
--- a/lib/persistence_utils.dart
+++ b/lib/persistence_utils.dart
@@ -1,6 +1,5 @@
 import 'dart:convert';
 import 'dart:io';
-import 'dart:typed_data';
 
 import 'package:path/path.dart' as p;
 import 'package:path_provider/path_provider.dart';
@@ -325,33 +324,3 @@ Future<void> writeStringMap(Map<String, String> map, String fileName) async {
 
   await file.writeAsString(jsonStr);
 }
-
-Future<void> writeUint8ListMap(
-  Map<String, Uint8List?> map,
-  String fileName,
-) async {
-  final dynamicMap = map.map(
-    (key, value) => MapEntry<String, dynamic>(key, base64Encode(value!)),
-  );
-
-  await writeJsonToFile(dynamicMap, fileName);
-}
-
-Future<Map<String, Uint8List?>?> readUint8ListMap(String fileName) async {
-  final workingDir = await getWorkingDir();
-  Map<String, Uint8List?>? theMap = {};
-
-  final file = File(p.join(workingDir, fileName));
-  if (file.existsSync()) {
-    final jsonStr = await file.readAsString();
-    final decode = jsonDecode(jsonStr) as Map<String, dynamic>;
-    for (final e in decode.entries) {
-      final value = base64Decode(e.value);
-      if (value.isNotEmpty == true) {
-        theMap.putIfAbsent(e.key, () => value);
-      }
-    }
-  }
-
-  return theMap;
-}
diff --git a/lib/player/player_service.dart b/lib/player/player_service.dart
index d6e74bf54..9fddde991 100644
--- a/lib/player/player_service.dart
+++ b/lib/player/player_service.dart
@@ -424,6 +424,7 @@ class PlayerService {
     required String listName,
     int? index,
   }) async {
+    if (audios.isEmpty) return;
     if (listName == _queue.name &&
         index != null &&
         audios.elementAtOrNull(index) != null) {
@@ -662,7 +663,8 @@ class PlayerService {
       return Uri.tryParse(
         audio?.imageUrl ?? audio!.albumArtUrl!,
       );
-    } else if (audio?.hasPathAndId == true && File(audio!.path!).existsSync()) {
+    } else if (audio?.canHaveLocalCover == true &&
+        File(audio!.path!).existsSync()) {
       final maybeData = _localCoverService.get(audio.albumId);
       if (maybeData != null) {
         File newFile = await _safeTempCover(maybeData);
diff --git a/lib/player/view/bottom_player_image.dart b/lib/player/view/bottom_player_image.dart
index 6c60d557d..bf118837b 100644
--- a/lib/player/view/bottom_player_image.dart
+++ b/lib/player/view/bottom_player_image.dart
@@ -57,7 +57,7 @@ class BottomPlayerImage extends StatelessWidget with WatchItMixin {
       width: size,
     );
 
-    if (audio?.hasPathAndId == true) {
+    if (audio?.canHaveLocalCover == true) {
       child = LocalCover(
         key: ValueKey(audio!.path),
         albumId: audio!.albumId!,
diff --git a/lib/player/view/full_height_player_image.dart b/lib/player/view/full_height_player_image.dart
index 54c8fd4f6..18c40c60e 100644
--- a/lib/player/view/full_height_player_image.dart
+++ b/lib/player/view/full_height_player_image.dart
@@ -44,7 +44,7 @@ class FullHeightPlayerImage extends StatelessWidget with WatchItMixin {
     );
 
     Widget image;
-    if (audio?.hasPathAndId == true) {
+    if (audio?.canHaveLocalCover == true) {
       image = LocalCover(
         key: ValueKey(audio!.path),
         albumId: audio.albumId!,
diff --git a/lib/player/view/player_title_and_artist.dart b/lib/player/view/player_title_and_artist.dart
index f5b0a0d4b..01e1f516e 100644
--- a/lib/player/view/player_title_and_artist.dart
+++ b/lib/player/view/player_title_and_artist.dart
@@ -230,24 +230,11 @@ class PlayerTitleAndArtist extends StatelessWidget with WatchItMixin {
     required LibraryModel libraryModel,
     required LocalAudioModel localAudioModel,
   }) {
-    if (audio.album == null) return;
-    localAudioModel.init().then(
-      (value) {
-        final albumAudios = localAudioModel.findAlbum(audio.album!);
-        if (albumAudios?.firstOrNull == null) return;
-        final id = albumAudios!.first.albumId;
-        if (id == null) return;
-
-        appModel.setFullWindowMode(false);
-
-        libraryModel.push(
-          builder: (_) => AlbumPage(
-            id: id,
-            album: albumAudios,
-          ),
-          pageId: id,
-        );
-      },
+    if (audio.albumId == null) return;
+    appModel.setFullWindowMode(false);
+    libraryModel.push(
+      builder: (_) => AlbumPage(id: audio.albumId!),
+      pageId: audio.albumId!,
     );
   }
 
@@ -299,7 +286,7 @@ class PlayerTitleAndArtist extends StatelessWidget with WatchItMixin {
       return;
     }
     libraryModel.push(
-      builder: (_) => StationPage(station: audio),
+      builder: (_) => StationPage(uuid: audio.uuid!),
       pageId: audio.uuid!,
     );
   }
@@ -310,20 +297,12 @@ class PlayerTitleAndArtist extends StatelessWidget with WatchItMixin {
     required AppModel appModel,
     required LibraryModel libraryModel,
   }) {
-    final artistName = audio.artist;
-    if (artistName == null) return;
-
-    localAudioModel.init().then(
-      (value) {
-        final artistAudios = localAudioModel.findTitlesOfArtist(artistName);
-        final artist = artistAudios?.firstOrNull?.artist;
-        if (artist == null) return;
-        appModel.setFullWindowMode(false);
-        libraryModel.push(
-          builder: (_) => ArtistPage(artistAudios: artistAudios),
-          pageId: artist,
-        );
-      },
+    final artistId = audio.artist;
+    if (artistId == null) return;
+    appModel.setFullWindowMode(false);
+    libraryModel.push(
+      builder: (_) => ArtistPage(pageId: artistId),
+      pageId: artistId,
     );
   }
 }
diff --git a/lib/playlists/view/add_to_playlist_navigator.dart b/lib/playlists/view/add_to_playlist_navigator.dart
index a0d1f7004..39fb0e4b8 100644
--- a/lib/playlists/view/add_to_playlist_navigator.dart
+++ b/lib/playlists/view/add_to_playlist_navigator.dart
@@ -47,9 +47,7 @@ class _PlaylistTilesList extends StatelessWidget with WatchItMixin {
 
   @override
   Widget build(BuildContext context) {
-    final playlistNames = watchPropertyValue(
-      (LibraryModel m) => m.playlists.keys.map((e) => e.toString()),
-    );
+    final playlistNames = watchPropertyValue((LibraryModel m) => m.playlistIDs);
 
     final children = [
       ListTile(
@@ -118,7 +116,7 @@ class _PlaylistTile extends StatelessWidget {
           libraryModel.addLikedAudios(audios);
         } else {
           libraryModel.addAudiosToPlaylist(
-            playlist: playlistId,
+            id: playlistId,
             audios: audios,
           );
         }
diff --git a/lib/playlists/view/liked_audio_page.dart b/lib/playlists/view/liked_audio_page.dart
index 1405ae052..05c16c899 100644
--- a/lib/playlists/view/liked_audio_page.dart
+++ b/lib/playlists/view/liked_audio_page.dart
@@ -2,6 +2,7 @@ import 'package:animated_emoji/animated_emoji.dart';
 import 'package:flutter/material.dart';
 import 'package:watch_it/watch_it.dart';
 
+import '../../common/data/audio.dart';
 import '../../common/page_ids.dart';
 import '../../common/view/audio_page_type.dart';
 import '../../common/view/fall_back_header_image.dart';
@@ -12,37 +13,48 @@ import '../../extensions/build_context_x.dart';
 import '../../extensions/theme_data_x.dart';
 import '../../l10n/l10n.dart';
 import '../../library/library_model.dart';
-import '../../local_audio/local_audio_model.dart';
 import '../../local_audio/view/artist_page.dart';
 
-class LikedAudioPage extends StatelessWidget with WatchItMixin {
+class LikedAudioPage extends StatefulWidget with WatchItStatefulWidgetMixin {
   const LikedAudioPage({super.key});
 
+  @override
+  State<LikedAudioPage> createState() => _LikedAudioPageState();
+}
+
+class _LikedAudioPageState extends State<LikedAudioPage> {
+  late List<Audio> _likedAudios;
+
+  @override
+  void initState() {
+    super.initState();
+    getLikedAudios();
+  }
+
+  void getLikedAudios() => _likedAudios = di<LibraryModel>().likedAudios;
+
   @override
   Widget build(BuildContext context) {
-    final model = di<LocalAudioModel>();
-    final likedAudios = watchPropertyValue((LibraryModel m) => m.likedAudios);
-    watchPropertyValue((LibraryModel m) => m.likedAudios.length);
+    final likedAudiosLength = watchPropertyValue((LibraryModel m) {
+      setState(() => getLikedAudios());
+      return m.likedAudiosLength;
+    });
 
     return SliverAudioPage(
       onPageLabelTab: (text) {
-        final artistAudios = model.findTitlesOfArtist(text);
-        final artist = artistAudios?.firstOrNull?.artist;
-        if (artist == null) return;
-
         di<LibraryModel>().push(
-          builder: (_) => ArtistPage(artistAudios: artistAudios),
-          pageId: artist,
+          builder: (_) => ArtistPage(pageId: text),
+          pageId: text,
         );
       },
       noSearchResultMessage: Text(context.l10n.likedSongsSubtitle),
       noSearchResultIcons: const AnimatedEmoji(AnimatedEmojis.twoHearts),
-      audios: likedAudios,
+      audios: _likedAudios,
       audioPageType: AudioPageType.likedAudio,
       pageId: PageIDs.likedAudios,
       pageTitle: context.l10n.likedSongs,
       pageLabel: context.l10n.playlist,
-      pageSubTitle: '${likedAudios.length} ${context.l10n.titles}',
+      pageSubTitle: '$likedAudiosLength ${context.l10n.titles}',
       description: Text(
         context.l10n.likedSongsSubtitle,
         style: context.theme.pageHeaderDescription,
diff --git a/lib/playlists/view/playlist_control_panel.dart b/lib/playlists/view/playlist_control_panel.dart
new file mode 100644
index 000000000..cd3f27625
--- /dev/null
+++ b/lib/playlists/view/playlist_control_panel.dart
@@ -0,0 +1,71 @@
+import 'package:flutter/material.dart';
+import 'package:watch_it/watch_it.dart';
+
+import '../../common/data/audio.dart';
+import '../../common/view/avatar_play_button.dart';
+import '../../common/view/icons.dart';
+import '../../common/view/theme.dart';
+import '../../l10n/l10n.dart';
+import '../../library/library_model.dart';
+import '../../local_audio/local_audio_model.dart';
+import 'edit_playlist_dialog.dart';
+import 'playlst_add_audios_dialog.dart';
+
+class PlaylistControlPanel extends StatelessWidget with WatchItMixin {
+  const PlaylistControlPanel({
+    super.key,
+    required this.pageId,
+    required this.audios,
+  });
+
+  final String pageId;
+  final List<Audio> audios;
+
+  @override
+  Widget build(BuildContext context) {
+    final l10n = context.l10n;
+    final allowReorder =
+        watchPropertyValue((LocalAudioModel m) => m.allowReorder);
+    final libraryModel = di<LibraryModel>();
+    return Row(
+      mainAxisAlignment: MainAxisAlignment.center,
+      children: space(
+        children: [
+          IconButton(
+            tooltip: l10n.editPlaylist,
+            icon: Icon(Iconz.pen),
+            onPressed: () => showDialog(
+              context: context,
+              builder: (context) => EditPlaylistDialog(
+                audios: audios,
+                playlistName: pageId,
+                initialValue: pageId,
+              ),
+            ),
+          ),
+          IconButton(
+            tooltip: l10n.clearPlaylist,
+            icon: Icon(Iconz.clearAll),
+            onPressed: () => libraryModel.clearPlaylist(pageId),
+          ),
+          AvatarPlayButton(audios: audios, pageId: pageId),
+          IconButton(
+            tooltip: l10n.add,
+            icon: Icon(Iconz.plus),
+            onPressed: () => showDialog(
+              context: context,
+              builder: (context) => PlaylistAddAudiosDialog(playlistId: pageId),
+            ),
+          ),
+          IconButton(
+            tooltip: l10n.move,
+            isSelected: allowReorder,
+            onPressed: () =>
+                di<LocalAudioModel>().setAllowReorder(!allowReorder),
+            icon: Icon(Iconz.move),
+          ),
+        ],
+      ),
+    );
+  }
+}
diff --git a/lib/playlists/view/playlist_genre_bar.dart b/lib/playlists/view/playlist_genre_bar.dart
new file mode 100644
index 000000000..c645255c3
--- /dev/null
+++ b/lib/playlists/view/playlist_genre_bar.dart
@@ -0,0 +1,60 @@
+import 'package:collection/collection.dart';
+import 'package:flutter/material.dart';
+import 'package:watch_it/watch_it.dart';
+
+import '../../common/data/audio.dart';
+import '../../common/view/tapable_text.dart';
+import '../../extensions/build_context_x.dart';
+import '../../extensions/theme_data_x.dart';
+import '../../library/library_model.dart';
+import '../../local_audio/view/genre_page.dart';
+
+class PlaylistGenreBar extends StatelessWidget {
+  const PlaylistGenreBar({
+    super.key,
+    required this.audios,
+  });
+
+  final List<Audio> audios;
+
+  @override
+  Widget build(BuildContext context) {
+    final style = context.theme.pageHeaderDescription;
+    Set<String> genres = {};
+    for (var e in audios) {
+      final g = e.genre?.trim();
+      if (g?.isNotEmpty == true) {
+        genres.add(g!);
+      }
+    }
+
+    return SingleChildScrollView(
+      child: Wrap(
+        alignment: WrapAlignment.center,
+        runAlignment: WrapAlignment.center,
+        crossAxisAlignment: WrapCrossAlignment.center,
+        children: genres
+            .mapIndexed(
+              (i, e) => Row(
+                mainAxisSize: MainAxisSize.min,
+                children: [
+                  TapAbleText(
+                    style: style,
+                    wrapInFlexible: false,
+                    text: e,
+                    onTap: () {
+                      di<LibraryModel>().push(
+                        builder: (context) => GenrePage(genre: e),
+                        pageId: e,
+                      );
+                    },
+                  ),
+                  if (i != genres.length - 1) const Text(' · '),
+                ],
+              ),
+            )
+            .toList(),
+      ),
+    );
+  }
+}
diff --git a/lib/playlists/view/playlist_header_image.dart b/lib/playlists/view/playlist_header_image.dart
new file mode 100644
index 000000000..1714a21e8
--- /dev/null
+++ b/lib/playlists/view/playlist_header_image.dart
@@ -0,0 +1,78 @@
+import 'package:flutter/material.dart';
+import 'package:watch_it/watch_it.dart';
+import '../../common/data/audio.dart';
+import '../../common/view/fall_back_header_image.dart';
+import '../../common/view/icons.dart';
+import '../../common/view/theme.dart';
+import '../../common/view/ui_constants.dart';
+import '../../library/library_model.dart';
+import '../../local_audio/local_audio_model.dart';
+
+class PlaylistHeaderImage extends StatelessWidget with WatchItMixin {
+  const PlaylistHeaderImage({
+    super.key,
+    required this.playlist,
+    required this.pageId,
+  });
+
+  final String pageId;
+  final List<Audio> playlist;
+
+  @override
+  Widget build(BuildContext context) {
+    final model = di<LocalAudioModel>();
+    watchPropertyValue((LibraryModel m) => m.getPlaylistById(pageId)?.hashCode);
+    final playlistImages = model.findLocalCovers(audios: playlist, limit: 16);
+    final length = playlistImages == null ? 0 : playlistImages.take(16).length;
+
+    final padding = length == 1 ? 0.0 : 8.0;
+    final spacing = length == 1 ? 0.0 : 16.0;
+    final width = length == 1
+        ? kMaxAudioPageHeaderHeight
+        : length < 10
+            ? 50.0
+            : 32.0;
+    final height = length == 1
+        ? kMaxAudioPageHeaderHeight
+        : length < 10
+            ? 50.0
+            : 32.0;
+    final radius = length == 1 ? 0.0 : width / 2;
+
+    Widget image;
+    if (length == 0) {
+      image = Icon(
+        Iconz.playlist,
+        size: 65,
+      );
+    } else {
+      image = Center(
+        child: Padding(
+          padding: EdgeInsets.all(padding),
+          child: Wrap(
+            spacing: spacing,
+            runSpacing: spacing,
+            children: List.generate(
+              length,
+              (index) => ClipRRect(
+                borderRadius: BorderRadius.circular(radius),
+                child: Image.memory(
+                  playlistImages!.elementAt(index),
+                  width: width,
+                  height: height,
+                  fit: BoxFit.cover,
+                  filterQuality: FilterQuality.medium,
+                ),
+              ),
+            ),
+          ),
+        ),
+      );
+    }
+
+    return FallBackHeaderImage(
+      color: getAlphabetColor(pageId),
+      child: image,
+    );
+  }
+}
diff --git a/lib/playlists/view/playlist_page.dart b/lib/playlists/view/playlist_page.dart
index bcd8aeeb2..75d429daf 100644
--- a/lib/playlists/view/playlist_page.dart
+++ b/lib/playlists/view/playlist_page.dart
@@ -13,33 +13,26 @@ import '../../common/view/adaptive_container.dart';
 import '../../common/view/audio_page_header.dart';
 import '../../common/view/audio_page_type.dart';
 import '../../common/view/audio_tile.dart';
-import '../../common/view/avatar_play_button.dart';
-import '../../common/view/fall_back_header_image.dart';
 import '../../common/view/header_bar.dart';
-import '../../common/view/icons.dart';
 import '../../common/view/search_button.dart';
 import '../../common/view/sliver_audio_page_control_panel.dart';
 import '../../common/view/sliver_audio_tile_list.dart';
-import '../../common/view/tapable_text.dart';
 import '../../common/view/theme.dart';
 import '../../common/view/ui_constants.dart';
-import '../../extensions/build_context_x.dart';
-import '../../extensions/theme_data_x.dart';
 import '../../l10n/l10n.dart';
 import '../../library/library_model.dart';
 import '../../local_audio/local_audio_model.dart';
 import '../../local_audio/view/album_page.dart';
 import '../../local_audio/view/artist_page.dart';
 import '../../local_audio/view/failed_import_snackbar.dart';
-import '../../local_audio/view/genre_page.dart';
 import '../../player/player_model.dart';
 import '../../search/search_model.dart';
 import '../../search/search_type.dart';
-import '../../settings/settings_model.dart';
-import 'edit_playlist_dialog.dart';
-import 'playlst_add_audios_dialog.dart';
+import 'playlist_control_panel.dart';
+import 'playlist_genre_bar.dart';
+import 'playlist_header_image.dart';
 
-class PlaylistPage extends StatelessWidget with WatchItMixin {
+class PlaylistPage extends StatefulWidget with WatchItStatefulWidgetMixin {
   const PlaylistPage({
     super.key,
     required this.pageId,
@@ -47,16 +40,54 @@ class PlaylistPage extends StatelessWidget with WatchItMixin {
 
   final String pageId;
 
+  @override
+  State<PlaylistPage> createState() => _PlaylistPageState();
+}
+
+class _PlaylistPageState extends State<PlaylistPage> {
+  late List<Audio> playlist;
+
+  static Map<String, List<Audio>> cache = {};
+
+  @override
+  void initState() {
+    super.initState();
+    getPlaylist();
+  }
+
+  void getPlaylist() {
+    if (cache[widget.pageId]?.isNotEmpty == true) {
+      playlist = cache[widget.pageId]!;
+      return;
+    }
+
+    final playlistById =
+        di<LibraryModel>().getPlaylistById(widget.pageId) ?? [];
+
+    cache[widget.pageId] = playlistById;
+    playlist = playlistById;
+  }
+
   @override
   Widget build(BuildContext context) {
     final l10n = context.l10n;
 
     final model = di<LocalAudioModel>();
     final libraryModel = di<LibraryModel>();
-    final playlist = libraryModel.getPlaylistById(pageId);
+
     // This is needed to be notified about both size changes and also reordering
-    watchPropertyValue((LibraryModel m) => m.playlists[pageId]?.length);
-    watchPropertyValue((LibraryModel m) => m.playlists[pageId]?.hashCode);
+    watchPropertyValue(
+      (LibraryModel m) {
+        setState(() => getPlaylist());
+        return m.getPlaylistById(widget.pageId)?.length;
+      },
+    );
+    watchPropertyValue(
+      (LibraryModel m) {
+        setState(() => getPlaylist());
+        return m.getPlaylistById(widget.pageId)?.hashCode;
+      },
+    );
 
     return DropRegion(
       formats: Formats.standardFormats,
@@ -65,7 +96,8 @@ class PlaylistPage extends StatelessWidget with WatchItMixin {
         Future.delayed(
           const Duration(milliseconds: 300),
         ).then(
-          (_) => libraryModel.updatePlaylist(pageId, playlist ?? []),
+          (_) =>
+              libraryModel.updatePlaylist(id: widget.pageId, audios: playlist),
         );
       },
       onPerformDrop: (e) async {
@@ -76,7 +108,7 @@ class PlaylistPage extends StatelessWidget with WatchItMixin {
               if (value == null) return;
               try {
                 final file = File.fromUri(value);
-                playlist?.add(
+                playlist.add(
                   Audio.local(
                     file,
                     getImage: true,
@@ -139,100 +171,23 @@ class PlaylistPage extends StatelessWidget with WatchItMixin {
             if (id == null) return;
             di<LibraryModel>().push(
               builder: (_) {
-                return AlbumPage(
-                  id: id,
-                  album: albumAudios,
-                );
+                return AlbumPage(id: id);
               },
               pageId: id,
             );
           },
-          onArtistTap: (text) {
-            final artistAudios = model.findTitlesOfArtist(text);
-            final artist = artistAudios?.firstOrNull?.artist;
-            if (artist == null) return;
-
-            di<LibraryModel>().push(
-              builder: (_) => ArtistPage(artistAudios: artistAudios),
-              pageId: artist,
-            );
-          },
-          image: _PlaylistHeaderImage(
-            playlist: playlist ?? [],
-            pageId: pageId,
+          onArtistTap: (text) => di<LibraryModel>().push(
+            builder: (_) => ArtistPage(pageId: text),
+            pageId: text,
           ),
-          audios: playlist ?? [],
-          pageId: pageId,
-        ),
-      ),
-    );
-  }
-}
-
-class _PlaylistHeaderImage extends StatelessWidget with WatchItMixin {
-  const _PlaylistHeaderImage({
-    required this.playlist,
-    required this.pageId,
-  });
-
-  final String pageId;
-  final List<Audio> playlist;
-
-  @override
-  Widget build(BuildContext context) {
-    final model = di<LocalAudioModel>();
-    watchPropertyValue((LibraryModel m) => m.playlists[pageId]?.hashCode);
-    final playlistImages = model.findLocalCovers(audios: playlist, limit: 16);
-    final length = playlistImages == null ? 0 : playlistImages.take(16).length;
-
-    final padding = length == 1 ? 0.0 : 8.0;
-    final spacing = length == 1 ? 0.0 : 16.0;
-    final width = length == 1
-        ? kMaxAudioPageHeaderHeight
-        : length < 10
-            ? 50.0
-            : 32.0;
-    final height = length == 1
-        ? kMaxAudioPageHeaderHeight
-        : length < 10
-            ? 50.0
-            : 32.0;
-    final radius = length == 1 ? 0.0 : width / 2;
-
-    Widget image;
-    if (length == 0) {
-      image = Icon(
-        Iconz.playlist,
-        size: 65,
-      );
-    } else {
-      image = Center(
-        child: Padding(
-          padding: EdgeInsets.all(padding),
-          child: Wrap(
-            spacing: spacing,
-            runSpacing: spacing,
-            children: List.generate(
-              length,
-              (index) => ClipRRect(
-                borderRadius: BorderRadius.circular(radius),
-                child: Image.memory(
-                  playlistImages!.elementAt(index),
-                  width: width,
-                  height: height,
-                  fit: BoxFit.cover,
-                  filterQuality: FilterQuality.medium,
-                ),
-              ),
-            ),
+          image: PlaylistHeaderImage(
+            playlist: playlist,
+            pageId: widget.pageId,
           ),
+          audios: playlist,
+          pageId: widget.pageId,
         ),
-      );
-    }
-
-    return FallBackHeaderImage(
-      color: getAlphabetColor(pageId),
-      child: image,
+      ),
     );
   }
 }
@@ -262,16 +217,16 @@ class _PlaylistPageBody extends StatelessWidget with WatchItMixin {
     final libraryModel = di<LibraryModel>();
     final playerModel = di<PlayerModel>();
     final currentAudio = watchPropertyValue((PlayerModel m) => m.audio);
-    watchPropertyValue((SettingsModel m) => m.externalPlaylists.length);
+    watchPropertyValue((LibraryModel m) => m.externalPlaylists.length);
 
     final audioPageHeader = AudioPageHeader(
       title: pageId,
       subTitle: '${audios.length} ${l10n.titles}',
       image: image,
-      label: di<SettingsModel>().externalPlaylists.contains(pageId)
+      label: di<LibraryModel>().externalPlaylists.contains(pageId)
           ? '${l10n.playlist} (${l10n.external})'
           : l10n.playlist,
-      description: _PlaylistGenreBar(audios: audios),
+      description: PlaylistGenreBar(audios: audios),
     );
 
     return LayoutBuilder(
@@ -289,7 +244,7 @@ class _PlaylistPageBody extends StatelessWidget with WatchItMixin {
             ),
             SliverAudioPageControlPanel(
               controlPanel:
-                  _PlaylistControlPanel(pageId: pageId, audios: audios),
+                  PlaylistControlPanel(pageId: pageId, audios: audios),
             ),
             if (allowReorder)
               SliverPadding(
@@ -340,7 +295,10 @@ class _PlaylistPageBody extends StatelessWidget with WatchItMixin {
               )
             else
               SliverPadding(
-                padding: getAdaptiveHorizontalPadding(constraints: constraints),
+                padding: getAdaptiveHorizontalPadding(
+                  constraints: constraints,
+                  min: 40,
+                ),
                 sliver: SliverAudioTileList(
                   audios: audios,
                   pageId: pageId,
@@ -354,110 +312,3 @@ class _PlaylistPageBody extends StatelessWidget with WatchItMixin {
     );
   }
 }
-
-class _PlaylistControlPanel extends StatelessWidget with WatchItMixin {
-  const _PlaylistControlPanel({
-    required this.pageId,
-    required this.audios,
-  });
-
-  final String pageId;
-  final List<Audio> audios;
-
-  @override
-  Widget build(BuildContext context) {
-    final l10n = context.l10n;
-    final allowReorder =
-        watchPropertyValue((LocalAudioModel m) => m.allowReorder);
-    final libraryModel = di<LibraryModel>();
-    return Row(
-      mainAxisAlignment: MainAxisAlignment.center,
-      children: space(
-        children: [
-          IconButton(
-            tooltip: l10n.editPlaylist,
-            icon: Icon(Iconz.pen),
-            onPressed: () => showDialog(
-              context: context,
-              builder: (context) => EditPlaylistDialog(
-                audios: audios,
-                playlistName: pageId,
-                initialValue: pageId,
-              ),
-            ),
-          ),
-          IconButton(
-            tooltip: l10n.clearPlaylist,
-            icon: Icon(Iconz.clearAll),
-            onPressed: () => libraryModel.clearPlaylist(pageId),
-          ),
-          AvatarPlayButton(audios: audios, pageId: pageId),
-          IconButton(
-            tooltip: l10n.add,
-            icon: Icon(Iconz.plus),
-            onPressed: () => showDialog(
-              context: context,
-              builder: (context) => PlaylistAddAudiosDialog(playlistId: pageId),
-            ),
-          ),
-          IconButton(
-            tooltip: l10n.move,
-            isSelected: allowReorder,
-            onPressed: () =>
-                di<LocalAudioModel>().setAllowReorder(!allowReorder),
-            icon: Icon(Iconz.move),
-          ),
-        ],
-      ),
-    );
-  }
-}
-
-class _PlaylistGenreBar extends StatelessWidget {
-  const _PlaylistGenreBar({
-    required this.audios,
-  });
-
-  final List<Audio> audios;
-
-  @override
-  Widget build(BuildContext context) {
-    final style = context.theme.pageHeaderDescription;
-    Set<String> genres = {};
-    for (var e in audios) {
-      final g = e.genre?.trim();
-      if (g?.isNotEmpty == true) {
-        genres.add(g!);
-      }
-    }
-
-    return SingleChildScrollView(
-      child: Wrap(
-        alignment: WrapAlignment.center,
-        runAlignment: WrapAlignment.center,
-        crossAxisAlignment: WrapCrossAlignment.center,
-        children: genres
-            .mapIndexed(
-              (i, e) => Row(
-                mainAxisSize: MainAxisSize.min,
-                children: [
-                  TapAbleText(
-                    style: style,
-                    wrapInFlexible: false,
-                    text: e,
-                    onTap: () {
-                      di<LibraryModel>().push(
-                        builder: (context) => GenrePage(genre: e),
-                        pageId: e,
-                      );
-                    },
-                  ),
-                  if (i != genres.length - 1) const Text(' · '),
-                ],
-              ),
-            )
-            .toList(),
-      ),
-    );
-  }
-}
diff --git a/lib/playlists/view/playlst_add_audios_dialog.dart b/lib/playlists/view/playlst_add_audios_dialog.dart
index 31da9203a..ef06d60a4 100644
--- a/lib/playlists/view/playlst_add_audios_dialog.dart
+++ b/lib/playlists/view/playlst_add_audios_dialog.dart
@@ -7,8 +7,7 @@ import '../../common/view/ui_constants.dart';
 import '../../library/library_model.dart';
 import '../../local_audio/local_audio_model.dart';
 
-class PlaylistAddAudiosDialog extends StatefulWidget
-    with WatchItStatefulWidgetMixin {
+class PlaylistAddAudiosDialog extends StatelessWidget with WatchItMixin {
   const PlaylistAddAudiosDialog({
     super.key,
     required this.playlistId,
@@ -16,18 +15,6 @@ class PlaylistAddAudiosDialog extends StatefulWidget
 
   final String playlistId;
 
-  @override
-  State<PlaylistAddAudiosDialog> createState() =>
-      _PlaylistAddAudiosDialogState();
-}
-
-class _PlaylistAddAudiosDialogState extends State<PlaylistAddAudiosDialog> {
-  @override
-  void initState() {
-    super.initState();
-    di<LocalAudioModel>().init();
-  }
-
   @override
   Widget build(BuildContext context) {
     final audios = watchPropertyValue((LocalAudioModel m) => m.audios);
@@ -53,7 +40,7 @@ class _PlaylistAddAudiosDialogState extends State<PlaylistAddAudiosDialog> {
                     onSelected: (value) {
                       if (value == null) return;
                       libraryModel.addAudiosToPlaylist(
-                        playlist: widget.playlistId,
+                        id: playlistId,
                         audios: [value],
                       );
                     },
diff --git a/lib/podcasts/view/lazy_podcast_page.dart b/lib/podcasts/view/lazy_podcast_page.dart
index 0bd3654fb..1d5bc126f 100644
--- a/lib/podcasts/view/lazy_podcast_page.dart
+++ b/lib/podcasts/view/lazy_podcast_page.dart
@@ -34,7 +34,7 @@ class _LazyPodcastPageState extends State<LazyPodcastPage> {
     super.initState();
     final url = widget.feedUrl ?? widget.podcastItem?.feedUrl;
     final libraryModel = di<LibraryModel>();
-    _episodes = libraryModel.isPageInLibrary(url)
+    _episodes = libraryModel.isPodcastSubscribed(url)
         ? Future.value(libraryModel.getPodcast(url))
         : di<PodcastModel>()
             .findEpisodes(item: widget.podcastItem, feedUrl: url);
diff --git a/lib/podcasts/view/podcast_page.dart b/lib/podcasts/view/podcast_page.dart
index 4d4fd7578..887cd93fe 100644
--- a/lib/podcasts/view/podcast_page.dart
+++ b/lib/podcasts/view/podcast_page.dart
@@ -47,10 +47,10 @@ class _PodcastPageState extends State<PodcastPage> {
   void initState() {
     super.initState();
     final libraryModel = di<LibraryModel>();
-    if (!libraryModel.isPageInLibrary(widget.feedUrl)) return;
+    if (!libraryModel.isPodcastSubscribed(widget.feedUrl)) return;
 
     final episodes =
-        widget.preFetchedEpisodes ?? libraryModel.podcasts[widget.feedUrl];
+        widget.preFetchedEpisodes ?? libraryModel.getPodcast(widget.feedUrl);
 
     if (episodes == null || episodes.isEmpty) return;
 
@@ -71,7 +71,7 @@ class _PodcastPageState extends State<PodcastPage> {
   @override
   Widget build(BuildContext context) {
     final episodes = widget.preFetchedEpisodes ??
-        watchPropertyValue((LibraryModel m) => m.podcasts[widget.feedUrl]);
+        watchPropertyValue((LibraryModel m) => m.getPodcast(widget.feedUrl));
     watchPropertyValue((PlayerModel m) => m.lastPositions?.length);
     watchPropertyValue((LibraryModel m) => m.downloadsLength);
     final showSearch =
diff --git a/lib/podcasts/view/podcast_page_side_bar_icon.dart b/lib/podcasts/view/podcast_page_side_bar_icon.dart
index e2a16e087..bffac8e99 100644
--- a/lib/podcasts/view/podcast_page_side_bar_icon.dart
+++ b/lib/podcasts/view/podcast_page_side_bar_icon.dart
@@ -1,14 +1,34 @@
 import 'package:flutter/material.dart';
+import 'package:watch_it/watch_it.dart';
 
 import '../../common/view/icons.dart';
 import '../../common/view/safe_network_image.dart';
 import '../../common/view/side_bar_fall_back_image.dart';
 import '../../common/view/theme.dart';
+import '../../library/library_model.dart';
 
-class PodcastPageSideBarIcon extends StatelessWidget {
-  const PodcastPageSideBarIcon({super.key, this.imageUrl});
+class PodcastPageSideBarIcon extends StatefulWidget {
+  const PodcastPageSideBarIcon({
+    super.key,
+    required this.feedUrl,
+  });
 
-  final String? imageUrl;
+  final String feedUrl;
+
+  @override
+  State<PodcastPageSideBarIcon> createState() => _PodcastPageSideBarIconState();
+}
+
+class _PodcastPageSideBarIconState extends State<PodcastPageSideBarIcon> {
+  late final String? imageUrl;
+
+  @override
+  void initState() {
+    super.initState();
+    final podcast = di<LibraryModel>().getPodcast(widget.feedUrl);
+    imageUrl =
+        podcast?.firstOrNull?.albumArtUrl ?? podcast?.firstOrNull?.imageUrl;
+  }
 
   @override
   Widget build(BuildContext context) {
diff --git a/lib/podcasts/view/podcast_page_title.dart b/lib/podcasts/view/podcast_page_title.dart
index c8a15d242..8cb975d7e 100644
--- a/lib/podcasts/view/podcast_page_title.dart
+++ b/lib/podcasts/view/podcast_page_title.dart
@@ -1,24 +1,40 @@
 import 'package:html/parser.dart';
 
 import '../../extensions/build_context_x.dart';
+import '../../l10n/l10n.dart';
 import '../../library/library_model.dart';
 import 'package:flutter/material.dart';
 import 'package:watch_it/watch_it.dart';
 
-class PodcastPageTitle extends StatelessWidget with WatchItMixin {
+class PodcastPageTitle extends StatefulWidget with WatchItStatefulWidgetMixin {
   const PodcastPageTitle({
     super.key,
     required this.feedUrl,
-    required this.title,
   });
 
   final String feedUrl;
-  final String title;
+
+  @override
+  State<PodcastPageTitle> createState() => _PodcastPageTitleState();
+}
+
+class _PodcastPageTitleState extends State<PodcastPageTitle> {
+  late String title;
+
+  @override
+  void initState() {
+    super.initState();
+    final podcast = di<LibraryModel>().getPodcast(widget.feedUrl);
+    title = podcast?.firstOrNull?.album ??
+        podcast?.firstOrNull?.title ??
+        podcast?.firstOrNull.toString() ??
+        context.l10n.podcasts;
+  }
 
   @override
   Widget build(BuildContext context) {
     watchPropertyValue((LibraryModel m) => m.podcastUpdatesLength);
-    final visible = di<LibraryModel>().podcastUpdateAvailable(feedUrl);
+    final visible = di<LibraryModel>().podcastUpdateAvailable(widget.feedUrl);
     return Badge(
       backgroundColor: context.theme.colorScheme.primary,
       isLabelVisible: visible,
@@ -30,3 +46,26 @@ class PodcastPageTitle extends StatelessWidget with WatchItMixin {
     );
   }
 }
+
+class PodcastPageSubTitle extends StatefulWidget {
+  const PodcastPageSubTitle({super.key, required this.feedUrl});
+
+  final String feedUrl;
+
+  @override
+  State<PodcastPageSubTitle> createState() => _PodcastPageSubTitleState();
+}
+
+class _PodcastPageSubTitleState extends State<PodcastPageSubTitle> {
+  late String subtitle;
+
+  @override
+  void initState() {
+    super.initState();
+    final podcast = di<LibraryModel>().getPodcast(widget.feedUrl);
+    subtitle = podcast?.firstOrNull?.artist ?? context.l10n.podcast;
+  }
+
+  @override
+  Widget build(BuildContext context) => Text(subtitle);
+}
diff --git a/lib/podcasts/view/podcasts_collection_body.dart b/lib/podcasts/view/podcasts_collection_body.dart
index b33ad8db0..a590b581c 100644
--- a/lib/podcasts/view/podcasts_collection_body.dart
+++ b/lib/podcasts/view/podcasts_collection_body.dart
@@ -40,7 +40,7 @@ class PodcastsCollectionBody extends StatelessWidget with WatchItMixin {
         watchPropertyValue((PodcastModel m) => m.checkingForUpdates);
     final processing =
         watchPropertyValue((CustomContentModel m) => m.processing);
-    final subs = watchPropertyValue((LibraryModel m) => m.podcasts);
+    final subs = watchPropertyValue((LibraryModel m) => m.podcastFeedUrls);
     final libraryModel = di<LibraryModel>();
     final updatesLength =
         watchPropertyValue((LibraryModel m) => m.podcastUpdatesLength);
@@ -130,64 +130,61 @@ class PodcastsCollectionBody extends StatelessWidget with WatchItMixin {
                     itemCount: itemCount,
                     gridDelegate: audioCardGridDelegate,
                     itemBuilder: (context, index) {
-                      final MapEntry<String, List<Audio>>? podcast;
+                      final List<Audio>? episodes;
+                      final String? feedUrl;
                       if (updatesOnly) {
-                        podcast = subs.entries
+                        feedUrl = subs
                             .where(
-                              (e) => libraryModel.podcastUpdateAvailable(e.key),
+                              (e) => libraryModel.podcastUpdateAvailable(e),
                             )
                             .elementAtOrNull(index);
                       } else if (downloadsOnly) {
-                        podcast = subs.entries
-                            .where((e) => libraryModel.feedHasDownload(e.key))
+                        feedUrl = subs
+                            .where((e) => libraryModel.feedHasDownload(e))
                             .elementAtOrNull(index);
                       } else {
-                        podcast = subs.entries.elementAt(index);
+                        feedUrl = subs.elementAtOrNull(index);
                       }
 
-                      if (podcast == null) {
+                      episodes = libraryModel.getPodcast(feedUrl);
+
+                      if (feedUrl == null || episodes == null) {
                         return const SizedBox.shrink();
                       }
-
-                      final artworkUrl600 =
-                          podcast.value.firstOrNull?.albumArtUrl ??
-                              podcast.value.firstOrNull?.imageUrl;
-                      final image = SafeNetworkImage(
-                        url: artworkUrl600,
-                        fit: BoxFit.cover,
-                        height: audioCardDimension,
-                        width: audioCardDimension,
-                      );
+                      final first = episodes.firstOrNull;
 
                       return AudioCard(
-                        image: image,
+                        image: SafeNetworkImage(
+                          url: first?.albumArtUrl ?? first?.imageUrl,
+                          fit: BoxFit.cover,
+                          height: audioCardDimension,
+                          width: audioCardDimension,
+                        ),
                         bottom: AudioCardBottom(
-                          style:
-                              libraryModel.podcastUpdateAvailable(podcast.key)
-                                  ? theme.textTheme.bodyMedium?.copyWith(
-                                        color: theme.colorScheme.primary,
-                                        fontWeight: FontWeight.bold,
-                                      ) ??
-                                      TextStyle(
-                                        color: theme.colorScheme.primary,
-                                        fontWeight: FontWeight.bold,
-                                      )
-                                  : null,
-                          text: podcast.value.firstOrNull?.album ??
-                              podcast.value.firstOrNull?.title ??
-                              podcast.value.firstOrNull.toString(),
+                          style: libraryModel.podcastUpdateAvailable(feedUrl)
+                              ? theme.textTheme.bodyMedium?.copyWith(
+                                    color: theme.colorScheme.primary,
+                                    fontWeight: FontWeight.bold,
+                                  ) ??
+                                  TextStyle(
+                                    color: theme.colorScheme.primary,
+                                    fontWeight: FontWeight.bold,
+                                  )
+                              : null,
+                          text:
+                              first?.album ?? first?.title ?? first.toString(),
                         ),
                         onPlay: () => di<PlayerModel>()
                             .startPlaylist(
-                              audios: podcast!.value,
-                              listName: podcast.key,
+                              audios: episodes!,
+                              listName: feedUrl!,
                             )
                             .then(
                               (_) => libraryModel.removePodcastUpdate(
-                                podcast!.key,
+                                feedUrl!,
                               ),
                             ),
-                        onTap: () => libraryModel.push(pageId: podcast!.key),
+                        onTap: () => libraryModel.push(pageId: feedUrl!),
                       );
                     },
                   ),
diff --git a/lib/radio/radio_model.dart b/lib/radio/radio_model.dart
index 72782cc91..80ac276ab 100644
--- a/lib/radio/radio_model.dart
+++ b/lib/radio/radio_model.dart
@@ -39,6 +39,16 @@ class RadioModel extends SafeChangeNotifier {
     await _propertiesChangedSub?.cancel();
     super.dispose();
   }
+
+  Future<Audio?> getStationByUUID(String pageId) async {
+    var stationByUUID = await _radioService.getStationByUUID(pageId);
+
+    if (stationByUUID == null) {
+      return null;
+    }
+
+    return Audio.fromStation(stationByUUID);
+  }
 }
 
 enum RadioCollectionView {
diff --git a/lib/radio/radio_service.dart b/lib/radio/radio_service.dart
index 45e97852a..6e3f6bc45 100644
--- a/lib/radio/radio_service.dart
+++ b/lib/radio/radio_service.dart
@@ -87,6 +87,34 @@ class RadioService {
     return null;
   }
 
+  final Map<String, Station> _cache = {};
+  Future<Station?> getStationByUUID(String uuid) async {
+    if (_cache.containsKey(uuid)) {
+      return _cache[uuid];
+    }
+
+    if (_radioBrowserApi == null) {
+      await init();
+      if (connectedHost == null) {
+        return null;
+      }
+    }
+
+    try {
+      final response = await _radioBrowserApi!.getStationsByUUID(uuids: [uuid]);
+      if (response.items.isEmpty) {
+        return null;
+      }
+      final station = response.items.first;
+      _cache[uuid] = station;
+      return station;
+    } on Exception catch (e) {
+      printMessageInDebugMode(e);
+    }
+
+    return null;
+  }
+
   RadioBrowserListResponse<Station>? _response;
   String? _uuid;
   String? _country;
diff --git a/lib/radio/view/radio_history_tile.dart b/lib/radio/view/radio_history_tile.dart
index 4bbf60819..51a45a477 100644
--- a/lib/radio/view/radio_history_tile.dart
+++ b/lib/radio/view/radio_history_tile.dart
@@ -99,7 +99,7 @@ class RadioHistoryTile extends StatelessWidget {
                       if (v?.firstOrNull?.stationUUID != null) {
                         di<LibraryModel>().push(
                           builder: (_) => StationPage(
-                            station: Audio.fromStation(v.first),
+                            uuid: Audio.fromStation(v.first).uuid!,
                           ),
                           pageId: v!.first.stationUUID,
                         );
diff --git a/lib/radio/view/radio_lib_page.dart b/lib/radio/view/radio_lib_page.dart
index ac4d49be3..48f92e9a9 100644
--- a/lib/radio/view/radio_lib_page.dart
+++ b/lib/radio/view/radio_lib_page.dart
@@ -23,7 +23,6 @@ import '../../custom_content/custom_content_model.dart';
 import '../../extensions/build_context_x.dart';
 import '../../l10n/l10n.dart';
 import '../../library/library_model.dart';
-import '../../player/player_model.dart';
 import '../../search/search_model.dart';
 import '../radio_model.dart';
 import 'open_radio_discover_page_button.dart';
@@ -161,7 +160,6 @@ class StationGrid extends StatelessWidget with WatchItMixin {
     final stations = watchPropertyValue((LibraryModel m) => m.starredStations);
     final length =
         watchPropertyValue((LibraryModel m) => m.starredStationsLength);
-    final playerModel = di<PlayerModel>();
 
     if (length == 0) {
       return NoSearchResultPage(
@@ -185,11 +183,8 @@ class StationGrid extends StatelessWidget with WatchItMixin {
           gridDelegate: audioCardGridDelegate,
           itemCount: length,
           itemBuilder: (context, index) {
-            final station = stations.entries.elementAt(index).value.firstOrNull;
-            return StationCard(
-              station: station,
-              startPlaylist: playerModel.startPlaylist,
-            );
+            final uuid = stations.elementAt(index);
+            return StationCard(uuid: uuid);
           },
         );
       },
diff --git a/lib/radio/view/radio_page_star_button.dart b/lib/radio/view/radio_page_star_button.dart
index b44792d93..315392a24 100644
--- a/lib/radio/view/radio_page_star_button.dart
+++ b/lib/radio/view/radio_page_star_button.dart
@@ -15,7 +15,7 @@ class RadioPageStarButton extends StatelessWidget with WatchItMixin {
   Widget build(BuildContext context) {
     final libraryModel = di<LibraryModel>();
     final isStarred = watchPropertyValue(
-      (LibraryModel m) => m.starredStations.containsKey(station.description),
+      (LibraryModel m) => m.isStarredStation(station.uuid),
     );
 
     return IconButton(
@@ -23,12 +23,11 @@ class RadioPageStarButton extends StatelessWidget with WatchItMixin {
       tooltip: isStarred
           ? context.l10n.removeFromCollection
           : context.l10n.addToCollection,
-      onPressed: station.description == null
+      onPressed: station.uuid == null
           ? null
           : isStarred
-              ? () => libraryModel.unStarStation(station.description!)
-              : () => libraryModel
-                  .addStarredStation(station.description!, [station]),
+              ? () => libraryModel.unStarStation(station.uuid!)
+              : () => libraryModel.addStarredStation(station.uuid!),
       icon: AnimatedStar(isStarred: isStarred),
     );
   }
diff --git a/lib/radio/view/radio_page_tag_bar.dart b/lib/radio/view/radio_page_tag_bar.dart
index f20deb8cb..c736f6435 100644
--- a/lib/radio/view/radio_page_tag_bar.dart
+++ b/lib/radio/view/radio_page_tag_bar.dart
@@ -16,9 +16,10 @@ import '../../search/search_model.dart';
 import '../../search/search_type.dart';
 
 class RadioPageTagBar extends StatelessWidget {
-  const RadioPageTagBar({super.key, required this.station});
+  const RadioPageTagBar({super.key, required this.station, this.onTap});
 
   final Audio station;
+  final Function(String value)? onTap;
 
   @override
   Widget build(BuildContext context) {
@@ -31,7 +32,12 @@ class RadioPageTagBar extends StatelessWidget {
         alignment: WrapAlignment.center,
         runAlignment: WrapAlignment.center,
         crossAxisAlignment: WrapCrossAlignment.center,
-        children: tapAbleTags(context: context, tags: tags, style: style),
+        children: tapAbleTags(
+          context: context,
+          tags: tags,
+          style: style,
+          onTap: onTap,
+        ),
       ),
     );
 
@@ -62,6 +68,7 @@ class RadioPageTagBar extends StatelessWidget {
     required List<String> tags,
     required TextStyle? style,
     int? limit,
+    Function(String value)? onTap,
   }) {
     return tags
         .take(limit ?? tags.length)
@@ -73,6 +80,7 @@ class RadioPageTagBar extends StatelessWidget {
                 style: style,
                 wrapInFlexible: false,
                 onTap: () {
+                  onTap?.call(e);
                   di<LibraryModel>().push(pageId: PageIDs.searchPage);
                   di<SearchModel>()
                     ..setTag(Tag(name: e, stationCount: 1))
diff --git a/lib/radio/view/station_card.dart b/lib/radio/view/station_card.dart
index 4a3d965a2..e95cea61a 100644
--- a/lib/radio/view/station_card.dart
+++ b/lib/radio/view/station_card.dart
@@ -4,58 +4,84 @@ import 'package:watch_it/watch_it.dart';
 import '../../common/data/audio.dart';
 import '../../common/view/audio_card.dart';
 import '../../common/view/audio_card_bottom.dart';
+import '../../common/view/audio_fall_back_icon.dart';
+import '../../common/view/no_search_result_page.dart';
+import '../../common/view/progress.dart';
 import '../../common/view/safe_network_image.dart';
 import '../../common/view/theme.dart';
 import '../../library/library_model.dart';
-import '../../common/view/audio_fall_back_icon.dart';
+import '../../player/player_model.dart';
+import '../radio_model.dart';
 import 'station_page.dart';
 
-class StationCard extends StatelessWidget {
-  const StationCard({
-    super.key,
-    required this.station,
-    required this.startPlaylist,
-  });
+class StationCard extends StatefulWidget {
+  const StationCard({super.key, required this.uuid});
 
-  final Audio? station;
-  final Future<void> Function({
-    required List<Audio> audios,
-    required String listName,
-    int? index,
-  }) startPlaylist;
+  final String uuid;
+
+  @override
+  State<StationCard> createState() => _StationCardState();
+}
+
+class _StationCardState extends State<StationCard> {
+  late Future<Audio?> _station;
+
+  @override
+  void initState() {
+    super.initState();
+    _station = di<RadioModel>().getStationByUUID(widget.uuid);
+  }
 
   @override
   Widget build(BuildContext context) {
-    return AudioCard(
-      bottom: AudioCardBottom(text: station?.title?.replaceAll('_', '') ?? ''),
-      onPlay: station?.uuid == null
-          ? null
-          : () => startPlaylist(
-                audios: [station!],
-                listName: station!.uuid!,
+    return FutureBuilder(
+      future: _station,
+      builder: (context, snapshot) {
+        if (snapshot.hasError) {
+          return const NoSearchResultPage();
+        }
+
+        if (snapshot.connectionState != ConnectionState.done) {
+          return const Center(
+            child: Progress(),
+          );
+        }
+
+        final station = snapshot.data!;
+
+        return AudioCard(
+          bottom:
+              AudioCardBottom(text: station.title?.replaceAll('_', '') ?? ''),
+          onPlay: station.uuid == null
+              ? null
+              : () => di<PlayerModel>().startPlaylist(
+                    audios: [station],
+                    listName: widget.uuid,
+                  ).then((_) => di<RadioModel>().clickStation(station)),
+          onTap: station.uuid == null
+              ? null
+              : () => di<LibraryModel>().push(
+                    builder: (_) => StationPage(uuid: widget.uuid),
+                    pageId: widget.uuid,
+                  ),
+          image: SizedBox.expand(
+            child: SafeNetworkImage(
+              fallBackIcon: AudioFallBackIcon(
+                audio: station,
+                iconSize: 70,
               ),
-      onTap: station?.uuid == null
-          ? null
-          : () => di<LibraryModel>().push(
-                builder: (_) => StationPage(station: station!),
-                pageId: station!.uuid!,
+              errorIcon: AudioFallBackIcon(
+                audio: station,
+                iconSize: 70,
               ),
-      image: SizedBox.expand(
-        child: SafeNetworkImage(
-          fallBackIcon: AudioFallBackIcon(
-            audio: station,
-            iconSize: 70,
-          ),
-          errorIcon: AudioFallBackIcon(
-            audio: station,
-            iconSize: 70,
+              url: station.imageUrl,
+              fit: BoxFit.scaleDown,
+              height: audioCardDimension,
+              width: audioCardDimension,
+            ),
           ),
-          url: station?.imageUrl,
-          fit: BoxFit.scaleDown,
-          height: audioCardDimension,
-          width: audioCardDimension,
-        ),
-      ),
+        );
+      },
     );
   }
 }
diff --git a/lib/radio/view/station_page.dart b/lib/radio/view/station_page.dart
index eee11abf8..9e40bd81e 100644
--- a/lib/radio/view/station_page.dart
+++ b/lib/radio/view/station_page.dart
@@ -10,7 +10,9 @@ import '../../common/view/audio_fall_back_icon.dart';
 import '../../common/view/audio_page_header.dart';
 import '../../common/view/avatar_play_button.dart';
 import '../../common/view/header_bar.dart';
+import '../../common/view/no_search_result_page.dart';
 import '../../common/view/offline_page.dart';
+import '../../common/view/progress.dart';
 import '../../common/view/safe_network_image.dart';
 import '../../common/view/search_button.dart';
 import '../../common/view/sliver_audio_page_control_panel.dart';
@@ -20,22 +22,41 @@ import '../../l10n/l10n.dart';
 import '../../library/library_model.dart';
 import '../../search/search_model.dart';
 import '../../search/search_type.dart';
+import '../radio_model.dart';
 import 'radio_history_list.dart';
 import 'radio_page_copy_histoy_button.dart';
 import 'radio_page_star_button.dart';
 import 'radio_page_tag_bar.dart';
 
-class StationPage extends StatelessWidget with WatchItMixin {
+class StationPage extends StatefulWidget with WatchItStatefulWidgetMixin {
   const StationPage({
     super.key,
-    required this.station,
+    required this.uuid,
   });
 
-  final Audio station;
+  final String uuid;
+
+  @override
+  State<StationPage> createState() => _StationPageState();
+}
+
+class _StationPageState extends State<StationPage> {
+  late Future<Audio?> _future;
+
+  @override
+  void initState() {
+    super.initState();
+    setFuture();
+  }
+
+  void setFuture() => _future = di<RadioModel>().getStationByUUID(widget.uuid);
 
   @override
   Widget build(BuildContext context) {
-    final isOnline = watchPropertyValue((ConnectivityModel m) => m.isOnline);
+    final isOnline = watchPropertyValue((ConnectivityModel m) {
+      setFuture();
+      return m.isOnline;
+    });
     if (!isOnline) return const OfflinePage();
 
     return Scaffold(
@@ -60,59 +81,83 @@ class StationPage extends StatelessWidget with WatchItMixin {
           ),
         ],
       ),
-      body: LayoutBuilder(
-        builder: (context, constraints) {
-          return CustomScrollView(
-            slivers: [
-              SliverPadding(
-                padding: getAdaptiveHorizontalPadding(
-                  constraints: constraints,
-                  min: 40,
-                ),
-                sliver: SliverToBoxAdapter(
-                  child: AudioPageHeader(
-                    title: station.title ?? station.description ?? '',
-                    subTitle: station.albumArtist == null
-                        ? null
-                        : station.albumArtist ?? '',
-                    label:
-                        '${context.l10n.station} · ${station.fileSize ?? ''} kbps',
-                    description: SizedBox(
-                      width: kAudioHeaderDescriptionWidth,
-                      child: RadioPageTagBar(
-                        station: station,
-                      ),
+      body: FutureBuilder(
+        future: _future,
+        builder: (context, snapshot) {
+          if (snapshot.hasError) {
+            return const NoSearchResultPage();
+          }
+
+          if (!snapshot.hasData) {
+            return const Center(
+              child: Progress(),
+            );
+          }
+
+          final station = snapshot.data!;
+
+          return LayoutBuilder(
+            builder: (context, constraints) {
+              return CustomScrollView(
+                slivers: [
+                  SliverPadding(
+                    padding: getAdaptiveHorizontalPadding(
+                      constraints: constraints,
+                      min: 40,
                     ),
-                    image: SafeNetworkImage(
-                      fallBackIcon: AudioFallBackIcon(
-                        iconSize: kMaxAudioPageHeaderHeight / 2,
-                        audio: station,
+                    sliver: SliverToBoxAdapter(
+                      child: AudioPageHeader(
+                        title: station.title ?? station.description ?? '',
+                        subTitle: station.albumArtist == null
+                            ? null
+                            : station.albumArtist ?? '',
+                        label:
+                            '${context.l10n.station} · ${station.fileSize ?? ''} kbps',
+                        description: SizedBox(
+                          width: kAudioHeaderDescriptionWidth,
+                          child: RadioPageTagBar(
+                            station: station,
+                          ),
+                        ),
+                        image: SafeNetworkImage(
+                          fallBackIcon: AudioFallBackIcon(
+                            iconSize: kMaxAudioPageHeaderHeight / 2,
+                            audio: station,
+                            color: getAlphabetColor(station.uuid ?? 'a'),
+                          ),
+                          errorIcon: AudioFallBackIcon(
+                            iconSize: kMaxAudioPageHeaderHeight / 2,
+                            audio: station,
+                            color: getAlphabetColor(station.uuid ?? 'a'),
+                          ),
+                          url: station.imageUrl,
+                          fit: BoxFit.cover,
+                        ),
                       ),
-                      url: station.imageUrl,
-                      fit: BoxFit.cover,
                     ),
                   ),
-                ),
-              ),
-              SliverAudioPageControlPanel(
-                controlPanel: _StationPageControlPanel(
-                  station: station,
-                ),
-              ),
-              SliverPadding(
-                padding: getAdaptiveHorizontalPadding(constraints: constraints)
-                    .copyWith(
-                  bottom: bottomPlayerPageGap,
-                ),
-                sliver: SliverRadioHistoryList(
-                  filter: station.title,
-                  emptyMessage: const SizedBox.shrink(),
-                  emptyIcon: const SizedBox.shrink(),
-                  padding: radioHistoryListPadding,
-                  allowNavigation: false,
-                ),
-              ),
-            ],
+                  SliverAudioPageControlPanel(
+                    controlPanel: _StationPageControlPanel(
+                      station: station,
+                    ),
+                  ),
+                  SliverPadding(
+                    padding:
+                        getAdaptiveHorizontalPadding(constraints: constraints)
+                            .copyWith(
+                      bottom: bottomPlayerPageGap,
+                    ),
+                    sliver: SliverRadioHistoryList(
+                      filter: station.title,
+                      emptyMessage: const SizedBox.shrink(),
+                      emptyIcon: const SizedBox.shrink(),
+                      padding: radioHistoryListPadding,
+                      allowNavigation: false,
+                    ),
+                  ),
+                ],
+              );
+            },
           );
         },
       ),
diff --git a/lib/radio/view/station_page_icon.dart b/lib/radio/view/station_page_icon.dart
index cea391673..85521a936 100644
--- a/lib/radio/view/station_page_icon.dart
+++ b/lib/radio/view/station_page_icon.dart
@@ -1,51 +1,92 @@
 import 'package:flutter/material.dart';
+import 'package:watch_it/watch_it.dart';
 
+import '../../app/connectivity_model.dart';
+import '../../common/data/audio.dart';
 import '../../common/view/icons.dart';
 import '../../common/view/safe_network_image.dart';
 import '../../common/view/side_bar_fall_back_image.dart';
 import '../../common/view/theme.dart';
 import '../../extensions/build_context_x.dart';
+import '../radio_model.dart';
 
-class StationPageIcon extends StatelessWidget {
+class StationPageIcon extends StatefulWidget with WatchItStatefulWidgetMixin {
   const StationPageIcon({
     super.key,
-    this.imageUrl,
+    required this.uuid,
     required this.selected,
-    required this.fallBackColor,
   });
 
-  final String? imageUrl;
+  final String uuid;
   final bool selected;
-  final Color fallBackColor;
+
+  @override
+  State<StationPageIcon> createState() => _StationPageIconState();
+}
+
+class _StationPageIconState extends State<StationPageIcon> {
+  late Future<Audio?> _future;
+  late Color fallBackColor;
+
+  @override
+  void initState() {
+    super.initState();
+    fallBackColor = getAlphabetColor(widget.uuid);
+    setFuture();
+  }
+
+  void setFuture() => _future = di<RadioModel>().getStationByUUID(widget.uuid);
 
   @override
   Widget build(BuildContext context) {
+    watchPropertyValue((ConnectivityModel m) {
+      setFuture();
+      return m.isOnline;
+    });
     return ClipRRect(
       borderRadius: BorderRadius.circular(6),
       child: Container(
         color: context.theme.cardColor,
         height: sideBarImageSize,
         width: sideBarImageSize,
-        child: SafeNetworkImage(
-          fallBackIcon: SideBarFallBackImage(
-            color: fallBackColor,
-            child: selected
-                ? Icon(Iconz.starFilled)
-                : Icon(
-                    Iconz.star,
-                  ),
-          ),
-          errorIcon: SideBarFallBackImage(
-            color: fallBackColor,
-            child: selected
-                ? Icon(Iconz.imageMissingFilled)
-                : Icon(
-                    Iconz.imageMissing,
-                  ),
-          ),
-          fit: BoxFit.fitHeight,
-          url: imageUrl,
-          filterQuality: FilterQuality.medium,
+        child: FutureBuilder(
+          future: _future,
+          builder: (context, snapshot) {
+            if (!snapshot.hasData || snapshot.hasError) {
+              return SideBarFallBackImage(
+                color: fallBackColor,
+                child: widget.selected
+                    ? Icon(Iconz.starFilled)
+                    : Icon(
+                        Iconz.star,
+                      ),
+              );
+            }
+
+            final station = snapshot.data!;
+
+            return SafeNetworkImage(
+              fallBackIcon: SideBarFallBackImage(
+                color: fallBackColor,
+                child: widget.selected
+                    ? Icon(Iconz.starFilled)
+                    : Icon(
+                        Iconz.star,
+                      ),
+              ),
+              errorIcon: SideBarFallBackImage(
+                color: fallBackColor,
+                child: widget.selected
+                    ? Icon(Iconz.starFilled)
+                    : Icon(
+                        Iconz.star,
+                      ),
+              ),
+              fit: BoxFit.fitHeight,
+              url: station.imageUrl,
+              filterQuality: FilterQuality.medium,
+            );
+          },
         ),
       ),
     );
diff --git a/lib/radio/view/station_title.dart b/lib/radio/view/station_title.dart
new file mode 100644
index 000000000..9903081a8
--- /dev/null
+++ b/lib/radio/view/station_title.dart
@@ -0,0 +1,55 @@
+import 'package:flutter/material.dart';
+import 'package:watch_it/watch_it.dart';
+
+import '../../app/connectivity_model.dart';
+import '../../common/data/audio.dart';
+import '../../l10n/l10n.dart';
+import '../radio_model.dart';
+
+class StationTitle extends StatefulWidget with WatchItStatefulWidgetMixin {
+  const StationTitle({
+    super.key,
+    required this.uuid,
+  });
+
+  final String uuid;
+
+  @override
+  State<StationTitle> createState() => _StationTitleState();
+}
+
+class _StationTitleState extends State<StationTitle> {
+  late Future<Audio?> _future;
+
+  @override
+  void initState() {
+    super.initState();
+    setFuture();
+  }
+
+  void setFuture() => _future = di<RadioModel>().getStationByUUID(widget.uuid);
+
+  @override
+  Widget build(BuildContext context) {
+    watchPropertyValue((ConnectivityModel m) {
+      setFuture();
+      return m.isOnline;
+    });
+    return FutureBuilder(
+      future: _future,
+      builder: (context, snapshot) {
+        if (!snapshot.hasData) {
+          return const Text('...');
+        }
+
+        if (snapshot.hasError) {
+          return Text(context.l10n.station);
+        }
+
+        final station = snapshot.data!;
+
+        return Text(station.title ?? context.l10n.station);
+      },
+    );
+  }
+}
diff --git a/lib/register.dart b/lib/register.dart
index 12af6b9c5..734d6f0f3 100644
--- a/lib/register.dart
+++ b/lib/register.dart
@@ -179,12 +179,18 @@ void registerDependencies({required List<String> args}) async {
       dependsOn: [SharedPreferences],
       dispose: (s) async => s.dispose(),
     )
-    ..registerSingletonWithDependencies<LocalAudioService>(
-      () => LocalAudioService(
-        settingsService: di<SettingsService>(),
-        localCoverService: di<LocalCoverService>(),
-      ),
-      dependsOn: [SettingsService],
+    ..registerSingletonAsync<LocalAudioService>(
+      () async {
+        final localAudioService = LocalAudioService(
+          settingsService: di<SettingsService>(),
+          localCoverService: di<LocalCoverService>(),
+          libraryService: di<LibraryService>(),
+        );
+        await localAudioService.init();
+
+        return localAudioService;
+      },
+      dependsOn: [SettingsService, LibraryService],
       dispose: (s) async => s.dispose(),
     )
     ..registerLazySingleton<NotificationsService>(
@@ -271,15 +277,14 @@ void registerDependencies({required List<String> args}) async {
         localAudioService: di<LocalAudioService>(),
       ),
       dispose: (s) => s.dispose(),
-      dependsOn: [LibraryService, LocalAudioService],
+      dependsOn: [LibraryService, LocalAudioService, LocalAudioService],
     )
     ..registerSingletonWithDependencies<LocalAudioModel>(
       () => LocalAudioModel(
         localAudioService: di<LocalAudioService>(),
-        libraryService: di<LibraryService>(),
         settingsService: di<SettingsService>(),
       ),
-      dependsOn: [SettingsService, LibraryService],
+      dependsOn: [SettingsService, LocalAudioService],
       dispose: (s) => s.dispose(),
     )
     ..registerLazySingleton<PodcastModel>(
@@ -305,25 +310,31 @@ void registerDependencies({required List<String> args}) async {
       dependsOn: [SettingsService, LibraryService],
       dispose: (s) => s.dispose(),
     )
-    ..registerLazySingleton<SearchModel>(
+    ..registerSingletonWithDependencies<SearchModel>(
       () => SearchModel(
         podcastService: di<PodcastService>(),
         radioService: di<RadioService>(),
         libraryService: di<LibraryService>(),
         localAudioService: di<LocalAudioService>(),
       ),
+      dependsOn: [
+        RadioService,
+        LibraryService,
+        LocalAudioService,
+      ],
     )
     ..registerSingletonWithDependencies<CustomContentModel>(
       () => CustomContentModel(
         externalPathService: di<ExternalPathService>(),
         libraryService: di<LibraryService>(),
         podcastService: di<PodcastService>(),
-        radioService: di<RadioService>(),
+        localAudioService: di<LocalAudioService>(),
       ),
       dependsOn: [
         LibraryService,
         PodcastService,
         RadioService,
+        LocalAudioService,
       ],
       dispose: (s) => s.dispose(),
     );
diff --git a/lib/search/search_model.dart b/lib/search/search_model.dart
index 7643b4076..205bc79a8 100644
--- a/lib/search/search_model.dart
+++ b/lib/search/search_model.dart
@@ -149,11 +149,10 @@ class SearchModel extends SafeChangeNotifier {
     return LocalSearchResult(
       titles: search?.titles,
       artists: search?.artists,
-      albumArtists: search?.albumArtists,
       albums: search?.albums,
       genres: search?.genres,
       playlists: (query != null && query.isNotEmpty)
-          ? _libraryService.playlists.keys
+          ? _libraryService.playlistIDs
               .where(
                 (e) => e.toLowerCase().contains(query.toLowerCase()),
               )
diff --git a/lib/search/view/sliver_local_search_results.dart b/lib/search/view/sliver_local_search_results.dart
index d43e57598..3ff701c39 100644
--- a/lib/search/view/sliver_local_search_results.dart
+++ b/lib/search/view/sliver_local_search_results.dart
@@ -25,16 +25,14 @@ class _SliverLocalSearchResultState extends State<SliverLocalSearchResult> {
   @override
   void initState() {
     super.initState();
-    di<LocalAudioModel>().init().then((_) {
-      final failedImports = di<LocalAudioModel>().failedImports;
-      if (mounted && failedImports?.isNotEmpty == true) {
-        showFailedImportsSnackBar(
-          failedImports: failedImports!,
-          context: context,
-          message: context.l10n.failedToReadMetadata,
-        );
-      }
-    });
+    final failedImports = di<LocalAudioModel>().failedImports;
+    if (mounted && failedImports?.isNotEmpty == true) {
+      showFailedImportsSnackBar(
+        failedImports: failedImports!,
+        context: context,
+        message: context.l10n.failedToReadMetadata,
+      );
+    }
   }
 
   @override
@@ -43,7 +41,6 @@ class _SliverLocalSearchResultState extends State<SliverLocalSearchResult> {
       (SearchModel m) => switch (m.searchType) {
         SearchType.localAlbum => LocalAudioView.albums,
         SearchType.localArtist => LocalAudioView.artists,
-        // SearchType.localAlbumArtist => LocalAudioView.albumArtists,
         SearchType.localTitle => LocalAudioView.titles,
         SearchType.localGenreName => LocalAudioView.genres,
         _ => LocalAudioView.playlists,
@@ -54,9 +51,6 @@ class _SliverLocalSearchResultState extends State<SliverLocalSearchResult> {
         watchPropertyValue((SearchModel m) => m.localSearchResult?.titles);
     final artists =
         watchPropertyValue((SearchModel m) => m.localSearchResult?.artists);
-    final albumArtists = watchPropertyValue(
-      (SearchModel m) => m.localSearchResult?.albumArtists,
-    );
     final albums =
         watchPropertyValue((SearchModel m) => m.localSearchResult?.albums);
     final genresResult =
@@ -79,8 +73,7 @@ class _SliverLocalSearchResultState extends State<SliverLocalSearchResult> {
       localAudioView: localAudioView,
       titles: titles,
       artists: artists,
-      albumArtists: albumArtists,
-      albums: albums,
+      albumIDs: albums,
       genres: genresResult,
       playlists: playlistsResult,
     );
diff --git a/lib/search/view/sliver_radio_country_grid.dart b/lib/search/view/sliver_radio_country_grid.dart
index 696b9eacd..6b980825e 100644
--- a/lib/search/view/sliver_radio_country_grid.dart
+++ b/lib/search/view/sliver_radio_country_grid.dart
@@ -6,7 +6,6 @@ import '../../common/data/audio.dart';
 import '../../common/view/loading_grid.dart';
 import '../../common/view/offline_page.dart';
 import '../../common/view/theme.dart';
-import '../../player/player_model.dart';
 import '../../radio/radio_model.dart';
 import '../../radio/view/radio_reconnect_button.dart';
 import '../../radio/view/station_card.dart';
@@ -64,19 +63,7 @@ class _SliverRadioCountryGridState extends State<SliverRadioCountryGrid> {
       itemBuilder: (context, index) {
         final station = radioSearchResult.elementAt(index);
         return StationCard(
-          station: station,
-          startPlaylist: ({
-            required audios,
-            index,
-            required listName,
-          }) {
-            return di<PlayerModel>()
-                .startPlaylist(
-                  audios: audios,
-                  listName: listName,
-                )
-                .then((_) => di<RadioModel>().clickStation(station));
-          },
+          uuid: station.uuid!,
         );
       },
     );
diff --git a/lib/search/view/sliver_radio_search_results.dart b/lib/search/view/sliver_radio_search_results.dart
index b9765131f..2ad885c9a 100644
--- a/lib/search/view/sliver_radio_search_results.dart
+++ b/lib/search/view/sliver_radio_search_results.dart
@@ -78,7 +78,7 @@ class SliverRadioSearchResults extends StatelessWidget with WatchItMixin {
             audio: station,
             onTitleTap: () => di<LibraryModel>().push(
               pageId: station.uuid!,
-              builder: (context) => StationPage(station: station),
+              builder: (context) => StationPage(uuid: station.uuid!),
             ),
             onTap: () {
               di<PlayerModel>().startPlaylist(
diff --git a/lib/settings/settings_model.dart b/lib/settings/settings_model.dart
index 1571a460c..1ac362b47 100644
--- a/lib/settings/settings_model.dart
+++ b/lib/settings/settings_model.dart
@@ -117,8 +117,6 @@ class SettingsModel extends SafeChangeNotifier {
   Future<void> setShowPositionDuration(bool value) async =>
       _service.setShowPositionDuration(value);
 
-  List<String> get externalPlaylists => _service.externalPlaylists;
-
   Future<void> wipeAllSettings() async => _service.wipeAllSettings();
 
   @override
diff --git a/lib/settings/settings_service.dart b/lib/settings/settings_service.dart
index 742c1b240..74df4be4b 100644
--- a/lib/settings/settings_service.dart
+++ b/lib/settings/settings_service.dart
@@ -137,28 +137,6 @@ class SettingsService {
   Future<void> setShowPositionDuration(bool value) async =>
       _preferences.setBool(SPKeys.showPositionDuration, value).then(notify);
 
-  List<String> get externalPlaylists =>
-      _preferences.getStringList(SPKeys.externalPlaylists) ?? [];
-  void setExternalPlaylists(List<String> value) async =>
-      _preferences.setStringList(SPKeys.externalPlaylists, value).then(notify);
-  void addExternalPlaylist(String value) {
-    final playlists = List<String>.from(externalPlaylists);
-    if (playlists.contains(value)) return;
-    playlists.add(value);
-    _preferences
-        .setStringList(SPKeys.externalPlaylists, playlists)
-        .then(notify);
-  }
-
-  void removeExternalPlaylist(String value) {
-    final playlists = List<String>.from(externalPlaylists);
-    if (!playlists.contains(value)) return;
-    playlists.remove(value);
-    _preferences
-        .setStringList(SPKeys.externalPlaylists, playlists)
-        .then(notify);
-  }
-
   CloseBtnAction get closeBtnActionIndex =>
       _preferences.getString(SPKeys.closeBtnAction) == null
           ? CloseBtnAction.alwaysAsk
diff --git a/pubspec.lock b/pubspec.lock
index cb9240a5e..7d6b5b5c6 100644
--- a/pubspec.lock
+++ b/pubspec.lock
@@ -77,10 +77,10 @@ packages:
     dependency: "direct main"
     description:
       name: audio_metadata_reader
-      sha256: a0e0d660fce5f361df3811a94082887a623e4d4359d987397c61aa77173950c6
+      sha256: "402b314c7212d04ecc425325d2145a0e406c50cb4c80150972ba2fb447e78688"
       url: "https://pub.dev"
     source: hosted
-    version: "1.1.2"
+    version: "1.4.0"
   audio_service:
     dependency: "direct main"
     description:
diff --git a/pubspec.yaml b/pubspec.yaml
index a63c3e67d..981cd1222 100644
--- a/pubspec.yaml
+++ b/pubspec.yaml
@@ -10,7 +10,7 @@ environment:
 
 dependencies:
   animated_emoji: ^3.1.0
-  audio_metadata_reader: ^1.1.2
+  audio_metadata_reader: ^1.4.0
   audio_service: ^0.18.12
   audio_service_mpris:
     git:
diff --git a/test/podcast_service_test.mocks.dart b/test/podcast_service_test.mocks.dart
index a1d4cd452..276a1c270 100644
--- a/test/podcast_service_test.mocks.dart
+++ b/test/podcast_service_test.mocks.dart
@@ -133,12 +133,6 @@ class MockSettingsService extends _i1.Mock implements _i4.SettingsService {
         returnValue: false,
       ) as bool);
 
-  @override
-  List<String> get externalPlaylists => (super.noSuchMethod(
-        Invocation.getter(#externalPlaylists),
-        returnValue: <String>[],
-      ) as List<String>);
-
   @override
   _i6.CloseBtnAction get closeBtnActionIndex => (super.noSuchMethod(
         Invocation.getter(#closeBtnActionIndex),
@@ -297,24 +291,6 @@ class MockSettingsService extends _i1.Mock implements _i4.SettingsService {
         returnValueForMissingStub: _i3.Future<void>.value(),
       ) as _i3.Future<void>);
 
-  @override
-  void setExternalPlaylists(List<String>? value) => super.noSuchMethod(
-        Invocation.method(#setExternalPlaylists, [value]),
-        returnValueForMissingStub: null,
-      );
-
-  @override
-  void addExternalPlaylist(String? value) => super.noSuchMethod(
-        Invocation.method(#addExternalPlaylist, [value]),
-        returnValueForMissingStub: null,
-      );
-
-  @override
-  void removeExternalPlaylist(String? value) => super.noSuchMethod(
-        Invocation.method(#removeExternalPlaylist, [value]),
-        returnValueForMissingStub: null,
-      );
-
   @override
   void setCloseBtnActionIndex(_i6.CloseBtnAction? value) => super.noSuchMethod(
         Invocation.method(#setCloseBtnActionIndex, [value]),
@@ -357,10 +333,15 @@ class MockLibraryService extends _i1.Mock implements _i7.LibraryService {
       ) as List<_i8.Audio>);
 
   @override
-  Map<String, List<_i8.Audio>> get starredStations => (super.noSuchMethod(
+  int get likedAudiosLength =>
+      (super.noSuchMethod(Invocation.getter(#likedAudiosLength), returnValue: 0)
+          as int);
+
+  @override
+  List<String> get starredStations => (super.noSuchMethod(
         Invocation.getter(#starredStations),
-        returnValue: <String, List<_i8.Audio>>{},
-      ) as Map<String, List<_i8.Audio>>);
+        returnValue: <String>[],
+      ) as List<String>);
 
   @override
   int get starredStationsLength => (super.noSuchMethod(
@@ -386,12 +367,36 @@ class MockLibraryService extends _i1.Mock implements _i7.LibraryService {
         returnValue: <String>{},
       ) as Set<String>);
 
+  @override
+  List<String> get playlistIDs => (super.noSuchMethod(
+        Invocation.getter(#playlistIDs),
+        returnValue: <String>[],
+      ) as List<String>);
+
   @override
   Map<String, List<_i8.Audio>> get playlists => (super.noSuchMethod(
         Invocation.getter(#playlists),
         returnValue: <String, List<_i8.Audio>>{},
       ) as Map<String, List<_i8.Audio>>);
 
+  @override
+  List<String> get externalPlaylistIDs => (super.noSuchMethod(
+        Invocation.getter(#externalPlaylistIDs),
+        returnValue: <String>[],
+      ) as List<String>);
+
+  @override
+  List<_i8.Audio> get externalPlaylistAudios => (super.noSuchMethod(
+        Invocation.getter(#externalPlaylistAudios),
+        returnValue: <_i8.Audio>[],
+      ) as List<_i8.Audio>);
+
+  @override
+  List<_i8.Audio> get playlistsAudios => (super.noSuchMethod(
+        Invocation.getter(#playlistsAudios),
+        returnValue: <_i8.Audio>[],
+      ) as List<_i8.Audio>);
+
   @override
   Map<String, String> get downloads => (super.noSuchMethod(
         Invocation.getter(#downloads),
@@ -404,6 +409,12 @@ class MockLibraryService extends _i1.Mock implements _i7.LibraryService {
         returnValue: 0,
       ) as int);
 
+  @override
+  List<String> get podcastFeedUrls => (super.noSuchMethod(
+        Invocation.getter(#podcastFeedUrls),
+        returnValue: <String>[],
+      ) as List<String>);
+
   @override
   Map<String, List<_i8.Audio>> get podcasts => (super.noSuchMethod(
         Invocation.getter(#podcasts),
@@ -416,21 +427,14 @@ class MockLibraryService extends _i1.Mock implements _i7.LibraryService {
           as int);
 
   @override
-  Map<String, List<_i8.Audio>> get pinnedAlbums => (super.noSuchMethod(
-        Invocation.getter(#pinnedAlbums),
-        returnValue: <String, List<_i8.Audio>>{},
-      ) as Map<String, List<_i8.Audio>>);
-
-  @override
-  int get pinnedAlbumsLength => (super.noSuchMethod(
-        Invocation.getter(#pinnedAlbumsLength),
-        returnValue: 0,
-      ) as int);
+  List<String> get favoriteAlbums => (super.noSuchMethod(
+        Invocation.getter(#favoriteAlbums),
+        returnValue: <String>[],
+      ) as List<String>);
 
   @override
-  void addLikedAudio(_i8.Audio? audio, [bool? notify = true]) =>
-      super.noSuchMethod(
-        Invocation.method(#addLikedAudio, [audio, notify]),
+  void addLikedAudio(_i8.Audio? audio) => super.noSuchMethod(
+        Invocation.method(#addLikedAudio, [audio]),
         returnValueForMissingStub: null,
       );
 
@@ -441,8 +445,14 @@ class MockLibraryService extends _i1.Mock implements _i7.LibraryService {
       );
 
   @override
-  bool liked(_i8.Audio? audio) => (super.noSuchMethod(
-        Invocation.method(#liked, [audio]),
+  bool isLiked(_i8.Audio? audio) => (super.noSuchMethod(
+        Invocation.method(#isLiked, [audio]),
+        returnValue: false,
+      ) as bool);
+
+  @override
+  bool isLikedAudios(List<_i8.Audio>? audios) => (super.noSuchMethod(
+        Invocation.method(#isLikedAudios, [audios]),
         returnValue: false,
       ) as bool);
 
@@ -460,31 +470,28 @@ class MockLibraryService extends _i1.Mock implements _i7.LibraryService {
       );
 
   @override
-  void addStarredStation(String? uuid, List<_i8.Audio>? audios) =>
-      super.noSuchMethod(
-        Invocation.method(#addStarredStation, [uuid, audios]),
+  void addStarredStation(String? uuid) => super.noSuchMethod(
+        Invocation.method(#addStarredStation, [uuid]),
         returnValueForMissingStub: null,
       );
 
   @override
-  void addStarredStations(List<(String, List<_i8.Audio>)>? stations) =>
-      super.noSuchMethod(
-        Invocation.method(#addStarredStations, [stations]),
+  void addStarredStations(List<String?>? uuids) => super.noSuchMethod(
+        Invocation.method(#addStarredStations, [uuids]),
         returnValueForMissingStub: null,
       );
 
   @override
-  void unStarStation(String? uuid) => super.noSuchMethod(
-        Invocation.method(#unStarStation, [uuid]),
+  void removeStarredStation(String? uuid) => super.noSuchMethod(
+        Invocation.method(#removeStarredStation, [uuid]),
         returnValueForMissingStub: null,
       );
 
   @override
-  _i3.Future<void> unStarAllStations() => (super.noSuchMethod(
+  void unStarAllStations() => super.noSuchMethod(
         Invocation.method(#unStarAllStations, []),
-        returnValue: _i3.Future<void>.value(),
-        returnValueForMissingStub: _i3.Future<void>.value(),
-      ) as _i3.Future<void>);
+        returnValueForMissingStub: null,
+      );
 
   @override
   bool isStarredStation(String? uuid) => (super.noSuchMethod(
@@ -558,6 +565,11 @@ class MockLibraryService extends _i1.Mock implements _i7.LibraryService {
         returnValueForMissingStub: null,
       );
 
+  @override
+  List<_i8.Audio>? getPlaylistById(String? id) =>
+      (super.noSuchMethod(Invocation.method(#getPlaylistById, [id]))
+          as List<_i8.Audio>?);
+
   @override
   bool isPlaylistSaved(String? id) => (super.noSuchMethod(
         Invocation.method(#isPlaylistSaved, [id]),
@@ -587,9 +599,17 @@ class MockLibraryService extends _i1.Mock implements _i7.LibraryService {
       ) as _i3.Future<void>);
 
   @override
-  _i3.Future<void> updatePlaylist(String? id, List<_i8.Audio>? audios) =>
+  _i3.Future<void> updatePlaylist({
+    required String? id,
+    required List<_i8.Audio>? audios,
+    bool? external = false,
+  }) =>
       (super.noSuchMethod(
-        Invocation.method(#updatePlaylist, [id, audios]),
+        Invocation.method(#updatePlaylist, [], {
+          #id: id,
+          #audios: audios,
+          #external: external,
+        }),
         returnValue: _i3.Future<void>.value(),
         returnValueForMissingStub: _i3.Future<void>.value(),
       ) as _i3.Future<void>);
@@ -652,6 +672,25 @@ class MockLibraryService extends _i1.Mock implements _i7.LibraryService {
         returnValueForMissingStub: null,
       );
 
+  @override
+  void addExternalPlaylistID(String? value) => super.noSuchMethod(
+        Invocation.method(#addExternalPlaylistID, [value]),
+        returnValueForMissingStub: null,
+      );
+
+  @override
+  void removeExternalPlaylistID(String? value) => super.noSuchMethod(
+        Invocation.method(#removeExternalPlaylistID, [value]),
+        returnValueForMissingStub: null,
+      );
+
+  @override
+  void updateExternalPlaylistID(String? oldName, String? newName) =>
+      super.noSuchMethod(
+        Invocation.method(#updateExternalPlaylistID, [oldName, newName]),
+        returnValueForMissingStub: null,
+      );
+
   @override
   bool feedHasDownloads(String? feedUrl) => (super.noSuchMethod(
         Invocation.method(#feedHasDownloads, [feedUrl]),
@@ -770,35 +809,37 @@ class MockLibraryService extends _i1.Mock implements _i7.LibraryService {
       ) as _i3.Future<void>);
 
   @override
-  List<_i8.Audio> getAlbumAt(int? index) => (super.noSuchMethod(
-        Invocation.method(#getAlbumAt, [index]),
-        returnValue: <_i8.Audio>[],
-      ) as List<_i8.Audio>);
-
-  @override
-  bool isPinnedAlbum(String? name) => (super.noSuchMethod(
-        Invocation.method(#isPinnedAlbum, [name]),
+  bool isFavoriteAlbum(String? id) => (super.noSuchMethod(
+        Invocation.method(#isFavoriteAlbum, [id]),
         returnValue: false,
       ) as bool);
 
   @override
-  void addPinnedAlbum(String? name, List<_i8.Audio>? audios) =>
+  void addFavoriteAlbum(String? id, {required dynamic Function()? onFail}) =>
       super.noSuchMethod(
-        Invocation.method(#addPinnedAlbum, [name, audios]),
+        Invocation.method(#addFavoriteAlbum, [id], {#onFail: onFail}),
         returnValueForMissingStub: null,
       );
 
   @override
-  void removePinnedAlbum(String? name) => super.noSuchMethod(
-        Invocation.method(#removePinnedAlbum, [name]),
+  void removeFavoriteAlbum(String? id, {required dynamic Function()? onFail}) =>
+      super.noSuchMethod(
+        Invocation.method(#removeFavoriteAlbum, [id], {#onFail: onFail}),
         returnValueForMissingStub: null,
       );
 
   @override
-  _i3.Future<bool> init() => (super.noSuchMethod(
+  bool notify(bool? saved) => (super.noSuchMethod(
+        Invocation.method(#notify, [saved]),
+        returnValue: false,
+      ) as bool);
+
+  @override
+  _i3.Future<void> init() => (super.noSuchMethod(
         Invocation.method(#init, []),
-        returnValue: _i3.Future<bool>.value(false),
-      ) as _i3.Future<bool>);
+        returnValue: _i3.Future<void>.value(),
+        returnValueForMissingStub: _i3.Future<void>.value(),
+      ) as _i3.Future<void>);
 
   @override
   _i3.Future<void> setSelectedPageId(String? value) => (super.noSuchMethod(