diff --git a/app/src/main/java/org/oxycblt/auxio/library/LibraryFragment.kt b/app/src/main/java/org/oxycblt/auxio/library/LibraryFragment.kt
index 78d0d892b..b7cab88ee 100644
--- a/app/src/main/java/org/oxycblt/auxio/library/LibraryFragment.kt
+++ b/app/src/main/java/org/oxycblt/auxio/library/LibraryFragment.kt
@@ -32,6 +32,7 @@ class LibraryFragment : Fragment() {
         val adapter = AlbumDataAdapter()
         binding.libraryRecycler.adapter = adapter
         binding.libraryRecycler.applyDivider()
+        binding.libraryRecycler.setHasFixedSize(true)
 
         libraryModel.albums.observe(
             viewLifecycleOwner,
diff --git a/app/src/main/java/org/oxycblt/auxio/songs/SongDataAdapter.kt b/app/src/main/java/org/oxycblt/auxio/songs/SongDataAdapter.kt
index 9fabcd681..ca4833e54 100644
--- a/app/src/main/java/org/oxycblt/auxio/songs/SongDataAdapter.kt
+++ b/app/src/main/java/org/oxycblt/auxio/songs/SongDataAdapter.kt
@@ -4,6 +4,7 @@ import android.view.LayoutInflater
 import android.view.ViewGroup
 import androidx.recyclerview.widget.DiffUtil
 import androidx.recyclerview.widget.ListAdapter
+import androidx.recyclerview.widget.RecyclerView
 import org.oxycblt.auxio.databinding.SongItemBinding
 import org.oxycblt.auxio.music.models.Song
 import org.oxycblt.auxio.recycler.SongViewHolder
@@ -17,15 +18,20 @@ class SongDataAdapter : ListAdapter<Song, SongViewHolder>(DiffCallback) {
         }
 
     override fun onCreateViewHolder(parent: ViewGroup, viewType: Int): SongViewHolder {
-        return SongViewHolder(
-            SongItemBinding.inflate(LayoutInflater.from(parent.context))
+        val binding = SongItemBinding.inflate(LayoutInflater.from(parent.context))
+
+        // Force the layout to be the width of the screen so that the cutoff can work properly.
+        binding.root.layoutParams = RecyclerView.LayoutParams(
+            RecyclerView.LayoutParams.MATCH_PARENT, RecyclerView.LayoutParams.WRAP_CONTENT
         )
+
+        return SongViewHolder(binding)
     }
 
     override fun onBindViewHolder(holder: SongViewHolder, position: Int) {
-        val Song = getItem(position)
+        val song = getItem(position)
 
-        holder.bind(Song)
+        holder.bind(song)
     }
 
     companion object DiffCallback : DiffUtil.ItemCallback<Song>() {
diff --git a/app/src/main/java/org/oxycblt/auxio/songs/SongsFragment.kt b/app/src/main/java/org/oxycblt/auxio/songs/SongsFragment.kt
index 0b8be1794..cc69bd361 100644
--- a/app/src/main/java/org/oxycblt/auxio/songs/SongsFragment.kt
+++ b/app/src/main/java/org/oxycblt/auxio/songs/SongsFragment.kt
@@ -30,6 +30,7 @@ class SongsFragment : Fragment() {
         val adapter = SongDataAdapter()
         binding.songRecycler.adapter = adapter
         binding.songRecycler.applyDivider()
+        binding.songRecycler.setHasFixedSize(true)
 
         songsModel.songs.observe(
             viewLifecycleOwner,
diff --git a/app/src/main/res/layout/album_item.xml b/app/src/main/res/layout/album_item.xml
index e7db34730..2efc19cc4 100644
--- a/app/src/main/res/layout/album_item.xml
+++ b/app/src/main/res/layout/album_item.xml
@@ -21,8 +21,6 @@
             android:layout_height="@dimen/cover_size_compact"
             android:contentDescription="@{@string/description_cover_art + album.title}"
             app:layout_constraintBottom_toBottomOf="parent"
-            app:layout_constraintEnd_toEndOf="parent"
-            app:layout_constraintHorizontal_bias="0.0"
             app:layout_constraintStart_toStartOf="parent"
             app:layout_constraintTop_toTopOf="parent"
             tools:src="@tools:sample/backgrounds/scenic"
diff --git a/app/src/main/res/layout/song_item.xml b/app/src/main/res/layout/song_item.xml
index 5403fe62f..40a92feb3 100644
--- a/app/src/main/res/layout/song_item.xml
+++ b/app/src/main/res/layout/song_item.xml
@@ -21,37 +21,35 @@
             android:layout_height="@dimen/cover_size_compact"
             android:contentDescription="@{@string/description_cover_art + song.album.title}"
             app:layout_constraintBottom_toBottomOf="parent"
-            app:layout_constraintEnd_toEndOf="parent"
-            app:layout_constraintHorizontal_bias="0.0"
             app:layout_constraintStart_toStartOf="parent"
             app:layout_constraintTop_toTopOf="parent"
             tools:src="@tools:sample/backgrounds/scenic"
             tools:srcCompat="@tools:sample/backgrounds/scenic" />
 
         <TextView
-            android:id="@+id/album_name"
-            android:layout_width="wrap_content"
+            android:id="@+id/song_name"
+            android:layout_width="0dp"
             android:layout_height="wrap_content"
             android:layout_marginStart="@dimen/margin_medium"
             android:text="@{song.title}"
             android:textAppearance="?android:attr/textAppearanceListItem"
             android:textColor="?android:attr/textColorPrimary"
-            app:layout_constraintBottom_toTopOf="@+id/song_count"
+            app:layout_constraintBottom_toTopOf="@+id/song_data"
             app:layout_constraintStart_toEndOf="@+id/cover"
             app:layout_constraintTop_toTopOf="parent"
             app:layout_constraintVertical_chainStyle="packed"
             tools:text="Song Name" />
 
         <TextView
-            android:id="@+id/song_count"
-            android:layout_width="wrap_content"
+            android:id="@+id/song_data"
+            android:layout_width="0dp"
             android:layout_height="wrap_content"
             android:layout_marginStart="@dimen/margin_medium"
             android:textAppearance="?android:attr/textAppearanceListItemSecondary"
             android:textColor="?android:attr/textColorSecondary"
             app:layout_constraintBottom_toBottomOf="parent"
             app:layout_constraintStart_toEndOf="@+id/cover"
-            app:layout_constraintTop_toBottomOf="@+id/album_name"
+            app:layout_constraintTop_toBottomOf="@+id/song_name"
             app:songData="@{song}"
             tools:text="Artist / Album" />
 
diff --git a/app/src/main/res/values/dimens.xml b/app/src/main/res/values/dimens.xml
index 07dec60a2..130355c68 100644
--- a/app/src/main/res/values/dimens.xml
+++ b/app/src/main/res/values/dimens.xml
@@ -8,7 +8,7 @@
     <dimen name="margin_medium">16dp</dimen>
 
     <dimen name="cover_size">64dp</dimen>
-    <dimen name="cover_size_compact">42dp</dimen>
+    <dimen name="cover_size_compact">44dp</dimen>
 
     <dimen name="elevation_normal">4dp</dimen>
 </resources>
\ No newline at end of file