diff --git a/internal/templates/anime.templ b/internal/templates/anime.templ
index cd1462c..08948a2 100644
--- a/internal/templates/anime.templ
+++ b/internal/templates/anime.templ
@@ -241,18 +241,6 @@ templ dropdownStatusOption(animeID int, animeTitle string, animeTitleEnglish str
 	</button>
 }
 
-templ statusOption(anime jikan.Anime, status string, currentStatus string) {
-	<button
-		class={ "dropdown-item", templ.KV("active", status == currentStatus) }
-		hx-post="/api/watchlist"
-		hx-vals={ fmt.Sprintf(`{"anime_id": "%d", "anime_title": "%s", "anime_title_english": "%s", "anime_title_japanese": "%s", "anime_image": "%s", "status": "%s"}`, anime.MalID, anime.Title, anime.TitleEnglish, anime.TitleJapanese, anime.ImageURL(), status) }
-		hx-target="#watchlist-dropdown"
-		hx-swap="outerHTML swap:150ms"
-	>
-		{ formatStatus(status) }
-	</button>
-}
-
 func formatStatus(status string) string {
 	switch status {
 	case "watching":
diff --git a/internal/templates/notifications.templ b/internal/templates/notifications.templ
index dcd430a..c4f9837 100644
--- a/internal/templates/notifications.templ
+++ b/internal/templates/notifications.templ
@@ -15,8 +15,8 @@ templ Notifications(watching []WatchingAnimeWithDetails, activeTab string) {
 		<div class="notifications-page">
 			<h1>Notifications</h1>
 			<div class="status-tabs">
-				<a href="/notifications?tab=tracking" class={ tabClass(activeTab == "tracking") }>Tracking</a>
-				<a href="/notifications?tab=sequels" class={ tabClass(activeTab == "sequels") }>Sequels</a>
+				<a href="/notifications?tab=tracking" class={ activeClass(activeTab == "tracking") }>Tracking</a>
+				<a href="/notifications?tab=sequels" class={ activeClass(activeTab == "sequels") }>Sequels</a>
 			</div>
 
 			if activeTab == "sequels" {
@@ -147,10 +147,3 @@ templ NotificationCard(item WatchingAnimeWithDetails) {
 func displayTitle(entry database.GetWatchingAnimeRow) string {
 	return database.DisplayTitle(entry.TitleEnglish, entry.TitleJapanese, entry.TitleOriginal)
 }
-
-func truncate(s string, max int) string {
-	if len(s) <= max {
-		return s
-	}
-	return s[:max-3] + "..."
-}
diff --git a/internal/templates/watchlist.templ b/internal/templates/watchlist.templ
index 152320b..fa30217 100644
--- a/internal/templates/watchlist.templ
+++ b/internal/templates/watchlist.templ
@@ -20,19 +20,19 @@ templ Watchlist(entries []database.GetUserWatchListRow, layout string, currentSt
 					<input type="file" id="import-file" name="file" accept=".json" onchange="htmx.trigger('#import-form', 'submit')"/>
 				</form>
 				<div class="view-toggle">
-					<a href={ templ.URL(watchlistURL("grid", currentStatus, sortBy, sortOrder)) } class={ viewClass(layout == "grid") }>Grid</a>
-					<a href={ templ.URL(watchlistURL("table", currentStatus, sortBy, sortOrder)) } class={ viewClass(layout == "table") }>Table</a>
+					<a href={ templ.URL(watchlistURL("grid", currentStatus, sortBy, sortOrder)) } class={ activeClass(layout == "grid") }>Grid</a>
+					<a href={ templ.URL(watchlistURL("table", currentStatus, sortBy, sortOrder)) } class={ activeClass(layout == "table") }>Table</a>
 				</div>
 			</div>
 		</div>
 		<div class="status-tabs">
-			<a href={ templ.URL(watchlistURL(layout, "all", sortBy, sortOrder)) } class={ tabClass(currentStatus == "all") }>All</a>
-			<a href={ templ.URL(watchlistURL(layout, "watching", sortBy, sortOrder)) } class={ tabClass(currentStatus == "watching") }>Watching</a>
-			<a href={ templ.URL(watchlistURL(layout, "continuing", sortBy, sortOrder)) } class={ tabClass(currentStatus == "continuing") }>Continuing</a>
-			<a href={ templ.URL(watchlistURL(layout, "on_hold", sortBy, sortOrder)) } class={ tabClass(currentStatus == "on_hold") }>On hold</a>
-			<a href={ templ.URL(watchlistURL(layout, "plan_to_watch", sortBy, sortOrder)) } class={ tabClass(currentStatus == "plan_to_watch") }>Plan to watch</a>
-			<a href={ templ.URL(watchlistURL(layout, "dropped", sortBy, sortOrder)) } class={ tabClass(currentStatus == "dropped") }>Dropped</a>
-			<a href={ templ.URL(watchlistURL(layout, "completed", sortBy, sortOrder)) } class={ tabClass(currentStatus == "completed") }>Completed</a>
+			<a href={ templ.URL(watchlistURL(layout, "all", sortBy, sortOrder)) } class={ activeClass(currentStatus == "all") }>All</a>
+			<a href={ templ.URL(watchlistURL(layout, "watching", sortBy, sortOrder)) } class={ activeClass(currentStatus == "watching") }>Watching</a>
+			<a href={ templ.URL(watchlistURL(layout, "continuing", sortBy, sortOrder)) } class={ activeClass(currentStatus == "continuing") }>Continuing</a>
+			<a href={ templ.URL(watchlistURL(layout, "on_hold", sortBy, sortOrder)) } class={ activeClass(currentStatus == "on_hold") }>On hold</a>
+			<a href={ templ.URL(watchlistURL(layout, "plan_to_watch", sortBy, sortOrder)) } class={ activeClass(currentStatus == "plan_to_watch") }>Plan to watch</a>
+			<a href={ templ.URL(watchlistURL(layout, "dropped", sortBy, sortOrder)) } class={ activeClass(currentStatus == "dropped") }>Dropped</a>
+			<a href={ templ.URL(watchlistURL(layout, "completed", sortBy, sortOrder)) } class={ activeClass(currentStatus == "completed") }>Completed</a>
 		</div>
 		@ui.SortFilter(ui.SortFilterOptions{Sort: sortBy, Order: sortOrder, View: layout, Status: currentStatus})
 		if len(entries) == 0 {
@@ -103,14 +103,7 @@ templ Watchlist(entries []database.GetUserWatchListRow, layout string, currentSt
 	}
 }
 
-func viewClass(active bool) string {
-	if active {
-		return "active"
-	}
-	return ""
-}
-
-func tabClass(active bool) string {
+func activeClass(active bool) string {
 	if active {
 		return "active"
 	}