diff --git a/plumage/templates/article.html b/plumage/templates/article.html
index a453462f..61f8ae01 100644
--- a/plumage/templates/article.html
+++ b/plumage/templates/article.html
@@ -13,85 +13,82 @@
{% endblock %}
{% block right_sidebar %}
-
-
+
+
+ {{ article.locale_date }}
+
+ {% if AUTHOR_SAVE_AS and article.authors %}
- {{ article.locale_date }}
+
+ By
+ {% for author in article.authors %}
+ {{ author.name }}
+ {% endfor %}
+
- {% if AUTHOR_SAVE_AS and article.authors %}
-
-
- By
- {% for author in article.authors %}
- {{ author.name }}
- {% endfor %}
-
-
- {% endif %}
- {% if article.category or article.tags %}
-
-
- {% if article.category %}
- {% for category, articles in categories %}
- {% if category.url == article.category.url %}
- {% set article_counter = articles|length() %}
-
-
- {{ article.category }}
-
-
- {% endif %}
- {% endfor %}
- {% endif %}
- {% if article.tags %}
- {% set article_tags = [] %}
- {% for tag, articles in tags %}
- {% for t in article.tags %}
- {% if tag.url == t.url %}
- {% if article_tags.append({'name': tag.name, 'url': tag.url, 'articles': articles|length()}) %}
- {% endif %}
- {% endif %}
- {% endfor %}
- {% endfor %}
- {# Sort by tag frequency, then alphabetically #}
- {% for tag in article_tags|sort(attribute='name')|sort(reverse=True, attribute='articles') %}
+ {% endif %}
+ {% if article.category or article.tags %}
+
+
+ {% if article.category %}
+ {% for category, articles in categories %}
+ {% if category.url == article.category.url %}
+ {% set article_counter = articles|length() %}
- {{ m.render_tag(tag) }}
+
+ {{ article.category }}
+
+ {% endif %}
+ {% endfor %}
+ {% endif %}
+ {% if article.tags %}
+ {% set article_tags = [] %}
+ {% for tag, articles in tags %}
+ {% for t in article.tags %}
+ {% if tag.url == t.url %}
+ {% if article_tags.append({'name': tag.name, 'url': tag.url, 'articles': articles|length()}) %}
+ {% endif %}
+ {% endif %}
{% endfor %}
- {% endif %}
-
-
- {% endif %}
- {% if ARTICLE_EDIT_LINK %}
-
- Found a typo? Fix it now:
- Edit article on GitHub
-
- {% endif %}
- {% if article.prev_article or article.next_article %}
-
-
-
- ← Older
-
-
- Newer →
-
-
-
- {% endif %}
-
-
+ {% endfor %}
+ {# Sort by tag frequency, then alphabetically #}
+ {% for tag in article_tags|sort(attribute='name')|sort(reverse=True, attribute='articles') %}
+ {{ m.render_tag(tag) }}
+ {% endfor %}
+ {% endif %}
+
+
+ {% endif %}
+ {% if ARTICLE_EDIT_LINK %}
+
+ Found a typo? Fix it now:
+
+ Edit article on GitHub
+
+ {% endif %}
+ {% if article.prev_article or article.next_article %}
+
+
+
+ ← Older
+
+
+ Newer →
+
+
+
+ {% endif %}
+
{% endblock %}
{% block content %}
{% import 'translations.html' as translations with context %}
diff --git a/plumage/templates/base.html b/plumage/templates/base.html
index 38a1d2f8..a199d534 100644
--- a/plumage/templates/base.html
+++ b/plumage/templates/base.html
@@ -164,8 +164,12 @@