diff --git a/app/src/main/java/com/cappielloantonio/play/adapter/AlbumAdapter.java b/app/src/main/java/com/cappielloantonio/play/adapter/AlbumAdapter.java
index 7d9b8a50..6ebd140c 100644
--- a/app/src/main/java/com/cappielloantonio/play/adapter/AlbumAdapter.java
+++ b/app/src/main/java/com/cappielloantonio/play/adapter/AlbumAdapter.java
@@ -74,14 +74,14 @@ public class AlbumAdapter extends RecyclerView.Adapter<AlbumAdapter.ViewHolder>
         @Override
         public void onClick(View view) {
             Bundle bundle = new Bundle();
-            bundle.putParcelable("album_object", albums.get(getAdapterPosition()));
+            bundle.putParcelable("album_object", albums.get(getBindingAdapterPosition()));
             Navigation.findNavController(view).navigate(R.id.action_libraryFragment_to_albumPageFragment, bundle);
         }
 
         @Override
         public boolean onLongClick(View v) {
             Bundle bundle = new Bundle();
-            bundle.putParcelable("album_object", albums.get(getAdapterPosition()));
+            bundle.putParcelable("album_object", albums.get(getBindingAdapterPosition()));
             Navigation.findNavController(v).navigate(R.id.albumBottomSheetDialog, bundle);
             return true;
         }
diff --git a/app/src/main/java/com/cappielloantonio/play/adapter/AlbumArtistPageAdapter.java b/app/src/main/java/com/cappielloantonio/play/adapter/AlbumArtistPageAdapter.java
index d452a0fd..1c331ddb 100644
--- a/app/src/main/java/com/cappielloantonio/play/adapter/AlbumArtistPageAdapter.java
+++ b/app/src/main/java/com/cappielloantonio/play/adapter/AlbumArtistPageAdapter.java
@@ -71,14 +71,14 @@ public class AlbumArtistPageAdapter extends RecyclerView.Adapter<AlbumArtistPage
         @Override
         public void onClick(View view) {
             Bundle bundle = new Bundle();
-            bundle.putParcelable("album_object", albums.get(getAdapterPosition()));
+            bundle.putParcelable("album_object", albums.get(getBindingAdapterPosition()));
             Navigation.findNavController(view).navigate(R.id.action_artistPageFragment_to_albumPageFragment, bundle);
         }
 
         @Override
         public boolean onLongClick(View v) {
             Bundle bundle = new Bundle();
-            bundle.putParcelable("album_object", albums.get(getAdapterPosition()));
+            bundle.putParcelable("album_object", albums.get(getBindingAdapterPosition()));
             Navigation.findNavController(v).navigate(R.id.albumBottomSheetDialog, bundle);
             return true;
         }
diff --git a/app/src/main/java/com/cappielloantonio/play/adapter/AlbumCatalogueAdapter.java b/app/src/main/java/com/cappielloantonio/play/adapter/AlbumCatalogueAdapter.java
index d96c27c0..e3ad9445 100644
--- a/app/src/main/java/com/cappielloantonio/play/adapter/AlbumCatalogueAdapter.java
+++ b/app/src/main/java/com/cappielloantonio/play/adapter/AlbumCatalogueAdapter.java
@@ -76,7 +76,7 @@ public class AlbumCatalogueAdapter extends RecyclerView.Adapter<AlbumCatalogueAd
         @Override
         public void onClick(View view) {
             Bundle bundle = new Bundle();
-            bundle.putParcelable("album_object", albums.get(getAdapterPosition()));
+            bundle.putParcelable("album_object", albums.get(getBindingAdapterPosition()));
 
             if (Objects.requireNonNull(Navigation.findNavController(view).getCurrentDestination()).getId() == R.id.searchFragment) {
                 Navigation.findNavController(view).navigate(R.id.action_searchFragment_to_albumPageFragment, bundle);
@@ -92,7 +92,7 @@ public class AlbumCatalogueAdapter extends RecyclerView.Adapter<AlbumCatalogueAd
         @Override
         public boolean onLongClick(View v) {
             Bundle bundle = new Bundle();
-            bundle.putParcelable("album_object", albums.get(getAdapterPosition()));
+            bundle.putParcelable("album_object", albums.get(getBindingAdapterPosition()));
             Navigation.findNavController(v).navigate(R.id.albumBottomSheetDialog, bundle);
             return true;
         }
diff --git a/app/src/main/java/com/cappielloantonio/play/adapter/ArtistAdapter.java b/app/src/main/java/com/cappielloantonio/play/adapter/ArtistAdapter.java
index 78bef9ff..f32c9c7b 100644
--- a/app/src/main/java/com/cappielloantonio/play/adapter/ArtistAdapter.java
+++ b/app/src/main/java/com/cappielloantonio/play/adapter/ArtistAdapter.java
@@ -71,14 +71,14 @@ public class ArtistAdapter extends RecyclerView.Adapter<ArtistAdapter.ViewHolder
         @Override
         public void onClick(View view) {
             Bundle bundle = new Bundle();
-            bundle.putParcelable("artist_object", artists.get(getAdapterPosition()));
+            bundle.putParcelable("artist_object", artists.get(getBindingAdapterPosition()));
             Navigation.findNavController(view).navigate(R.id.action_libraryFragment_to_artistPageFragment, bundle);
         }
 
         @Override
         public boolean onLongClick(View v) {
             Bundle bundle = new Bundle();
-            bundle.putParcelable("artist_object", artists.get(getAdapterPosition()));
+            bundle.putParcelable("artist_object", artists.get(getBindingAdapterPosition()));
             Navigation.findNavController(v).navigate(R.id.artistBottomSheetDialog, bundle);
             return true;
         }
diff --git a/app/src/main/java/com/cappielloantonio/play/adapter/ArtistCatalogueAdapter.java b/app/src/main/java/com/cappielloantonio/play/adapter/ArtistCatalogueAdapter.java
index eb5f8a1d..f893ae19 100644
--- a/app/src/main/java/com/cappielloantonio/play/adapter/ArtistCatalogueAdapter.java
+++ b/app/src/main/java/com/cappielloantonio/play/adapter/ArtistCatalogueAdapter.java
@@ -72,7 +72,7 @@ public class ArtistCatalogueAdapter extends RecyclerView.Adapter<ArtistCatalogue
         @Override
         public void onClick(View view) {
             Bundle bundle = new Bundle();
-            bundle.putParcelable("artist_object", artists.get(getAdapterPosition()));
+            bundle.putParcelable("artist_object", artists.get(getBindingAdapterPosition()));
 
             if (Objects.requireNonNull(Navigation.findNavController(view).getCurrentDestination()).getId() == R.id.searchFragment) {
                 Navigation.findNavController(view).navigate(R.id.action_searchFragment_to_artistPageFragment, bundle);
@@ -88,7 +88,7 @@ public class ArtistCatalogueAdapter extends RecyclerView.Adapter<ArtistCatalogue
         @Override
         public boolean onLongClick(View v) {
             Bundle bundle = new Bundle();
-            bundle.putParcelable("artist_object", artists.get(getAdapterPosition()));
+            bundle.putParcelable("artist_object", artists.get(getBindingAdapterPosition()));
             Navigation.findNavController(v).navigate(R.id.artistBottomSheetDialog, bundle);
             return true;
         }
diff --git a/app/src/main/java/com/cappielloantonio/play/adapter/DiscoverSongAdapter.java b/app/src/main/java/com/cappielloantonio/play/adapter/DiscoverSongAdapter.java
index e6a28267..081cea32 100644
--- a/app/src/main/java/com/cappielloantonio/play/adapter/DiscoverSongAdapter.java
+++ b/app/src/main/java/com/cappielloantonio/play/adapter/DiscoverSongAdapter.java
@@ -72,7 +72,7 @@ public class DiscoverSongAdapter extends RecyclerView.Adapter<DiscoverSongAdapte
         @Override
         public void onClick(View view) {
             SongRepository songRepository = new SongRepository(App.getInstance());
-            songRepository.increasePlayCount(songs.get(getAdapterPosition()));
+            songRepository.increasePlayCount(songs.get(getBindingAdapterPosition()));
         }
     }
 
diff --git a/app/src/main/java/com/cappielloantonio/play/adapter/GenreAdapter.java b/app/src/main/java/com/cappielloantonio/play/adapter/GenreAdapter.java
index bf7be484..ea986c50 100644
--- a/app/src/main/java/com/cappielloantonio/play/adapter/GenreAdapter.java
+++ b/app/src/main/java/com/cappielloantonio/play/adapter/GenreAdapter.java
@@ -60,7 +60,7 @@ public class GenreAdapter extends RecyclerView.Adapter<GenreAdapter.ViewHolder>
         @Override
         public void onClick(View view) {
             if (itemClickListener != null)
-                itemClickListener.onItemClick(view, getAdapterPosition());
+                itemClickListener.onItemClick(view, getBindingAdapterPosition());
         }
     }
 
diff --git a/app/src/main/java/com/cappielloantonio/play/adapter/GenreCatalogueAdapter.java b/app/src/main/java/com/cappielloantonio/play/adapter/GenreCatalogueAdapter.java
index 50452363..0839e225 100644
--- a/app/src/main/java/com/cappielloantonio/play/adapter/GenreCatalogueAdapter.java
+++ b/app/src/main/java/com/cappielloantonio/play/adapter/GenreCatalogueAdapter.java
@@ -61,7 +61,7 @@ public class GenreCatalogueAdapter extends RecyclerView.Adapter<GenreCatalogueAd
 
         @Override
         public void onClick(View view) {
-            if (itemClickListener != null) itemClickListener.onItemClick(view, getAdapterPosition());
+            if (itemClickListener != null) itemClickListener.onItemClick(view, getBindingAdapterPosition());
         }
     }
 
diff --git a/app/src/main/java/com/cappielloantonio/play/adapter/PlayerNowPlayingSongAdapter.java b/app/src/main/java/com/cappielloantonio/play/adapter/PlayerNowPlayingSongAdapter.java
index 6270837f..e176dc43 100644
--- a/app/src/main/java/com/cappielloantonio/play/adapter/PlayerNowPlayingSongAdapter.java
+++ b/app/src/main/java/com/cappielloantonio/play/adapter/PlayerNowPlayingSongAdapter.java
@@ -67,7 +67,7 @@ public class PlayerNowPlayingSongAdapter extends RecyclerView.Adapter<PlayerNowP
         @Override
         public void onClick(View view) {
             SongRepository songRepository = new SongRepository(App.getInstance());
-            songRepository.increasePlayCount(songs.get(getAdapterPosition()));
+            songRepository.increasePlayCount(songs.get(getBindingAdapterPosition()));
 
             if (MusicPlayerRemote.isPlaying()) {
                 MusicPlayerRemote.pauseSong();
diff --git a/app/src/main/java/com/cappielloantonio/play/adapter/PlayerSongQueueAdapter.java b/app/src/main/java/com/cappielloantonio/play/adapter/PlayerSongQueueAdapter.java
index f224e355..ded170cd 100644
--- a/app/src/main/java/com/cappielloantonio/play/adapter/PlayerSongQueueAdapter.java
+++ b/app/src/main/java/com/cappielloantonio/play/adapter/PlayerSongQueueAdapter.java
@@ -80,10 +80,10 @@ public class PlayerSongQueueAdapter extends RecyclerView.Adapter<PlayerSongQueue
         @Override
         public void onClick(View view) {
             SongRepository songRepository = new SongRepository(App.getInstance());
-            songRepository.increasePlayCount(songs.get(getAdapterPosition()));
+            songRepository.increasePlayCount(songs.get(getBindingAdapterPosition()));
 
-            playerBottomSheetFragment.scrollPager(songs.get(getAdapterPosition()), getAdapterPosition(), true);
-            MusicPlayerRemote.openQueue(songs, getAdapterPosition(), true);
+            playerBottomSheetFragment.scrollPager(songs.get(getBindingAdapterPosition()), getAdapterPosition(), true);
+            MusicPlayerRemote.openQueue(songs, getBindingAdapterPosition(), true);
         }
     }
 
diff --git a/app/src/main/java/com/cappielloantonio/play/adapter/PlaylistAdapter.java b/app/src/main/java/com/cappielloantonio/play/adapter/PlaylistAdapter.java
index 609cad84..f8f78261 100644
--- a/app/src/main/java/com/cappielloantonio/play/adapter/PlaylistAdapter.java
+++ b/app/src/main/java/com/cappielloantonio/play/adapter/PlaylistAdapter.java
@@ -62,7 +62,7 @@ public class PlaylistAdapter extends RecyclerView.Adapter<PlaylistAdapter.ViewHo
         @Override
         public void onClick(View view) {
             Bundle bundle = new Bundle();
-            bundle.putParcelable("playlist_object", playlists.get(getAdapterPosition()));
+            bundle.putParcelable("playlist_object", playlists.get(getBindingAdapterPosition()));
             Navigation.findNavController(view).navigate(R.id.action_libraryFragment_to_playlistPageFragment, bundle);
 
         }
diff --git a/app/src/main/java/com/cappielloantonio/play/adapter/RecentMusicAdapter.java b/app/src/main/java/com/cappielloantonio/play/adapter/RecentMusicAdapter.java
index f2938b8d..ad206be6 100644
--- a/app/src/main/java/com/cappielloantonio/play/adapter/RecentMusicAdapter.java
+++ b/app/src/main/java/com/cappielloantonio/play/adapter/RecentMusicAdapter.java
@@ -91,22 +91,22 @@ public class RecentMusicAdapter extends RecyclerView.Adapter<RecentMusicAdapter.
             SongRepository songRepository = new SongRepository(App.getInstance());
             QueueRepository queueRepository = new QueueRepository(App.getInstance());
 
-            songRepository.increasePlayCount(songs.get(getAdapterPosition()));
-            queueRepository.insertAllAndStartNew(songs.subList(getAdapterPosition(), songs.size()));
+            songRepository.increasePlayCount(songs.get(getBindingAdapterPosition()));
+            queueRepository.insertAllAndStartNew(songs.subList(getBindingAdapterPosition(), songs.size()));
 
             mainActivity.isBottomSheetInPeek(true);
-            mainActivity.setBottomSheetMusicInfo(songs.get(getAdapterPosition()));
+            mainActivity.setBottomSheetMusicInfo(songs.get(getBindingAdapterPosition()));
 
             PlayerBottomSheetViewModel playerBottomSheetViewModel = new ViewModelProvider(mainActivity).get(PlayerBottomSheetViewModel.class);
-            playerBottomSheetViewModel.setNowPlayingSong(songs.get(getAdapterPosition()));
+            playerBottomSheetViewModel.setNowPlayingSong(songs.get(getBindingAdapterPosition()));
 
-            MusicPlayerRemote.openQueue(songs.subList(getAdapterPosition(), songs.size()), 0, true);
+            MusicPlayerRemote.openQueue(songs.subList(getBindingAdapterPosition(), songs.size()), 0, true);
         }
 
         @Override
         public boolean onLongClick(View view) {
             Bundle bundle = new Bundle();
-            bundle.putParcelable("song_object", songs.get(getAdapterPosition()));
+            bundle.putParcelable("song_object", songs.get(getBindingAdapterPosition()));
             Navigation.findNavController(view).navigate(R.id.songBottomSheetDialog, bundle);
             return true;
         }
diff --git a/app/src/main/java/com/cappielloantonio/play/adapter/RecentSearchAdapter.java b/app/src/main/java/com/cappielloantonio/play/adapter/RecentSearchAdapter.java
index c5f42703..e4840b2f 100644
--- a/app/src/main/java/com/cappielloantonio/play/adapter/RecentSearchAdapter.java
+++ b/app/src/main/java/com/cappielloantonio/play/adapter/RecentSearchAdapter.java
@@ -60,7 +60,7 @@ public class RecentSearchAdapter extends RecyclerView.Adapter<RecentSearchAdapte
         @Override
         public void onClick(View view) {
             if (itemClickListener != null)
-                itemClickListener.onItemClick(view, getAdapterPosition());
+                itemClickListener.onItemClick(view, getBindingAdapterPosition());
         }
     }
 
diff --git a/app/src/main/java/com/cappielloantonio/play/adapter/SongResultSearchAdapter.java b/app/src/main/java/com/cappielloantonio/play/adapter/SongResultSearchAdapter.java
index 5e3aef14..c541093e 100644
--- a/app/src/main/java/com/cappielloantonio/play/adapter/SongResultSearchAdapter.java
+++ b/app/src/main/java/com/cappielloantonio/play/adapter/SongResultSearchAdapter.java
@@ -95,22 +95,22 @@ public class SongResultSearchAdapter extends RecyclerView.Adapter<SongResultSear
             SongRepository songRepository = new SongRepository(App.getInstance());
             QueueRepository queueRepository = new QueueRepository(App.getInstance());
 
-            songRepository.increasePlayCount(songs.get(getAdapterPosition()));
-            queueRepository.insertAllAndStartNew(songs.subList(getAdapterPosition(), songs.size()));
+            songRepository.increasePlayCount(songs.get(getBindingAdapterPosition()));
+            queueRepository.insertAllAndStartNew(songs.subList(getBindingAdapterPosition(), songs.size()));
 
             mainActivity.isBottomSheetInPeek(true);
-            mainActivity.setBottomSheetMusicInfo(songs.get(getAdapterPosition()));
+            mainActivity.setBottomSheetMusicInfo(songs.get(getBindingAdapterPosition()));
 
             PlayerBottomSheetViewModel playerBottomSheetViewModel = new ViewModelProvider(mainActivity).get(PlayerBottomSheetViewModel.class);
-            playerBottomSheetViewModel.setNowPlayingSong(songs.get(getAdapterPosition()));
+            playerBottomSheetViewModel.setNowPlayingSong(songs.get(getBindingAdapterPosition()));
 
-            MusicPlayerRemote.openQueue(songs.subList(getAdapterPosition(), songs.size()), 0, true);
+            MusicPlayerRemote.openQueue(songs.subList(getBindingAdapterPosition(), songs.size()), 0, true);
         }
 
         @Override
         public boolean onLongClick(View v) {
             Bundle bundle = new Bundle();
-            bundle.putParcelable("song_object", songs.get(getAdapterPosition()));
+            bundle.putParcelable("song_object", songs.get(getBindingAdapterPosition()));
             Navigation.findNavController(v).navigate(R.id.songBottomSheetDialog, bundle);
             return true;
         }
diff --git a/app/src/main/java/com/cappielloantonio/play/adapter/YearAdapter.java b/app/src/main/java/com/cappielloantonio/play/adapter/YearAdapter.java
index ca41cb81..daff0b63 100644
--- a/app/src/main/java/com/cappielloantonio/play/adapter/YearAdapter.java
+++ b/app/src/main/java/com/cappielloantonio/play/adapter/YearAdapter.java
@@ -56,7 +56,7 @@ public class YearAdapter extends RecyclerView.Adapter<YearAdapter.ViewHolder> {
 
         @Override
         public void onClick(View view) {
-            if (itemClickListener != null) itemClickListener.onItemClick(view, getAdapterPosition());
+            if (itemClickListener != null) itemClickListener.onItemClick(view, getBindingAdapterPosition());
         }
     }
 
diff --git a/app/src/main/res/layout/item_player_now_playing_song.xml b/app/src/main/res/layout/item_player_now_playing_song.xml
index ce8af70e..35d42ade 100644
--- a/app/src/main/res/layout/item_player_now_playing_song.xml
+++ b/app/src/main/res/layout/item_player_now_playing_song.xml
@@ -3,9 +3,7 @@
     xmlns:app="http://schemas.android.com/apk/res-auto"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
-    android:layout_marginStart="24dp"
-    android:layout_marginEnd="24dp"
-    android:layout_marginBottom="8dp"
+    android:layout_margin="24dp"
     android:backgroundTint="@color/cardColor"
     app:cardCornerRadius="4dp">
 
@@ -13,6 +11,6 @@
         android:id="@+id/now_playing_song_cover_image_view"
         android:layout_width="match_parent"
         android:layout_height="match_parent"
-        android:background="?android:attr/selectableItemBackground"/>
+        android:foreground="?android:attr/selectableItemBackground"/>
 
 </androidx.cardview.widget.CardView>
\ No newline at end of file
diff --git a/app/src/main/res/layout/player_body_bottom_sheet.xml b/app/src/main/res/layout/player_body_bottom_sheet.xml
index 6ee8ddc9..82eea61d 100644
--- a/app/src/main/res/layout/player_body_bottom_sheet.xml
+++ b/app/src/main/res/layout/player_body_bottom_sheet.xml
@@ -13,6 +13,7 @@
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:background="@android:color/transparent"
+        android:layout_marginBottom="-4dp"
         android:paddingStart="24dp"
         android:paddingTop="20dp"
         android:text="Now playing"
@@ -26,11 +27,10 @@
         android:id="@+id/player_song_cover_view_pager"
         android:layout_width="0dp"
         android:layout_height="0dp"
-        android:layout_marginTop="20dp"
         app:layout_constraintDimensionRatio="H,1:1"
         app:layout_constraintLeft_toLeftOf="parent"
         app:layout_constraintRight_toRightOf="parent"
-        app:layout_constraintTop_toBottomOf="@+id/collapse_bottom_sheet_button" />
+        app:layout_constraintTop_toBottomOf="@+id/collapse_bottom_sheet_button"/>
 
     <LinearLayout
         android:id="@+id/player_big_timer"
@@ -92,7 +92,7 @@
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:layout_weight="1"
-            android:layout_marginTop="18dp"
+            android:layout_marginTop="12dp"
             android:paddingStart="24dp"
             android:text="@string/label_placeholder"
             android:textColor="@color/titleTextColor"
@@ -106,7 +106,7 @@
             android:background="@drawable/button_favorite_selector"
             android:checked="false"
             android:gravity="center_vertical"
-            android:layout_marginTop="18dp"
+            android:layout_marginTop="12dp"
             android:layout_marginEnd="24dp"
             android:text=""
             android:textOff=""
@@ -121,6 +121,7 @@
         android:layout_height="wrap_content"
         android:paddingStart="24dp"
         android:paddingEnd="24dp"
+        android:paddingBottom="18dp"
         android:text="@string/label_placeholder"
         android:textColor="@color/subtitleTextColor"
         android:textSize="14sp"
@@ -129,7 +130,6 @@
 
     <View style="@style/Divider"
         android:id="@+id/player_divider"
-        android:layout_marginTop="24dp"
         android:layout_marginStart="18dp"
         android:layout_marginEnd="18dp"
         app:layout_constraintStart_toStartOf="parent"