diff --git a/templates/components/post_renderer.html b/templates/components/post_renderer.html
new file mode 100644
index 0000000..eb9ed22
--- /dev/null
+++ b/templates/components/post_renderer.html
@@ -0,0 +1,9 @@
+{% macro render_post(post) %}
+<article class="blog-content">
+  {% if post.template %} {% include post.template %} {% endif %} {{ post.content
+  | safe }}
+</article>
+
+<hr class="post-divider post-divider-expanded" />
+
+{% endmacro %}
diff --git a/templates/post_detail.html b/templates/post_detail.html
index f1edf9b..df855ed 100644
--- a/templates/post_detail.html
+++ b/templates/post_detail.html
@@ -1,5 +1,7 @@
 {% extends "base.html" %} {% block title %}{{ post.title }} - Simple Blog
-Template{% endblock %} {% block content %}
+Template{% endblock %} {% block content %} {% from
+"components/post_renderer.html" import render_post %}
+
 <div class="row">
   <div class="col-lg-12">
     <h1 class="post-title">{{ post.title }}</h1>
@@ -9,7 +11,7 @@ Template{% endblock %} {% block content %}
       <span class="glyphicon glyphicon-time"></span> Posted on {{ post.date }}
     </p>
     <hr />
-    {% if post.id == 8 %}
+    {{ render_post(post, post.displayall) }} {% if post.id == 8 %}
     <div class="background-svg">
       <img src="{{ url_for('static', filename='animation.svg') }}" alt="" />
       <br />
@@ -19,8 +21,6 @@ Template{% endblock %} {% block content %}
 
     <div class="blog-content">{{ post.content | safe }}</div>
 
-    {% if post.template} {% include post.template %} {% endif %}
-
     <a href="{{ url_for('home') }}" class="btn btn-default btn-custom"
       >← Back to Posts</a
     >