diff --git a/app/src/main/java/code/name/monkey/retromusic/fragments/base/AbsPlayerControlsFragment.kt b/app/src/main/java/code/name/monkey/retromusic/fragments/base/AbsPlayerControlsFragment.kt
index 716759e91..29a22444d 100644
--- a/app/src/main/java/code/name/monkey/retromusic/fragments/base/AbsPlayerControlsFragment.kt
+++ b/app/src/main/java/code/name/monkey/retromusic/fragments/base/AbsPlayerControlsFragment.kt
@@ -65,23 +65,13 @@ abstract class AbsPlayerControlsFragment(@LayoutRes layout: Int) : AbsMusicServi
         seekBar?.setOnSeekBarChangeListener(object : SimpleOnSeekbarChangeListener() {
             override fun onProgressChanged(seekBar: SeekBar, progress: Int, fromUser: Boolean) {
                 if (fromUser) {
-                    progressViewUpdateHelper.stop()
+                    MusicPlayerRemote.seekTo(progress)
                     onUpdateProgressViews(
                         MusicPlayerRemote.songProgressMillis,
                         MusicPlayerRemote.songDurationMillis
                     )
                 }
             }
-
-            override fun onStopTrackingTouch(seekBar: SeekBar) {
-                super.onStopTrackingTouch(seekBar)
-                MusicPlayerRemote.seekTo(seekBar.progress)
-                onUpdateProgressViews(
-                    MusicPlayerRemote.songProgressMillis,
-                    MusicPlayerRemote.songDurationMillis
-                )
-                progressViewUpdateHelper.start()
-            }
         })
     }
 
diff --git a/app/src/main/java/code/name/monkey/retromusic/fragments/home/HomeFragment.kt b/app/src/main/java/code/name/monkey/retromusic/fragments/home/HomeFragment.kt
index f4a3bc51f..c20fa7644 100644
--- a/app/src/main/java/code/name/monkey/retromusic/fragments/home/HomeFragment.kt
+++ b/app/src/main/java/code/name/monkey/retromusic/fragments/home/HomeFragment.kt
@@ -267,7 +267,7 @@ class HomeFragment :
             imageView.setOnClickListener {
                 it.isClickable = false
                 it.postDelayed({ it.isClickable = true }, 500)
-                MusicPlayerRemote.playNext(songs)
+                MusicPlayerRemote.playNext(songs[index])
                 if (!MusicPlayerRemote.isPlaying) {
                     MusicPlayerRemote.playNextSong()
                 }
diff --git a/app/src/main/java/code/name/monkey/retromusic/fragments/other/DetailListFragment.kt b/app/src/main/java/code/name/monkey/retromusic/fragments/other/DetailListFragment.kt
index fc08bcaea..9b28980ac 100644
--- a/app/src/main/java/code/name/monkey/retromusic/fragments/other/DetailListFragment.kt
+++ b/app/src/main/java/code/name/monkey/retromusic/fragments/other/DetailListFragment.kt
@@ -117,9 +117,9 @@ class DetailListFragment : AbsMainActivityFragment(R.layout.fragment_playlist_de
             layoutManager = linearLayoutManager()
             scheduleLayoutAnimation()
         }
-        libraryViewModel.recentSongs().observe(viewLifecycleOwner, { songs ->
+        libraryViewModel.recentSongs().observe(viewLifecycleOwner) { songs ->
             songAdapter.swapDataSet(songs)
-        })
+        }
     }
 
     private fun topPlayed() {
@@ -133,9 +133,9 @@ class DetailListFragment : AbsMainActivityFragment(R.layout.fragment_playlist_de
             adapter = songAdapter
             layoutManager = linearLayoutManager()
         }
-        libraryViewModel.playCountSongs().observe(viewLifecycleOwner, { songs ->
+        libraryViewModel.playCountSongs().observe(viewLifecycleOwner) { songs ->
             songAdapter.swapDataSet(songs)
-        })
+        }
     }
 
     private fun loadHistory() {
@@ -150,9 +150,9 @@ class DetailListFragment : AbsMainActivityFragment(R.layout.fragment_playlist_de
             adapter = songAdapter
             layoutManager = linearLayoutManager()
         }
-        libraryViewModel.observableHistorySongs().observe(viewLifecycleOwner, {
+        libraryViewModel.observableHistorySongs().observe(viewLifecycleOwner) {
             songAdapter.swapDataSet(it)
-        })
+        }
     }
 
     private fun loadFavorite() {
@@ -166,30 +166,35 @@ class DetailListFragment : AbsMainActivityFragment(R.layout.fragment_playlist_de
             adapter = songAdapter
             layoutManager = linearLayoutManager()
         }
-        libraryViewModel.favorites().observe(viewLifecycleOwner, { songEntities ->
+        libraryViewModel.favorites().observe(viewLifecycleOwner) { songEntities ->
             val songs = songEntities.map { songEntity -> songEntity.toSong() }
             songAdapter.swapDataSet(songs)
-        })
+        }
     }
 
+
     private fun loadArtists(title: Int, type: Int) {
         binding.toolbar.setTitle(title)
-        libraryViewModel.artists(type).observe(viewLifecycleOwner, { artists ->
-            binding.recyclerView.apply {
-                adapter = artistAdapter(artists)
-                layoutManager = gridLayoutManager()
-            }
-        })
+        val artistAdapter = artistAdapter(listOf())
+        binding.recyclerView.apply {
+            adapter = artistAdapter
+            layoutManager = gridLayoutManager()
+        }
+        libraryViewModel.artists(type).observe(viewLifecycleOwner) { artists ->
+            artistAdapter.swapDataSet(artists)
+        }
     }
 
     private fun loadAlbums(title: Int, type: Int) {
         binding.toolbar.setTitle(title)
-        libraryViewModel.albums(type).observe(viewLifecycleOwner, { albums ->
-            binding.recyclerView.apply {
-                adapter = albumAdapter(albums)
-                layoutManager = gridLayoutManager()
-            }
-        })
+        val albumAdapter = albumAdapter(listOf())
+        binding.recyclerView.apply {
+            adapter = albumAdapter
+            layoutManager = gridLayoutManager()
+        }
+        libraryViewModel.albums(type).observe(viewLifecycleOwner) { albums ->
+            albumAdapter.swapDataSet(albums)
+        }
     }
 
     private fun artistAdapter(artists: List<Artist>): ArtistAdapter = ArtistAdapter(