diff --git a/web/templates/manage.html b/web/templates/manage.html
index 8b83596..2aa11b8 100644
--- a/web/templates/manage.html
+++ b/web/templates/manage.html
@@ -20,7 +20,9 @@
                     <a href="{{ .URL }}">{{ niceURL .URL }}</a>
                 </td>
                 <td>
-                    {{ join .Tags ", " }}
+                    {{ range .Tags }}
+                    <span class="label primary">{{ . }}</span>
+                    {{ end }}
                 </td>
                 <td class="show-for-large">{{ (nicetime .TimestampCreated).HumanDuration }} ago</td>
                 <td class="show-for-large">{{ (nicetime .TimestampLastScraped).HumanDuration }} ago</td>
diff --git a/web/templates/tags_widget.html b/web/templates/tags_widget.html
index 1df50fc..4788eed 100644
--- a/web/templates/tags_widget.html
+++ b/web/templates/tags_widget.html
@@ -12,11 +12,12 @@
         <div class="small-12 large-6 cell">
             {{ range .tags }}
             <a href="#"
+               class=""
                title="remove {{ . }}"
                hx-trigger="click"
                hx-target="#label-widget"
                hx-post="/tags?remove={{ . }}">[-]</a>
-                {{ . }}
+               <span class="label primary">{{ . }}</span> 
             
             {{ end }}
             <input type="hidden" name="tags_hidden" value="{{ .tags_hidden }}">
diff --git a/web/web.go b/web/web.go
index 034170b..55d00d8 100644
--- a/web/web.go
+++ b/web/web.go
@@ -250,7 +250,7 @@ func cleanupTags(tags []string) []string {
 	keys := make(map[string]struct{})
 	for _, k := range tags {
 		if k != "" && k != "|" {
-			keys[k] = struct{}{}
+			keys[strings.ToLower(k)] = struct{}{}
 		}
 	}
 	out := []string{}