diff --git a/.idea/misc.xml b/.idea/misc.xml
index dbd49dc3..e97d132a 100644
--- a/.idea/misc.xml
+++ b/.idea/misc.xml
@@ -126,7 +126,7 @@
         <entry key="app/src/main/res/layout/player_control_view.xml" value="0.3229166666666667" />
         <entry key="app/src/main/res/layout/player_control_view_body.xml" value="0.3229166666666667" />
         <entry key="app/src/main/res/layout/player_control_view_header.xml" value="0.3229166666666667" />
-        <entry key="app/src/main/res/layout/player_header_bottom_sheet.xml" value="0.1" />
+        <entry key="app/src/main/res/layout/player_header_bottom_sheet.xml" value="0.3229166666666667" />
         <entry key="app/src/main/res/menu/bottom_nav_menu.xml" value="0.3229166666666667" />
         <entry key="app/src/main/res/menu/login_page_menu.xml" value="0.3229166666666667" />
         <entry key="app/src/main/res/menu/main_page_menu.xml" value="0.3229166666666667" />
diff --git a/app/src/main/java/com/cappielloantonio/play/ui/fragment/PlayerBottomSheetFragment.java b/app/src/main/java/com/cappielloantonio/play/ui/fragment/PlayerBottomSheetFragment.java
index 96c58cf9..35938629 100644
--- a/app/src/main/java/com/cappielloantonio/play/ui/fragment/PlayerBottomSheetFragment.java
+++ b/app/src/main/java/com/cappielloantonio/play/ui/fragment/PlayerBottomSheetFragment.java
@@ -7,15 +7,9 @@ import android.util.Log;
 import android.view.LayoutInflater;
 import android.view.View;
 import android.view.ViewGroup;
-import android.widget.ImageButton;
-import android.widget.ImageView;
-import android.widget.ScrollView;
-import android.widget.TextView;
-import android.widget.ToggleButton;
 
 import androidx.annotation.NonNull;
 import androidx.annotation.Nullable;
-import androidx.cardview.widget.CardView;
 import androidx.fragment.app.Fragment;
 import androidx.lifecycle.ViewModelProvider;
 import androidx.media3.common.MediaMetadata;
@@ -23,32 +17,19 @@ import androidx.media3.common.Player;
 import androidx.media3.session.MediaBrowser;
 import androidx.media3.session.MediaController;
 import androidx.media3.session.SessionToken;
-import androidx.media3.ui.PlayerControlView;
-import androidx.navigation.fragment.NavHostFragment;
-import androidx.recyclerview.widget.ItemTouchHelper;
-import androidx.recyclerview.widget.LinearLayoutManager;
-import androidx.recyclerview.widget.RecyclerView;
 import androidx.viewpager2.widget.ViewPager2;
 
 import com.bumptech.glide.load.resource.bitmap.RoundedCorners;
 import com.cappielloantonio.play.R;
-import com.cappielloantonio.play.adapter.PlayerBodyAdapter;
-import com.cappielloantonio.play.adapter.PlayerNowPlayingSongAdapter;
-import com.cappielloantonio.play.adapter.PlayerSongQueueAdapter;
+import com.cappielloantonio.play.ui.fragment.pager.PlayerControllerVerticalPager;
 import com.cappielloantonio.play.databinding.FragmentPlayerBottomSheetBinding;
 import com.cappielloantonio.play.glide.CustomGlideRequest;
-import com.cappielloantonio.play.service.MediaManager;
 import com.cappielloantonio.play.service.MediaService;
-import com.cappielloantonio.play.ui.activity.MainActivity;
-import com.cappielloantonio.play.ui.dialog.RatingDialog;
-import com.cappielloantonio.play.util.MappingUtil;
 import com.cappielloantonio.play.util.MusicUtil;
 import com.cappielloantonio.play.viewmodel.PlayerBottomSheetViewModel;
 import com.google.common.util.concurrent.ListenableFuture;
 import com.google.common.util.concurrent.MoreExecutors;
 
-import java.util.Collections;
-
 public class PlayerBottomSheetFragment extends Fragment {
     private static final String TAG = "PlayerBottomSheetFragment";
 
@@ -99,7 +80,7 @@ public class PlayerBottomSheetFragment extends Fragment {
 
     private void initViewPager() {
         bind.playerBodyLayout.playerBodyBottomSheetViewPager.setOrientation(ViewPager2.ORIENTATION_VERTICAL);
-        bind.playerBodyLayout.playerBodyBottomSheetViewPager.setAdapter(new PlayerBodyAdapter(this));
+        bind.playerBodyLayout.playerBodyBottomSheetViewPager.setAdapter(new PlayerControllerVerticalPager(this));
     }
 
     @SuppressLint("UnsafeOptInUsageError")
diff --git a/app/src/main/java/com/cappielloantonio/play/ui/fragment/PlayerControllerFragment.java b/app/src/main/java/com/cappielloantonio/play/ui/fragment/PlayerControllerFragment.java
index e4230760..2ed5c2f2 100644
--- a/app/src/main/java/com/cappielloantonio/play/ui/fragment/PlayerControllerFragment.java
+++ b/app/src/main/java/com/cappielloantonio/play/ui/fragment/PlayerControllerFragment.java
@@ -24,7 +24,7 @@ import androidx.navigation.fragment.NavHostFragment;
 import androidx.viewpager2.widget.ViewPager2;
 
 import com.cappielloantonio.play.R;
-import com.cappielloantonio.play.adapter.PlayerNowPlayingSongAdapter;
+import com.cappielloantonio.play.ui.fragment.pager.PlayerControllerHorizontalPager;
 import com.cappielloantonio.play.databinding.InnerFragmentPlayerControllerBinding;
 import com.cappielloantonio.play.service.MediaService;
 import com.cappielloantonio.play.ui.activity.MainActivity;
@@ -146,7 +146,7 @@ public class PlayerControllerFragment extends Fragment {
 
     private void initCoverLyricsSlideView() {
         playerSongCoverViewPager.setOrientation(ViewPager2.ORIENTATION_HORIZONTAL);
-        playerSongCoverViewPager.setAdapter(new PlayerNowPlayingSongAdapter(this));
+        playerSongCoverViewPager.setAdapter(new PlayerControllerHorizontalPager(this));
 
         playerSongCoverViewPager.registerOnPageChangeCallback(new ViewPager2.OnPageChangeCallback() {
             @Override
diff --git a/app/src/main/java/com/cappielloantonio/play/adapter/PlayerNowPlayingSongAdapter.java b/app/src/main/java/com/cappielloantonio/play/ui/fragment/pager/PlayerControllerHorizontalPager.java
similarity index 71%
rename from app/src/main/java/com/cappielloantonio/play/adapter/PlayerNowPlayingSongAdapter.java
rename to app/src/main/java/com/cappielloantonio/play/ui/fragment/pager/PlayerControllerHorizontalPager.java
index acedcbc3..df16d3f6 100644
--- a/app/src/main/java/com/cappielloantonio/play/adapter/PlayerNowPlayingSongAdapter.java
+++ b/app/src/main/java/com/cappielloantonio/play/ui/fragment/pager/PlayerControllerHorizontalPager.java
@@ -1,4 +1,4 @@
-package com.cappielloantonio.play.adapter;
+package com.cappielloantonio.play.ui.fragment.pager;
 
 import androidx.annotation.NonNull;
 import androidx.fragment.app.Fragment;
@@ -7,10 +7,10 @@ import androidx.viewpager2.adapter.FragmentStateAdapter;
 import com.cappielloantonio.play.ui.fragment.PlayerCoverFragment;
 import com.cappielloantonio.play.ui.fragment.PlayerLyricsFragment;
 
-public class PlayerNowPlayingSongAdapter extends FragmentStateAdapter {
-    private static final String TAG = "PlayerNowPlayingSongInfoAdapter";
+public class PlayerControllerHorizontalPager extends FragmentStateAdapter {
+    private static final String TAG = "PlayerControllerHorizontalPager";
 
-    public PlayerNowPlayingSongAdapter(@NonNull Fragment fragment) {
+    public PlayerControllerHorizontalPager(@NonNull Fragment fragment) {
         super(fragment);
     }
 
diff --git a/app/src/main/java/com/cappielloantonio/play/adapter/PlayerBodyAdapter.java b/app/src/main/java/com/cappielloantonio/play/ui/fragment/pager/PlayerControllerVerticalPager.java
similarity index 72%
rename from app/src/main/java/com/cappielloantonio/play/adapter/PlayerBodyAdapter.java
rename to app/src/main/java/com/cappielloantonio/play/ui/fragment/pager/PlayerControllerVerticalPager.java
index ad5f3d17..ada9c128 100644
--- a/app/src/main/java/com/cappielloantonio/play/adapter/PlayerBodyAdapter.java
+++ b/app/src/main/java/com/cappielloantonio/play/ui/fragment/pager/PlayerControllerVerticalPager.java
@@ -1,4 +1,4 @@
-package com.cappielloantonio.play.adapter;
+package com.cappielloantonio.play.ui.fragment.pager;
 
 import androidx.annotation.NonNull;
 import androidx.fragment.app.Fragment;
@@ -7,10 +7,10 @@ import androidx.viewpager2.adapter.FragmentStateAdapter;
 import com.cappielloantonio.play.ui.fragment.PlayerControllerFragment;
 import com.cappielloantonio.play.ui.fragment.PlayerQueueFragment;
 
-public class PlayerBodyAdapter extends FragmentStateAdapter {
-    private static final String TAG = "PlayerNowPlayingSongInfoAdapter";
+public class PlayerControllerVerticalPager extends FragmentStateAdapter {
+    private static final String TAG = "PlayerControllerVerticalPager";
 
-    public PlayerBodyAdapter(@NonNull Fragment fragment) {
+    public PlayerControllerVerticalPager(@NonNull Fragment fragment) {
         super(fragment);
     }