diff --git a/app/src/main/java/org/oxycblt/auxio/MainFragment.kt b/app/src/main/java/org/oxycblt/auxio/MainFragment.kt
index 972dce6ff..8de267f57 100644
--- a/app/src/main/java/org/oxycblt/auxio/MainFragment.kt
+++ b/app/src/main/java/org/oxycblt/auxio/MainFragment.kt
@@ -55,9 +55,6 @@ class MainFragment : Fragment() {
             if (position > 0) {
                 tab.icon?.setTint(colorInactive)
             }
-
-            // Init the fragment
-            fragmentAt(position)
         }.attach()
 
         // Set up the selected/deselected colors
diff --git a/app/src/main/java/org/oxycblt/auxio/music/MusicUtils.kt b/app/src/main/java/org/oxycblt/auxio/music/MusicUtils.kt
index d5031f01b..1a210169f 100644
--- a/app/src/main/java/org/oxycblt/auxio/music/MusicUtils.kt
+++ b/app/src/main/java/org/oxycblt/auxio/music/MusicUtils.kt
@@ -82,7 +82,8 @@ fun TextView.bindArtistCounts(artist: Artist) {
     text = context.getString(R.string.format_double_counts, albums, songs)
 }
 
-// TODO: Add option to just list all genres.
+// Get the artist genre.
+// TODO: Stub, add option to list all genres instead of just the most prominent
 @BindingAdapter("artistGenre")
 fun TextView.getArtistGenre(artist: Artist) {
     text = artist.genre
diff --git a/app/src/main/res/layout/fragment_album_detail.xml b/app/src/main/res/layout/fragment_album_detail.xml
index 17671db24..18f871ca3 100644
--- a/app/src/main/res/layout/fragment_album_detail.xml
+++ b/app/src/main/res/layout/fragment_album_detail.xml
@@ -56,9 +56,10 @@
                     android:layout_marginEnd="@dimen/margin_medium"
                     android:layout_marginStart="@dimen/margin_medium"
                     android:text="@{album.name}"
+                    android:maxLines="1"
                     app:autoSizeMaxTextSize="@dimen/detail_header_size_max"
-                    app:autoSizeMinTextSize="@dimen/detail_header_size_min"
-                    app:autoSizeStepGranularity="@dimen/detail_header_size_increment"
+                    app:autoSizeMinTextSize="@dimen/generic_size_min"
+                    app:autoSizeStepGranularity="@dimen/generic_size_increment"
                     app:autoSizeTextType="uniform"
                     app:layout_constraintEnd_toEndOf="parent"
                     app:layout_constraintHorizontal_bias="0.5"
diff --git a/app/src/main/res/layout/fragment_artist_detail.xml b/app/src/main/res/layout/fragment_artist_detail.xml
index 7d01e2c73..53641bbe6 100644
--- a/app/src/main/res/layout/fragment_artist_detail.xml
+++ b/app/src/main/res/layout/fragment_artist_detail.xml
@@ -57,8 +57,8 @@
                     android:layout_marginStart="@dimen/margin_medium"
                     android:text="@{artist.name}"
                     app:autoSizeMaxTextSize="@dimen/detail_header_size_max"
-                    app:autoSizeMinTextSize="@dimen/detail_header_size_min"
-                    app:autoSizeStepGranularity="@dimen/detail_header_size_increment"
+                    app:autoSizeMinTextSize="@dimen/generic_size_min"
+                    app:autoSizeStepGranularity="@dimen/generic_size_increment"
                     app:autoSizeTextType="uniform"
                     app:layout_constraintEnd_toEndOf="parent"
                     app:layout_constraintHorizontal_bias="0.5"
diff --git a/app/src/main/res/layout/item_album_song.xml b/app/src/main/res/layout/item_album_song.xml
index 13d118ed8..c7d082f95 100644
--- a/app/src/main/res/layout/item_album_song.xml
+++ b/app/src/main/res/layout/item_album_song.xml
@@ -18,17 +18,22 @@
         android:focusable="true"
         android:padding="@dimen/padding_medium">
 
-        <TextView
+        <androidx.appcompat.widget.AppCompatTextView
             android:id="@+id/track_number"
-            android:layout_width="@dimen/track_number_size"
+            android:layout_width="@dimen/track_number_width"
             android:layout_height="wrap_content"
             android:text="@{String.valueOf(song.track)}"
             android:textAlignment="center"
             android:textAppearance="?android:attr/textAppearanceListItem"
             android:textColor="?android:attr/textColorTertiary"
-            android:textSize="@dimen/track_number_text_size"
+            android:textSize="@dimen/track_number_text_size_max"
             android:maxLines="1"
             android:contentDescription="@{@string/description_track_number(song.track)}"
+            app:autoSizeMaxTextSize="@dimen/detail_header_size_max"
+            app:autoSizeMinTextSize="@dimen/generic_size_min"
+            app:autoSizeStepGranularity="@dimen/generic_size_increment"
+            android:gravity="center"
+            app:autoSizeTextType="uniform"
             app:layout_constraintBottom_toBottomOf="parent"
             app:layout_constraintStart_toStartOf="parent"
             app:layout_constraintTop_toTopOf="parent"
diff --git a/app/src/main/res/values/dimens.xml b/app/src/main/res/values/dimens.xml
index 4026600cd..01bdbda29 100644
--- a/app/src/main/res/values/dimens.xml
+++ b/app/src/main/res/values/dimens.xml
@@ -16,12 +16,13 @@
     <dimen name="cover_size_large">80dp</dimen>
     <dimen name="cover_size_huge">230dp</dimen>
 
-    <dimen name="track_number_size">32dp</dimen>
-    <dimen name="track_number_text_size">20sp</dimen>
+    <dimen name="track_number_width">32dp</dimen>
+    <dimen name="track_number_text_size_max">20sp</dimen>
 
     <dimen name="detail_header_size_max">26sp</dimen>
-    <dimen name="detail_header_size_min">10sp</dimen>'
-    <dimen name="detail_header_size_increment">2sp</dimen>
+
+    <dimen name="generic_size_min">10sp</dimen>'
+    <dimen name="generic_size_increment">2sp</dimen>
 
     <dimen name="elevation_normal">4dp</dimen>
 </resources>
\ No newline at end of file