diff --git a/source/_layouts/default.html.twig b/source/_layouts/default.html.twig
index 403da0ec2..55ed12bcc 100644
--- a/source/_layouts/default.html.twig
+++ b/source/_layouts/default.html.twig
@@ -27,11 +27,11 @@
-
- {% block content_wrapper %}
+ {% block content_wrapper %}
+
{% block content %}{% endblock %}
- {% endblock %}
-
+
+ {% endblock %}
{% include 'sidebar' %}
{# .row #}
diff --git a/source/_layouts/post.html.twig b/source/_layouts/post.html.twig
index f7e377dd8..42a5cb95a 100644
--- a/source/_layouts/post.html.twig
+++ b/source/_layouts/post.html.twig
@@ -1,24 +1,28 @@
{% extends 'default' %}
{% block content_wrapper %}
- {% include 'post-header' %}
- {% block content %}{% endblock %}
+
- {% if page.tags %}
-
- Tags:
- {% for tag in page.tags %}
- {{ tag }}{% if not loop.last %}, {% endif %}
- {% endfor %}
-
- {% endif %}
+ {% include 'post-header' %}
+ {% block content %}{% endblock %}
- {% include 'about-author' %}
+ {% if page.tags %}
+
+ Tags:
+ {% for tag in page.tags %}
+ {{ tag }}{% if not loop.last %}, {% endif %}
+ {% endfor %}
+
+ {% endif %}
- {% if page.next_post or page.previous_post %}
-
- {% endif %}
+ {% include 'about-author' %}
+
+ {% if page.next_post or page.previous_post %}
+
+ {% endif %}
+
+
{% endblock %}
\ No newline at end of file