diff --git a/sass/style.scss b/sass/style.scss
index b6ba1ac6f8922f068bc506ff4b68e772d4eba341..9175a06065dead3798370bf058f43014210d0528 100644
--- a/sass/style.scss
+++ b/sass/style.scss
@@ -140,3 +140,12 @@ nav input[type="search"] {
 .side-nav a.collapsible-header {
   margin: 0;
 }
+
+/* Article */
+h2#title {
+  margin-bottom: 0px;
+}
+
+.author {
+  margin-bottom: 1rem;
+}
diff --git a/templates/article.html.nunjucks b/templates/article.html.nunjucks
index 9f30159e2f27b698e75ad9c910dbbfb26579b5f5..c6571445f5e93f0b919e9972ccdc286205d0403f 100644
--- a/templates/article.html.nunjucks
+++ b/templates/article.html.nunjucks
@@ -1,7 +1,7 @@
 {% include "partials/header" %}
   <div class="section">
     <h2 id="title">{{ metadata.title }}</h2>
-    <span style="color: #a2a2a2">
+    <div class="author" style="color: #a2a2a2">
       {% if metadata.date %}
         <span style="color: #626262">{{ metadata.date.creation | date("D. M. YYYY") }}</span>
         napsal
@@ -12,13 +12,13 @@
       {% else %}
         Článek není v gitu
       {% endif %}
-    </span>
+    </div>
     <div>
-      {% if metadata.categories %}
-        {% for category in metadata.categories %}
-          <a href="/categories/{{ category }}"><div class="chip">{{ category }}</div></a>
-        {% endfor %}
-      {% endif %}
+      {% for tag in metadata.tags %}
+        {% if tag.url != "clanek" %}
+          <a href="{{ config.baseurl }}/tag/{{ tag.url }}"><div class="chip">{{ tag.text }}</div></a>
+        {% endif %}
+      {% endfor %}
 
       <article>
         <p>