diff --git a/web/templates/monitoring/taglist.tmpl b/web/templates/monitoring/taglist.tmpl
index 7831a64..7d762c3 100644
--- a/web/templates/monitoring/taglist.tmpl
+++ b/web/templates/monitoring/taglist.tmpl
@@ -3,19 +3,31 @@
         <div class="row  justify-content-center">
             <div class="col-10">
             {{ range $tagType, $tagList := .Infos.tagmap }}
-                <div class="my-3 p-2 bg-secondary text-white text-capitalize">
-                {{ $tagType }}
+                <div class="my-3 p-2 bg-secondary rounded text-white"> <!-- text-capitalize -->
+                    Tag Type: <b>{{ $tagType }}</b>
+                    <span style="float: right; padding-bottom: 0.4rem; padding-top: 0.4rem;" class="badge bg-light text-secondary">
+                        {{len $tagList}} Tag{{if ne (len $tagList) 1}}s{{end}}
+                    </span>
                 </div>
                 {{ range $tagList }}
                     {{if eq .scope "global"}}
-                        <a style="background-color:#c85fc8;" class="btn btn-lg" href="/monitoring/jobs/?tag={{ .id }}" role="button">
-                            {{ .name }} <span class="badge bg-light text-dark">{{ .count }}</span> </a>
+                        <a class="btn btn-outline-secondary" href="/monitoring/jobs/?tag={{ .id }}" role="button">
+                            {{ .name }}
+                            <span class="badge bg-primary mr-1">{{ .count }} Job{{if ne .count 1}}s{{end}}</span>
+                            <span style="background-color:#c85fc8;" class="badge text-dark">Global</span>
+                        </a>
                     {{else if eq .scope "admin"}}
-                        <a style="background-color:#19e5e6;" class="btn btn-lg" href="/monitoring/jobs/?tag={{ .id }}" role="button">
-                            {{ .name }} <span class="badge bg-light text-dark">{{ .count }}</span> </a>
+                        <a class="btn btn-outline-secondary" href="/monitoring/jobs/?tag={{ .id }}" role="button">
+                            {{ .name }}
+                            <span class="badge bg-primary mr-1">{{ .count }} Job{{if ne .count 1}}s{{end}}</span>
+                            <span style="background-color:#19e5e6;" class="badge text-dark">Admin</span>
+                        </a>
                     {{else}}
-                        <a class="btn btn-lg btn-warning" href="/monitoring/jobs/?tag={{ .id }}" role="button">
-                            {{ .name }} <span class="badge bg-light text-dark">{{ .count }}</span> </a>
+                        <a class="btn btn-outline-secondary" href="/monitoring/jobs/?tag={{ .id }}" role="button">
+                            {{ .name }}
+                            <span class="badge bg-primary mr-1">{{ .count }} Job{{if ne .count 1}}s{{end}}</span>
+                            <span class="badge bg-warning text-dark">Private</span>
+                        </a>
                     {{end}}
                 {{end}}
             {{end}}