diff --git a/archivebox/themes/admin/base.html b/archivebox/themes/admin/base.html
index 5870f4ae..2802555e 100644
--- a/archivebox/themes/admin/base.html
+++ b/archivebox/themes/admin/base.html
@@ -88,6 +88,7 @@
         <div id="user-tools">
             <a href="{% url 'admin:Add' %}">Add ➕</a> /
             <a href="{% url 'Home' %}">Snapshots</a> /
+            <a href="/admin/core/tag/">Tags</a> /
             <a href="/admin/auth/user/">Users</a> /
             <a href="{% url 'Docs' %}">Docs</a>
              &nbsp; &nbsp;
diff --git a/archivebox/themes/default/core/snapshot_list.html b/archivebox/themes/default/core/snapshot_list.html
index 8cb4cec5..a5beceb8 100644
--- a/archivebox/themes/default/core/snapshot_list.html
+++ b/archivebox/themes/default/core/snapshot_list.html
@@ -14,7 +14,7 @@
                 <tr>
                     <th style="width: 100px;">Bookmarked</th>
                     <th style="width: 26vw;">Saved Link ({{num_links}})</th>
-                    <th style="width: 50px">Files</th>
+                    <th style="width: 140px">Files</th>
                     <th style="width: 16vw;whitespace:nowrap;overflow-x:hidden;">Original URL</th>
                 </tr>
             </thead>
@@ -30,7 +30,7 @@
                             {% endif %}
                             <a href="archive/{{link.timestamp}}/index.html" title="{{link.title}}">
                                 <span data-title-for="{{link.url}}" data-archived="{{link.is_archived}}">{{link.title|default:'Loading...'}}</span>
-                                <small style="float:right">{{link.tags|default:''}}</small>
+                                <small style="float:right">{{link.tags_str}}</small>
                             </a>
                         </td>
                         <td>
@@ -61,4 +61,4 @@
             </span>
             <br>
     </center>
-        {% endblock %}
\ No newline at end of file
+        {% endblock %}
diff --git a/archivebox/themes/default/static/admin.css b/archivebox/themes/default/static/admin.css
index 932f380b..2a8d7d0d 100644
--- a/archivebox/themes/default/static/admin.css
+++ b/archivebox/themes/default/static/admin.css
@@ -224,9 +224,10 @@ body.model-snapshot.change-list #content .object-tools {
 }
 
 .tags > a > .tag {
-  border: 1px solid;
-  border-radius: 10px;
-  background-color: #f3f3f3;
-  padding: 3px;
+    float: right;
+    border-radius: 5px;
+    background-color: #bfdfff;
+    padding: 2px 5px;
+    margin-left: 4px;
+    margin-top: 1px;
 }
-