diff --git a/app/src/main/java/code/name/monkey/retromusic/adapter/HomeAdapter.kt b/app/src/main/java/code/name/monkey/retromusic/adapter/HomeAdapter.kt
index 1d617335..0db544e6 100644
--- a/app/src/main/java/code/name/monkey/retromusic/adapter/HomeAdapter.kt
+++ b/app/src/main/java/code/name/monkey/retromusic/adapter/HomeAdapter.kt
@@ -4,6 +4,7 @@ import android.util.DisplayMetrics
 import android.view.*
 import androidx.annotation.IntDef
 import androidx.appcompat.app.AppCompatActivity
+import androidx.appcompat.widget.AppCompatTextView
 import androidx.recyclerview.widget.*
 import code.name.monkey.retromusic.R
 import code.name.monkey.retromusic.adapter.album.AlbumFullWidthAdapter
@@ -34,9 +35,7 @@ class HomeAdapter(
 			else                        -> {
 				AlbumViewHolder(
 						LayoutInflater.from(activity).inflate(
-								R.layout.metal_section_recycler_view,
-								parent,
-								false
+								R.layout.metal_section_recycler_view, parent, false
 						)
 				)
 			}
@@ -46,7 +45,7 @@ class HomeAdapter(
 	override fun onBindViewHolder(holder: RecyclerView.ViewHolder, position: Int) {
 		println("ViewType ${getItemViewType(position)}")
 		when (getItemViewType(position)) {
-			RECENT_ALBUMS -> {
+			RECENT_ALBUMS  -> {
 				val viewHolder = holder as AlbumViewHolder
 				viewHolder.bindView(
 						list[position].arrayList.toAlbums(),
@@ -54,7 +53,7 @@ class HomeAdapter(
 						R.string.recent_added_albums
 				)
 			}
-			TOP_ALBUMS -> {
+			TOP_ALBUMS     -> {
 				val viewHolder = holder as AlbumViewHolder
 				viewHolder.bindView(
 						list[position].arrayList.toAlbums(),
@@ -70,7 +69,7 @@ class HomeAdapter(
 						R.string.recent_added_artists
 				)
 			}
-			TOP_ARTISTS -> {
+			TOP_ARTISTS    -> {
 				val viewHolder = holder as ArtistViewHolder
 
 				viewHolder.bindView(
@@ -79,7 +78,7 @@ class HomeAdapter(
 						R.string.most_played_artists
 				)
 			}
-			PLAYLISTS -> {
+			PLAYLISTS      -> {
 				val viewHolder = holder as PlaylistViewHolder
 				viewHolder.bindView(
 						list[position].arrayList.toPlaylist(),
@@ -135,10 +134,7 @@ class HomeAdapter(
 				recyclerView.apply {
 					show()
 					layoutManager = GridLayoutManager(
-							activity,
-							1,
-							GridLayoutManager.HORIZONTAL,
-							false
+							activity, 1, GridLayoutManager.HORIZONTAL, false
 					)
 					val artistAdapter = ArtistAdapter(
 							activity,
@@ -164,17 +160,10 @@ class HomeAdapter(
 					recyclerView.apply {
 						show()
 						val songAdapter = SongAdapter(
-								activity,
-								songs,
-								R.layout.item_album_card,
-								false,
-								null
+								activity, songs, R.layout.item_album_card, false, null
 						)
 						layoutManager = GridLayoutManager(
-								activity,
-								1,
-								GridLayoutManager.HORIZONTAL,
-								false
+								activity, 1, GridLayoutManager.HORIZONTAL, false
 						)
 						adapter = songAdapter
 
@@ -190,7 +179,7 @@ class HomeAdapter(
 	open inner class AbsHomeViewItem(itemView: View) : RecyclerView.ViewHolder(itemView) {
 		val recyclerView: RecyclerView = itemView.findViewById(R.id.recyclerView)
 		val titleContainer: View = itemView.findViewById(R.id.titleContainer)
-		val title: MaterialTextView = itemView.findViewById(R.id.title)
+		val title: AppCompatTextView = itemView.findViewById(R.id.title)
 		val text: MaterialTextView = itemView.findViewById(R.id.text)
 	}
 }
diff --git a/app/src/main/res/drawable/circle_progress.xml b/app/src/main/res/drawable/circle_progress.xml
index 6b5023bc..b7629944 100644
--- a/app/src/main/res/drawable/circle_progress.xml
+++ b/app/src/main/res/drawable/circle_progress.xml
@@ -16,7 +16,7 @@
         <shape
             android:dither="true"
             android:shape="ring"
-            android:thickness="4dp"
+            android:thickness="3dp"
             android:type="sweep"
             android:useLevel="false">
             <solid android:color="?colorOnSecondary" />
@@ -25,7 +25,7 @@
     <item android:id="@android:id/progress">
         <shape
             android:shape="ring"
-            android:thickness="4dp"
+            android:thickness="3dp"
             android:type="sweep"
             android:useLevel="true">
             <solid android:color="?colorAccent" />
diff --git a/app/src/main/res/font/circular.xml b/app/src/main/res/font/circular.xml
index d5fabd61..264d363c 100644
--- a/app/src/main/res/font/circular.xml
+++ b/app/src/main/res/font/circular.xml
@@ -1,16 +1,16 @@
 <?xml version="1.0" encoding="utf-8"?>
-<font-family xmlns:android="http://schemas.android.com/apk/res/android">
+<font-family xmlns:app="http://schemas.android.com/apk/res-auto">
     <font
-        android:font="@font/circular_std_book"
-        android:fontStyle="normal"
-        android:fontWeight="400" />
+        app:font="@font/circular_std_book"
+        app:fontStyle="normal"
+        app:fontWeight="400" />
     <font
-        android:font="@font/circular_std_medium"
-        android:fontStyle="normal"
-        android:fontWeight="600" />
+        app:font="@font/circular_std_medium"
+        app:fontStyle="normal"
+        app:fontWeight="600" />
 
     <font
-        android:font="@font/circular_std_black"
-        android:fontWeight="900" />
+        app:font="@font/circular_std_black"
+        app:fontWeight="900" />
 
 </font-family>
\ No newline at end of file
diff --git a/app/src/main/res/layout/section_recycler_view.xml b/app/src/main/res/layout/section_recycler_view.xml
index d6bcdd55..b5381f08 100644
--- a/app/src/main/res/layout/section_recycler_view.xml
+++ b/app/src/main/res/layout/section_recycler_view.xml
@@ -39,10 +39,10 @@
 
             <com.google.android.material.textview.MaterialTextView
                 android:id="@+id/text"
-                android:visibility="gone"
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
                 android:textAppearance="@style/TextViewCaption"
+                android:visibility="gone"
                 tools:text="@tools:sample/full_names" />
         </LinearLayout>
 
diff --git a/app/src/main/res/layout/sliding_music_panel_layout.xml b/app/src/main/res/layout/sliding_music_panel_layout.xml
index 90ac01af..6cb3e136 100644
--- a/app/src/main/res/layout/sliding_music_panel_layout.xml
+++ b/app/src/main/res/layout/sliding_music_panel_layout.xml
@@ -26,6 +26,7 @@
         app:behavior_hideable="false"
         app:behavior_peekHeight="0dp"
         app:cardBackgroundColor="?colorSecondary"
+        app:cardCornerRadius="0dp"
         app:cardUseCompatPadding="false"
         app:layout_behavior="com.google.android.material.bottomsheet.BottomSheetBehavior"
         app:strokeWidth="0dp">
@@ -54,12 +55,12 @@
         android:elevation="0dp"
         android:visibility="gone"
         app:itemBackground="@drawable/bottom_navigation_item_background"
+        app:itemHorizontalTranslationEnabled="false"
         app:itemIconTint="@drawable/bottom_navigation_item_colors"
         app:itemTextAppearanceActive="@style/BottomSheetItemTextAppearanceActive"
         app:itemTextAppearanceInactive="@style/BottomSheetItemTextAppearanceInactive"
         app:itemTextColor="@drawable/bottom_navigation_item_colors"
         app:labelVisibilityMode="labeled"
-        app:itemHorizontalTranslationEnabled="false"
         app:menu="@menu/bottom_navigation_main"
         tools:layout_height="56dp" />