diff --git a/app/src/main/java/code/name/monkey/retromusic/fragments/player/PlayerAlbumCoverFragment.kt b/app/src/main/java/code/name/monkey/retromusic/fragments/player/PlayerAlbumCoverFragment.kt
index 395669ec..1e685b2e 100644
--- a/app/src/main/java/code/name/monkey/retromusic/fragments/player/PlayerAlbumCoverFragment.kt
+++ b/app/src/main/java/code/name/monkey/retromusic/fragments/player/PlayerAlbumCoverFragment.kt
@@ -17,6 +17,7 @@ import code.name.monkey.retromusic.util.PreferenceUtil
 import code.name.monkey.retromusic.util.color.MediaNotificationProcessor
 import kotlinx.android.synthetic.main.fragment_player_album_cover.*
 
+
 class PlayerAlbumCoverFragment : AbsMusicServiceFragment(), ViewPager.OnPageChangeListener {
     private var callbacks: Callbacks? = null
     private var currentPosition: Int = 0
@@ -46,11 +47,21 @@ class PlayerAlbumCoverFragment : AbsMusicServiceFragment(), ViewPager.OnPageChan
         viewPager.addOnPageChangeListener(this)
         val nps = PreferenceUtil.getInstance(requireContext()).nowPlayingScreen
 
+        val metrics = resources.displayMetrics
+        val ratio = metrics.heightPixels.toFloat() / metrics.widthPixels.toFloat()
+
+
         if (nps == FULL || nps == CLASSIC || nps == FIT) {
             viewPager.offscreenPageLimit = 2
         } else if (PreferenceUtil.getInstance(requireContext()).carouselEffect()) {
             viewPager.clipToPadding = false
-            viewPager.setPadding(40, 40, 40, 0)
+            val padding =
+                if (ratio >= 1.777f) {
+                    40
+                } else {
+                    100
+                }
+            viewPager.setPadding(padding, 0, padding, 0)
             viewPager.pageMargin = 0
             viewPager.setPageTransformer(false, CarousalPagerTransformer(requireContext()))
         } else {
diff --git a/app/src/main/java/code/name/monkey/retromusic/fragments/player/classic/ClassicPlayerFragment.kt b/app/src/main/java/code/name/monkey/retromusic/fragments/player/classic/ClassicPlayerFragment.kt
index 95f4cb68..a38876cb 100644
--- a/app/src/main/java/code/name/monkey/retromusic/fragments/player/classic/ClassicPlayerFragment.kt
+++ b/app/src/main/java/code/name/monkey/retromusic/fragments/player/classic/ClassicPlayerFragment.kt
@@ -43,8 +43,8 @@ import com.h6ah4i.android.widget.advrecyclerview.draggable.RecyclerViewDragDropM
 import com.h6ah4i.android.widget.advrecyclerview.swipeable.RecyclerViewSwipeManager
 import com.h6ah4i.android.widget.advrecyclerview.touchguard.RecyclerViewTouchActionGuardManager
 import com.h6ah4i.android.widget.advrecyclerview.utils.WrapperAdapterUtils
-import kotlinx.android.synthetic.main.fragment_classic_player.*
 import kotlinx.android.synthetic.main.fragment_classic_controls.*
+import kotlinx.android.synthetic.main.fragment_classic_player.*
 import kotlinx.android.synthetic.main.status_bar.*
 
 
@@ -87,6 +87,7 @@ class ClassicPlayerFragment : AbsPlayerFragment(), View.OnLayoutChangeListener,
                 }
                 BottomSheetBehavior.STATE_COLLAPSED -> {
                     resetToCurrentPosition()
+                    activity.getBottomSheetBehavior().setAllowDragging(true)
                 }
                 else -> {
                     activity.getBottomSheetBehavior().setAllowDragging(true)
@@ -245,10 +246,13 @@ class ClassicPlayerFragment : AbsPlayerFragment(), View.OnLayoutChangeListener,
     }
 
     override fun onBackPressed(): Boolean {
+        var wasExpanded = false
         if (getQueuePanel().state == BottomSheetBehavior.STATE_EXPANDED) {
+            wasExpanded = getQueuePanel().state == BottomSheetBehavior.STATE_EXPANDED
             getQueuePanel().state = BottomSheetBehavior.STATE_COLLAPSED
+            return wasExpanded
         }
-        return false
+        return wasExpanded
     }
 
     override fun toolbarIconColor(): Int {
diff --git a/app/src/main/res/layout/fragment_album_card_cover.xml b/app/src/main/res/layout/fragment_album_card_cover.xml
index f3e71419..2424fc9b 100644
--- a/app/src/main/res/layout/fragment_album_card_cover.xml
+++ b/app/src/main/res/layout/fragment_album_card_cover.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
+<androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:app="http://schemas.android.com/apk/res-auto"
     xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
@@ -7,14 +7,18 @@
 
     <com.google.android.material.card.MaterialCardView
         android:id="@+id/player_album_art_frame"
-        android:layout_width="match_parent"
-        android:layout_height="match_parent"
+        android:layout_width="0dp"
+        android:layout_height="0dp"
         android:layout_marginStart="16dp"
         android:layout_marginTop="8dp"
         android:layout_marginEnd="16dp"
         android:layout_marginBottom="16dp"
         app:cardCornerRadius="12dp"
-        app:cardElevation="4dp">
+        app:cardElevation="4dp"
+        app:layout_constraintBottom_toBottomOf="parent"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintTop_toTopOf="parent">
 
         <androidx.appcompat.widget.AppCompatImageView
             android:id="@+id/player_image"
@@ -29,4 +33,4 @@
             android:layout_height="wrap_content"
             android:background="@drawable/shadow_up_edited" />
     </com.google.android.material.card.MaterialCardView>
-</FrameLayout>
\ No newline at end of file
+</androidx.constraintlayout.widget.ConstraintLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/fragment_album_carousel_cover.xml b/app/src/main/res/layout/fragment_album_carousel_cover.xml
index fe9b40c7..cb5656c9 100644
--- a/app/src/main/res/layout/fragment_album_carousel_cover.xml
+++ b/app/src/main/res/layout/fragment_album_carousel_cover.xml
@@ -13,7 +13,7 @@
   -->
 
 
-<code.name.monkey.retromusic.views.WidthFitSquareLayout xmlns:android="http://schemas.android.com/apk/res/android"
+<androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:app="http://schemas.android.com/apk/res-auto"
     xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
@@ -21,12 +21,16 @@
     android:layout_gravity="center">
 
     <com.google.android.material.card.MaterialCardView
-        android:id="@+id/player_album_art_frame"
-        android:layout_width="match_parent"
-        android:layout_height="match_parent"
-        android:layout_gravity="center"
+        android:layout_width="0dp"
+        android:layout_height="0dp"
         app:cardCornerRadius="8dp"
-        app:cardUseCompatPadding="true">
+        app:cardElevation="8dp"
+        app:cardUseCompatPadding="true"
+        app:layout_constraintBottom_toBottomOf="parent"
+        app:layout_constraintDimensionRatio="1:1"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintTop_toTopOf="parent">
 
         <androidx.appcompat.widget.AppCompatImageView
             android:id="@+id/player_image"
@@ -34,7 +38,7 @@
             android:layout_height="match_parent"
             android:scaleType="centerCrop"
             tools:ignore="ContentDescription,UnusedAttribute"
-            tools:srcCompat="@tools:sample/backgrounds/scenic[3]" />
+            tools:srcCompat="@tools:sample/backgrounds/scenic[5]" />
 
     </com.google.android.material.card.MaterialCardView>
-</code.name.monkey.retromusic.views.WidthFitSquareLayout>
\ No newline at end of file
+</androidx.constraintlayout.widget.ConstraintLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/fragment_album_circle_cover.xml b/app/src/main/res/layout/fragment_album_circle_cover.xml
index 1c33abfd..ce28ec7c 100644
--- a/app/src/main/res/layout/fragment_album_circle_cover.xml
+++ b/app/src/main/res/layout/fragment_album_circle_cover.xml
@@ -1,24 +1,23 @@
 <?xml version="1.0" encoding="utf-8"?>
-<FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
+<androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:app="http://schemas.android.com/apk/res-auto"
     xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
     android:layout_height="match_parent">
 
-    <code.name.monkey.retromusic.views.WidthFitSquareLayout
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:layout_margin="16dp">
+    <code.name.monkey.retromusic.views.CircularImageView
+        android:id="@+id/player_image"
+        android:layout_width="0dp"
+        android:layout_height="0dp"
+        android:scaleType="centerCrop"
+        app:civ_border="false"
+        app:civ_shadow="false"
+        app:layout_constraintBottom_toBottomOf="parent"
+        app:layout_constraintDimensionRatio="1:1"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintTop_toTopOf="parent"
+        tools:ignore="ContentDescription,UnusedAttribute"
+        tools:srcCompat="@tools:sample/backgrounds/scenic[4]" />
 
-        <code.name.monkey.retromusic.views.CircularImageView
-            android:id="@+id/player_image"
-            android:layout_width="match_parent"
-            android:layout_height="match_parent"
-            android:scaleType="centerCrop"
-            app:civ_border="false"
-            app:civ_shadow="false"
-            tools:ignore="ContentDescription,UnusedAttribute"
-            tools:srcCompat="@tools:sample/backgrounds/scenic[4]" />
-
-    </code.name.monkey.retromusic.views.WidthFitSquareLayout>
-</FrameLayout>
\ No newline at end of file
+</androidx.constraintlayout.widget.ConstraintLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/fragment_album_flat_cover.xml b/app/src/main/res/layout/fragment_album_flat_cover.xml
index 1e9be1b2..58e570a6 100644
--- a/app/src/main/res/layout/fragment_album_flat_cover.xml
+++ b/app/src/main/res/layout/fragment_album_flat_cover.xml
@@ -1,20 +1,20 @@
 <?xml version="1.0" encoding="utf-8"?>
-<FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
+<androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
     xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
     android:layout_height="wrap_content">
 
-    <code.name.monkey.retromusic.views.WidthFitSquareLayout
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:layout_margin="12dp">
-
-        <androidx.appcompat.widget.AppCompatImageView
-            android:id="@+id/player_image"
-            android:layout_width="match_parent"
-            android:layout_height="match_parent"
-            android:scaleType="centerCrop"
-            tools:ignore="ContentDescription,UnusedAttribute"
-            tools:srcCompat="@tools:sample/backgrounds/scenic[6]" />
-    </code.name.monkey.retromusic.views.WidthFitSquareLayout>
-</FrameLayout>
\ No newline at end of file
+    <androidx.appcompat.widget.AppCompatImageView
+        android:id="@+id/player_image"
+        android:layout_width="0dp"
+        android:layout_height="0dp"
+        android:scaleType="centerCrop"
+        app:layout_constraintBottom_toBottomOf="parent"
+        app:layout_constraintDimensionRatio="1:1"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintTop_toTopOf="parent"
+        tools:ignore="ContentDescription,UnusedAttribute"
+        tools:srcCompat="@tools:sample/backgrounds/scenic[6]" />
+</androidx.constraintlayout.widget.ConstraintLayout>
diff --git a/app/src/main/res/layout/fragment_album_full_card_cover.xml b/app/src/main/res/layout/fragment_album_full_card_cover.xml
index 0828390d..d0052e21 100644
--- a/app/src/main/res/layout/fragment_album_full_card_cover.xml
+++ b/app/src/main/res/layout/fragment_album_full_card_cover.xml
@@ -1,16 +1,20 @@
 <?xml version="1.0" encoding="utf-8"?>
-<FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
+<androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:app="http://schemas.android.com/apk/res-auto"
     xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
     android:layout_height="match_parent">
 
     <com.google.android.material.card.MaterialCardView
-        android:layout_width="match_parent"
-        android:layout_height="match_parent"
+        android:layout_width="0dp"
+        android:layout_height="0dp"
         android:layout_margin="16dp"
         app:cardCornerRadius="16dp"
-        app:cardElevation="8dp">
+        app:cardElevation="8dp"
+        app:layout_constraintBottom_toBottomOf="parent"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintTop_toTopOf="parent">
 
         <androidx.appcompat.widget.AppCompatImageView
             android:id="@+id/player_image"
@@ -20,4 +24,4 @@
             tools:ignore="ContentDescription,UnusedAttribute"
             tools:srcCompat="@tools:sample/backgrounds/scenic" />
     </com.google.android.material.card.MaterialCardView>
-</FrameLayout>
\ No newline at end of file
+</androidx.constraintlayout.widget.ConstraintLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/fragment_album_full_cover.xml b/app/src/main/res/layout/fragment_album_full_cover.xml
index b2a3bf57..d1ca66a0 100644
--- a/app/src/main/res/layout/fragment_album_full_cover.xml
+++ b/app/src/main/res/layout/fragment_album_full_cover.xml
@@ -1,15 +1,20 @@
 <?xml version="1.0" encoding="utf-8"?>
-<FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
+<androidx.fragment.app.FragmentContainerView xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
     xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
     android:layout_height="match_parent">
 
     <androidx.appcompat.widget.AppCompatImageView
         android:id="@+id/player_image"
-        android:layout_width="match_parent"
-        android:layout_height="match_parent"
+        android:layout_width="0dp"
+        android:layout_height="0dp"
         android:scaleType="centerCrop"
+        app:layout_constraintBottom_toBottomOf="parent"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintTop_toTopOf="parent"
         tools:ignore="ContentDescription,UnusedAttribute"
         tools:srcCompat="@tools:sample/backgrounds/scenic[7]" />
 
-</FrameLayout>
\ No newline at end of file
+</androidx.fragment.app.FragmentContainerView>
\ No newline at end of file