diff --git a/app/src/main/java/com/cappielloantonio/tempo/ui/fragment/AlbumPageFragment.java b/app/src/main/java/com/cappielloantonio/tempo/ui/fragment/AlbumPageFragment.java
index d0b417d7..3d3645ed 100644
--- a/app/src/main/java/com/cappielloantonio/tempo/ui/fragment/AlbumPageFragment.java
+++ b/app/src/main/java/com/cappielloantonio/tempo/ui/fragment/AlbumPageFragment.java
@@ -212,14 +212,6 @@ public class AlbumPageFragment extends Fragment implements ClickCallback {
         bind.animToolbar.setNavigationOnClickListener(v -> activity.navController.navigateUp());
 
         Objects.requireNonNull(bind.animToolbar.getOverflowIcon()).setTint(requireContext().getResources().getColor(R.color.titleTextColor, null));
-
-        bind.albumOtherInfoButton.setOnClickListener(v -> {
-            if (bind.albumDetailView.getVisibility() == View.GONE) {
-                bind.albumDetailView.setVisibility(View.VISIBLE);
-            } else if (bind.albumDetailView.getVisibility() == View.VISIBLE) {
-                bind.albumDetailView.setVisibility(View.GONE);
-            }
-        });
     }
 
     private void initAlbumInfoTextButton() {
diff --git a/app/src/main/res/layout/fragment_album_page.xml b/app/src/main/res/layout/fragment_album_page.xml
index 411d5c1c..1be64373 100644
--- a/app/src/main/res/layout/fragment_album_page.xml
+++ b/app/src/main/res/layout/fragment_album_page.xml
@@ -59,23 +59,6 @@
                     app:layout_constraintStart_toStartOf="@+id/album_cover_image_view"
                     app:layout_constraintTop_toBottomOf="@+id/album_cover_image_view" />
 
-                <FrameLayout
-                    android:id="@+id/album_other_info_button"
-                    android:layout_width="wrap_content"
-                    android:layout_height="wrap_content"
-                    android:layout_marginTop="12dp"
-                    android:foreground="?android:attr/selectableItemBackgroundBorderless"
-                    app:layout_constraintBottom_toBottomOf="@+id/album_name_label"
-                    app:layout_constraintEnd_toEndOf="parent"
-                    app:layout_constraintStart_toEndOf="@+id/album_name_label"
-                    app:layout_constraintTop_toTopOf="@+id/album_name_label">
-
-                    <ImageView
-                        android:layout_width="24dp"
-                        android:layout_height="24dp"
-                        android:background="@drawable/ic_arrow_down" />
-                </FrameLayout>
-
                 <TextView
                     android:id="@+id/album_artist_label"
                     style="@style/LabelMedium"
@@ -87,8 +70,8 @@
                     android:maxLines="1"
                     android:text="@string/label_placeholder"
                     android:textAlignment="center"
-                    app:layout_constraintEnd_toEndOf="parent"
-                    app:layout_constraintStart_toStartOf="parent"
+                    app:layout_constraintEnd_toEndOf="@+id/album_name_label"
+                    app:layout_constraintStart_toStartOf="@+id/album_name_label"
                     app:layout_constraintTop_toBottomOf="@+id/album_name_label" />
 
                 <TextView
@@ -100,23 +83,10 @@
                     android:layout_marginEnd="18dp"
                     android:text="@string/label_placeholder"
                     android:textAlignment="center"
-                    app:layout_constraintEnd_toEndOf="parent"
-                    app:layout_constraintStart_toStartOf="parent"
+                    app:layout_constraintEnd_toEndOf="@+id/album_artist_label"
+                    app:layout_constraintStart_toStartOf="@+id/album_artist_label"
                     app:layout_constraintTop_toBottomOf="@+id/album_artist_label" />
 
-                <androidx.constraintlayout.widget.ConstraintLayout
-                    android:id="@+id/album_detail_view"
-                    android:layout_width="match_parent"
-                    android:layout_height="wrap_content"
-                    android:animateLayoutChanges="true"
-                    android:paddingTop="12dp"
-                    android:paddingBottom="8dp"
-                    android:visibility="gone"
-                    app:layout_constraintEnd_toEndOf="parent"
-                    app:layout_constraintStart_toStartOf="parent"
-                    app:layout_constraintTop_toBottomOf="@+id/album_release_year_label"
-                    tools:visibility="visible">
-
                     <TextView
                         android:id="@+id/album_genres_textview"
                         style="@style/LabelSmall"
@@ -127,9 +97,9 @@
                         android:text="@string/label_placeholder"
                         android:textAlignment="center"
                         android:visibility="gone"
-                        app:layout_constraintEnd_toEndOf="parent"
-                        app:layout_constraintStart_toStartOf="parent"
-                        app:layout_constraintTop_toTopOf="parent"
+                        app:layout_constraintEnd_toEndOf="@+id/album_release_year_label"
+                        app:layout_constraintStart_toStartOf="@+id/album_release_year_label"
+                        app:layout_constraintTop_toBottomOf="@+id/album_release_year_label"
                         tools:visibility="visible" />
 
                     <TextView
@@ -142,8 +112,8 @@
                         android:paddingVertical="2dp"
                         android:text="@string/label_placeholder"
                         android:textAlignment="center"
-                        app:layout_constraintEnd_toEndOf="parent"
-                        app:layout_constraintStart_toStartOf="parent"
+                        app:layout_constraintEnd_toEndOf="@+id/album_genres_textview"
+                        app:layout_constraintStart_toStartOf="@+id/album_genres_textview"
                         app:layout_constraintTop_toBottomOf="@+id/album_genres_textview" />
 
                     <TextView
@@ -156,8 +126,8 @@
                         android:justificationMode="inter_word"
                         android:text="@string/label_placeholder"
                         android:textAlignment="center"
-                        app:layout_constraintEnd_toEndOf="parent"
-                        app:layout_constraintStart_toStartOf="parent"
+                        app:layout_constraintEnd_toEndOf="@+id/album_song_count_duration_textview"
+                        app:layout_constraintStart_toStartOf="@+id/album_song_count_duration_textview"
                         app:layout_constraintTop_toBottomOf="@+id/album_song_count_duration_textview" />
 
                     <TextView
@@ -171,13 +141,10 @@
                         android:text="@string/label_placeholder"
                         android:textAlignment="center"
                         android:visibility="gone"
-                        app:layout_constraintEnd_toEndOf="parent"
-                        app:layout_constraintStart_toStartOf="parent"
+                        app:layout_constraintEnd_toEndOf="@+id/album_notes_textview"
+                        app:layout_constraintStart_toStartOf="@+id/album_notes_textview"
                         app:layout_constraintTop_toBottomOf="@+id/album_notes_textview" />
 
-
-                </androidx.constraintlayout.widget.ConstraintLayout>
-
                 <View
                     android:id="@+id/upper_button_divider"
                     style="@style/Divider"
@@ -186,7 +153,7 @@
                     android:layout_marginEnd="18dp"
                     app:layout_constraintEnd_toEndOf="parent"
                     app:layout_constraintStart_toStartOf="parent"
-                    app:layout_constraintTop_toBottomOf="@+id/album_detail_view" />
+                    app:layout_constraintTop_toBottomOf="@+id/album_notes_textview" />
 
                 <LinearLayout
                     android:id="@+id/album_page_button_layout"