diff --git a/layouts/_default/list.html b/layouts/_default/list.html
index 2bd7b70..a9b13ec 100644
--- a/layouts/_default/list.html
+++ b/layouts/_default/list.html
@@ -14,23 +14,22 @@
                 {{ if .Params.date }}
                 <div class="article-date">{{ .Params.date.Format "2006-01-02" }}</div>
                 {{ end }}
-                {{ if .Params.categories }}
-                <ul class="article-categories">
-                    {{ range .Params.categories }}
-                        <li><a href="/categories/{{ . }}">{{ . }}</a></li>
+                <div class="article-taxonomies">
+                    {{ if .Params.categories }}
+                    <ul class="article-categories">
+                        {{ range .Params.categories }}
+                            <li><a href="/categories/{{ . }}">{{ . }}</a></li>
+                        {{ end }}
+                    </ul>
                     {{ end }}
-                </ul>
-                {{ end }}
-                {{ if and (.Params.categories) (.Params.tags) }} 
-                    |
-                {{ end }}
-                {{ if .Params.tags }}
-                <ul class="article-tags">
-                    {{ range .Params.tags }}
-                        <li><a href="/tags/{{ . }}">{{ . }}</a></li>
+                    {{ if .Params.tags }}
+                    <ul class="article-tags">
+                        {{ range .Params.tags }}
+                            <li><a href="/tags/{{ . }}">#{{ . }}</a></li>
+                        {{ end }}
+                    </ul>
                     {{ end }}
-                </ul>
-                {{ end }}
+                </div>
             </div>
         </div>
         {{ end }}
diff --git a/layouts/_default/single.html b/layouts/_default/single.html
index e0eef9f..2fc2550 100644
--- a/layouts/_default/single.html
+++ b/layouts/_default/single.html
@@ -11,23 +11,22 @@
             {{ if .Params.date }}
             <div class="article-date">{{ .Params.date.Format "2006-01-02" }}</div>
             {{ end }}
-            {{ if .Params.categories }}
-            <ul class="article-categories">
-                {{ range .Params.categories }}
-                    <li><a href="/categories/{{ . }}">{{ . }}</a></li>
+            <div class="article-taxonomies">
+                {{ if .Params.categories }}
+                <ul class="article-categories">
+                    {{ range .Params.categories }}
+                        <li><a href="/categories/{{ . }}">{{ . }}</a></li>
+                    {{ end }}
+                </ul>
                 {{ end }}
-            </ul>
-            {{ end }}
-            {{ if and (.Params.categories) (.Params.tags) }} 
-                |
-            {{ end }}
-            {{ if .Params.tags }}
-            <ul class="article-tags">
-                {{ range .Params.tags }}
-                    <li><a href="/tags/{{ . }}">{{ . }}</a></li>
+                {{ if .Params.tags }}
+                <ul class="article-tags">
+                    {{ range .Params.tags }}
+                        <li><a href="/tags/{{ . }}">#{{ . }}</a></li>
+                    {{ end }}
+                </ul>
                 {{ end }}
-            </ul>
-            {{ end }}
+            </div>
         </div>
     </article>
     {{ if .Site.DisqusShortname }}
diff --git a/layouts/index.html b/layouts/index.html
index 49df79e..8288b1a 100644
--- a/layouts/index.html
+++ b/layouts/index.html
@@ -20,23 +20,22 @@
             {{ if .Params.date }}
             <div class="article-date">{{ .Params.date.Format "2006-01-02" }}</div>
             {{ end }}
-            {{ if .Params.categories }}
-            <ul class="article-categories">
-                {{ range .Params.categories }}
-                    <li><a href="/categories/{{ . }}">{{ . }}</a></li>
+            <div class="article-taxonomies">
+                {{ if .Params.categories }}
+                <ul class="article-categories">
+                    {{ range .Params.categories }}
+                        <li><a href="/categories/{{ . }}">{{ . }}</a></li>
+                    {{ end }}
+                </ul>
                 {{ end }}
-            </ul>
-            {{ end }}
-            {{ if and (.Params.categories) (.Params.tags) }} 
-                |
-            {{ end }}
-            {{ if .Params.tags }}
-            <ul class="article-tags">
-                {{ range .Params.tags }}
-                    <li><a href="/tags/{{ . }}">{{ . }}</a></li>
+                {{ if .Params.tags }}
+                <ul class="article-tags">
+                    {{ range .Params.tags }}
+                        <li><a href="/tags/{{ . }}">#{{ . }}</a></li>
+                    {{ end }}
+                </ul>
                 {{ end }}
-            </ul>
-            {{ end }}
+            </div>
         </div>
     </article>
     {{ end }}
diff --git a/static/css/style.css b/static/css/style.css
index dc3a1b3..263082a 100644
--- a/static/css/style.css
+++ b/static/css/style.css
@@ -175,6 +175,10 @@ article header h1 a {
     margin-bottom: 1.5em;
 }
 
+.article-taxonomies {
+    display: inline;
+}
+
 .article-date {
     white-space: nowrap;
 }
@@ -183,27 +187,23 @@ article header h1 a {
     display: inline;
     list-style-type: none;
     padding: 0;
-    margin-right: 1em;
 }
 
 .article-categories li {
     display: inline;
-    margin-left: 1em;
+    margin-right: 1em;
 }
 
 .article-tags {
+    display: inline;
     list-style-type: none;
     padding: 0;
     margin: 0;
 }
 
-.article-tags li:first-of-type {
-    margin-left: 0;
-}
-
 .article-tags li {
     display: inline;
-    margin-left: 1em;
+    margin-right: 1em;
 }
 
 article img {