diff --git a/app/src/main/java/com/github/damontecres/wholphin/data/model/BaseItem.kt b/app/src/main/java/com/github/damontecres/wholphin/data/model/BaseItem.kt
index 869a0398..2d8c7baa 100644
--- a/app/src/main/java/com/github/damontecres/wholphin/data/model/BaseItem.kt
+++ b/app/src/main/java/com/github/damontecres/wholphin/data/model/BaseItem.kt
@@ -91,12 +91,16 @@ data class BaseItem(
             episodeCornerText =
                 data.indexNumber?.let { "E$it" }
                     ?: data.premiereDate?.let(::formatDateTime),
-            episdodeUnplayedCornerText =
-                data.indexNumber?.let { "E$it" }
-                    ?: data.userData
-                        ?.unplayedItemCount
-                        ?.takeIf { it > 0 }
-                        ?.let { abbreviateNumber(it) },
+            episodeUnplayedCornerText =
+                if (type == BaseItemKind.SERIES || type == BaseItemKind.SEASON || type == BaseItemKind.BOX_SET) {
+                    data.indexNumber?.let { "E$it" }
+                        ?: data.userData
+                            ?.unplayedItemCount
+                            ?.takeIf { it > 0 }
+                            ?.let { abbreviateNumber(it) }
+                } else {
+                    null
+                },
             quickDetails =
                 buildAnnotatedString {
                     val details =
@@ -207,6 +211,6 @@ val BaseItemDto.aspectRatioFloat: Float? get() = width?.let { w -> height?.let {
 @Immutable
 data class BaseItemUi(
     val episodeCornerText: String?,
-    val episdodeUnplayedCornerText: String?,
+    val episodeUnplayedCornerText: String?,
     val quickDetails: AnnotatedString,
 )
diff --git a/app/src/main/java/com/github/damontecres/wholphin/ui/Formatting.kt b/app/src/main/java/com/github/damontecres/wholphin/ui/Formatting.kt
index e4f107b4..1842620a 100644
--- a/app/src/main/java/com/github/damontecres/wholphin/ui/Formatting.kt
+++ b/app/src/main/java/com/github/damontecres/wholphin/ui/Formatting.kt
@@ -167,19 +167,19 @@ fun listToDotString(
         strings.forEachIndexed { index, string ->
             append(string)
             if (index != strings.lastIndex) dot()
-            communityRating?.let {
-                dot()
-                append(String.format(Locale.getDefault(), "%.1f", it))
-                appendInlineContent(id = "star")
-            }
-            criticRating?.let {
-                dot()
-                append("${it.toInt()}%")
-                if (it >= 60f) {
-                    appendInlineContent(id = "fresh")
-                } else {
-                    appendInlineContent(id = "rotten")
-                }
+        }
+        communityRating?.let {
+            dot()
+            append(String.format(Locale.getDefault(), "%.1f", it))
+            appendInlineContent(id = "star")
+        }
+        criticRating?.let {
+            dot()
+            append("${it.toInt()}%")
+            if (it >= 60f) {
+                appendInlineContent(id = "fresh")
+            } else {
+                appendInlineContent(id = "rotten")
             }
         }
     }
diff --git a/app/src/main/java/com/github/damontecres/wholphin/ui/detail/discover/DiscoverMovieDetailsHeader.kt b/app/src/main/java/com/github/damontecres/wholphin/ui/detail/discover/DiscoverMovieDetailsHeader.kt
index 79ccb8dd..d8647132 100644
--- a/app/src/main/java/com/github/damontecres/wholphin/ui/detail/discover/DiscoverMovieDetailsHeader.kt
+++ b/app/src/main/java/com/github/damontecres/wholphin/ui/detail/discover/DiscoverMovieDetailsHeader.kt
@@ -65,7 +65,7 @@ fun DiscoverMovieDetailsHeader(
         ) {
             val padding = 4.dp
             val details =
-                remember(movie) {
+                remember(movie, rating) {
                     buildList {
                         movie.releaseDate?.let(::add)
                         movie.runtime
@@ -89,6 +89,7 @@ fun DiscoverMovieDetailsHeader(
                             ?.releaseDates
                             ?.firstOrNull()
                             ?.certification
+                            ?.takeIf { it.isNotNullOrBlank() }
                             ?.let(::add)
                     }.let {
                         listToDotString(
diff --git a/app/src/main/java/com/github/damontecres/wholphin/ui/detail/discover/DiscoverSeriesDetails.kt b/app/src/main/java/com/github/damontecres/wholphin/ui/detail/discover/DiscoverSeriesDetails.kt
index dcaed1c5..64748bd0 100644
--- a/app/src/main/java/com/github/damontecres/wholphin/ui/detail/discover/DiscoverSeriesDetails.kt
+++ b/app/src/main/java/com/github/damontecres/wholphin/ui/detail/discover/DiscoverSeriesDetails.kt
@@ -463,7 +463,7 @@ fun DiscoverSeriesDetailsHeader(
         ) {
             val padding = 4.dp
             val details =
-                remember(series) {
+                remember(series, rating) {
                     buildList {
                         series.firstAirDate?.let(::add)
                         series.episodeRunTime
diff --git a/app/src/main/java/com/github/damontecres/wholphin/ui/main/HomePage.kt b/app/src/main/java/com/github/damontecres/wholphin/ui/main/HomePage.kt
index 9f67dd2e..cfb13ff7 100644
--- a/app/src/main/java/com/github/damontecres/wholphin/ui/main/HomePage.kt
+++ b/app/src/main/java/com/github/damontecres/wholphin/ui/main/HomePage.kt
@@ -326,7 +326,7 @@ fun HomePageContent(
                                             name = item?.data?.seriesName ?: item?.name,
                                             item = item,
                                             aspectRatio = AspectRatios.TALL,
-                                            cornerText = item?.ui?.episdodeUnplayedCornerText,
+                                            cornerText = item?.ui?.episodeUnplayedCornerText,
                                             played = item?.data?.userData?.played ?: false,
                                             favorite = item?.favorite ?: false,
                                             playPercent =