diff --git a/app/build.gradle b/app/build.gradle
index 7f66b1fb..88b2dc8b 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -85,8 +85,11 @@ dependencies {
     androidTestImplementation 'androidx.test.espresso:espresso-core:3.3.0'
 
     // Database debugger via adb
-    // debugImplementation 'com.amitshekhar.android:debug-db:1.0.6'
+    debugImplementation 'com.amitshekhar.android:debug-db:1.0.6'
 
     // Square - Canary
     // debugImplementation 'com.squareup.leakcanary:leakcanary-android:2.7'
+
+    // Red screen of death
+    debugImplementation 'com.melegy.redscreenofdeath:red-screen-of-death:0.1.2'
 }
\ No newline at end of file
diff --git a/app/src/main/java/com/cappielloantonio/play/App.java b/app/src/main/java/com/cappielloantonio/play/App.java
index c7a025c1..5ba22013 100644
--- a/app/src/main/java/com/cappielloantonio/play/App.java
+++ b/app/src/main/java/com/cappielloantonio/play/App.java
@@ -8,6 +8,7 @@ import androidx.preference.PreferenceManager;
 
 import com.cappielloantonio.play.helper.ThemeHelper;
 import com.cappielloantonio.play.util.PreferenceUtil;
+import com.melegy.redscreenofdeath.RedScreenOfDeath;
 
 import org.jellyfin.apiclient.AppInfo;
 import org.jellyfin.apiclient.Jellyfin;
@@ -26,6 +27,7 @@ public class App extends Application {
     @Override
     public void onCreate() {
         super.onCreate();
+        RedScreenOfDeath.init(this);
 
         SharedPreferences sharedPreferences = PreferenceManager.getDefaultSharedPreferences(getApplicationContext());
         String themePref = sharedPreferences.getString("themePref", ThemeHelper.DEFAULT_MODE);
diff --git a/app/src/main/java/com/cappielloantonio/play/model/Album.java b/app/src/main/java/com/cappielloantonio/play/model/Album.java
index 7341ead8..94241e49 100644
--- a/app/src/main/java/com/cappielloantonio/play/model/Album.java
+++ b/app/src/main/java/com/cappielloantonio/play/model/Album.java
@@ -2,6 +2,7 @@ package com.cappielloantonio.play.model;
 
 import android.os.Parcel;
 import android.os.Parcelable;
+import android.util.Log;
 
 import androidx.annotation.NonNull;
 import androidx.room.ColumnInfo;
@@ -18,6 +19,8 @@ import java.util.UUID;
 
 @Entity(tableName = "album")
 public class Album implements Parcelable {
+    private static final String TAG = "Album";
+
     @Ignore
     public List<Song> songs;
 
diff --git a/app/src/main/java/com/cappielloantonio/play/model/Artist.java b/app/src/main/java/com/cappielloantonio/play/model/Artist.java
index 0b50f9f2..a694c387 100644
--- a/app/src/main/java/com/cappielloantonio/play/model/Artist.java
+++ b/app/src/main/java/com/cappielloantonio/play/model/Artist.java
@@ -2,6 +2,7 @@ package com.cappielloantonio.play.model;
 
 import android.os.Parcel;
 import android.os.Parcelable;
+import android.util.Log;
 
 import androidx.annotation.NonNull;
 import androidx.room.ColumnInfo;
@@ -18,6 +19,7 @@ import java.util.List;
 
 @Entity(tableName = "artist")
 public class Artist implements Parcelable {
+    private static final String TAG = "Artist";
     @Ignore
     public List<Genre> genres;
     @Ignore
diff --git a/app/src/main/res/layout/fragment_album_page.xml b/app/src/main/res/layout/fragment_album_page.xml
index d5598495..75fe44a7 100644
--- a/app/src/main/res/layout/fragment_album_page.xml
+++ b/app/src/main/res/layout/fragment_album_page.xml
@@ -17,7 +17,8 @@
 
     <androidx.coordinatorlayout.widget.CoordinatorLayout
         android:layout_width="match_parent"
-        android:layout_height="match_parent">
+        android:layout_height="match_parent"
+        android:paddingTop="8dp">
 
         <com.google.android.material.appbar.AppBarLayout
             android:id="@+id/app_bar_layout"
@@ -34,8 +35,8 @@
 
                 <ImageView
                     android:id="@+id/album_cover_image_view"
-                    android:layout_width="156dp"
-                    android:layout_height="156dp"
+                    android:layout_width="172dp"
+                    android:layout_height="172dp"
                     android:layout_marginStart="16dp"
                     app:layout_constraintTop_toTopOf="parent"
                     app:layout_constraintStart_toStartOf="parent"/>
@@ -86,30 +87,22 @@
                     app:layout_constraintStart_toEndOf="@+id/album_cover_image_view"
                     app:layout_constraintTop_toBottomOf="@+id/album_artist_label"/>
 
-                <ImageView
-                    android:id="@+id/download_icon_image_view"
-                    android:layout_width="28dp"
-                    android:layout_height="28dp"
+                <com.google.android.material.button.MaterialButton
+                    android:id="@+id/download_icon_button"
+                    style="@style/Widget.MaterialComponents.Button.UnelevatedButton"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
                     android:layout_marginStart="12dp"
-                    android:background="@drawable/ic_downloading"
-                    android:foreground="?android:attr/selectableItemBackgroundBorderless"
+                    android:paddingStart="16dp"
+                    android:paddingEnd="16dp"
+                    android:text="Download"
+                    android:textColor="@color/darkIconColor"
+                    android:textAllCaps="false"
+                    android:backgroundTint="@color/buttonBackgroundColor"
                     app:layout_constraintStart_toEndOf="@+id/album_cover_image_view"
-                    app:layout_constraintBottom_toBottomOf="@+id/album_cover_image_view"/>
-
-                <ToggleButton
-                    android:id="@+id/favorite_icon_image_view"
-                    android:layout_width="28dp"
-                    android:layout_height="28dp"
-                    android:background="@drawable/button_favorite_selector"
-                    android:foreground="?android:attr/selectableItemBackgroundBorderless"
-                    android:checked="false"
-                    android:gravity="center_vertical"
-                    android:layout_marginEnd="16dp"
-                    android:text=""
-                    android:textOff=""
-                    android:textOn=""
-                    app:layout_constraintEnd_toEndOf="parent"
-                    app:layout_constraintBottom_toBottomOf="@+id/album_cover_image_view"/>
+                    app:layout_constraintBottom_toBottomOf="@+id/album_cover_image_view"
+                    app:cornerRadius="18dp"
+                    app:elevation="0dp"/>
 
                 <View style="@style/Divider"
                     android:id="@+id/upper_button_divider"
@@ -147,8 +140,7 @@
                         app:iconGravity="textStart"
                         app:iconPadding="18dp"
                         app:icon="@drawable/ic_play"
-                        app:iconTint="@color/darkIconColor"
-                        app:elevation="0dp"/>
+                        app:iconTint="@color/darkIconColor"/>
 
                     <Button
                         android:id="@+id/album_page_shuffle_button"
diff --git a/app/src/main/res/layout/fragment_search.xml b/app/src/main/res/layout/fragment_search.xml
index 8e241c5e..d7a9d65b 100644
--- a/app/src/main/res/layout/fragment_search.xml
+++ b/app/src/main/res/layout/fragment_search.xml
@@ -48,8 +48,7 @@
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
             android:orientation="vertical"
-            android:paddingBottom="@dimen/global_padding_bottom"
-            android:visibility="gone">
+            android:paddingBottom="@dimen/global_padding_bottom">
 
             <!--  Songs  -->
             <LinearLayout
@@ -57,7 +56,8 @@
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
                 android:orientation="vertical"
-                android:paddingBottom="8dp">
+                android:paddingBottom="8dp"
+                android:visibility="gone">
 
                 <TextView
                     android:layout_width="match_parent"
@@ -88,7 +88,8 @@
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
                 android:orientation="vertical"
-                android:paddingBottom="8dp">
+                android:paddingBottom="8dp"
+                android:visibility="gone">
 
                 <TextView
                     android:layout_width="match_parent"
@@ -121,7 +122,8 @@
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
                 android:orientation="vertical"
-                android:paddingBottom="8dp">
+                android:paddingBottom="8dp"
+                android:visibility="gone">
 
                 <TextView
                     android:layout_width="match_parent"
@@ -154,7 +156,8 @@
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
                 android:orientation="vertical"
-                android:paddingBottom="8dp">
+                android:paddingBottom="8dp"
+                android:visibility="gone">
 
                 <TextView
                     android:layout_width="match_parent"