diff --git a/MediaManager/Pages/Shows.cshtml b/MediaManager/Pages/Shows.cshtml
index 74d9f77..1f9bae5 100644
--- a/MediaManager/Pages/Shows.cshtml
+++ b/MediaManager/Pages/Shows.cshtml
@@ -72,7 +72,25 @@
 					}
 				</td>
 				<td>
-					@Enum.GetName(show.WatchStatus)!.Replace("FirstWatch", "First Watch")
+					@switch (show.WatchStatus) {
+						case WatchStatus.Unwatched:
+							<span class="badge text-bg-danger">Unwatched</span>
+							break;
+						case WatchStatus.FirstWatch:
+							<span class="badge text-bg-warning">First Watch</span>
+							break;
+						case WatchStatus.Waiting:
+							<span class="badge text-bg-secondary">Waiting</span>
+							break;
+						case WatchStatus.Finished:
+							<span class="badge text-bg-success">Finished</span>
+							break;
+						case WatchStatus.Rewatch:
+							<span class="badge text-bg-primary">Rewatch</span>
+							break;
+						default:
+							throw new ArgumentOutOfRangeException();
+					}
 				</td>
 				<td class="td-progress">
 					<div class="progress position-relative">
@@ -107,7 +125,7 @@
 							<a class="btn btn-sm btn-success" href="/EditShow/@show.ShowId?action=rewatch">Start rewatch</a>
 						}
 						else if (show.WatchStatus == WatchStatus.Waiting) {
-							<a class="btn btn-sm btn-success" href="/EditShow/@show.ShowId?action=autoinc">New episode (W+1)</a>
+							<a class="btn btn-sm btn-secondary" href="/EditShow/@show.ShowId?action=autoinc">New episode</a>
 						}
 						<a class="btn btn-sm btn-primary" href="/EditShow/@show.ShowId">Edit</a>
 					</div>