diff --git a/_includes/comments.html b/_includes/comments.html
new file mode 100644
index 0000000..5afdf39
--- /dev/null
+++ b/_includes/comments.html
@@ -0,0 +1,6 @@
+{% if page.comments %}        
+  {% include disqus.html %}
+  {% include fb-comment.html %}
+  {% include staticman-comments.html %}
+  {% include utterances-comment.html %}
+{% endif %}
\ No newline at end of file
diff --git a/_includes/disqus.html b/_includes/disqus.html
index dd80975..3c55422 100644
--- a/_includes/disqus.html
+++ b/_includes/disqus.html
@@ -1,4 +1,5 @@
 {%- if site.disqus -%}
+<div class="disqus-comments">
 <div class="comments">
     <div id="disqus_thread"></div>
     <script type="text/javascript">
@@ -14,4 +15,5 @@
     </script>
     <noscript>Please enable JavaScript to view the <a href="http://disqus.com/?ref_noscript">comments powered by Disqus.</a></noscript>
 </div>
+</div>
 {%- endif -%}
diff --git a/_includes/staticman-comments.html b/_includes/staticman-comments.html
index d83d1c5..bd25de3 100644
--- a/_includes/staticman-comments.html
+++ b/_includes/staticman-comments.html
@@ -1,4 +1,5 @@
 {% if site.staticman.repository and site.staticman.branch %}
+<div class="staticman-comments">
   <div class="page__comments">
     <!-- Start static comments -->
     <div class="js-comments">
@@ -78,4 +79,5 @@
     }
   </script>
   <script src="{{ "/js/staticman.js" | relative_url }}"></script>
+</div>
 {% endif %}
diff --git a/_layouts/page.html b/_layouts/page.html
index 31d9d83..2650c12 100644
--- a/_layouts/page.html
+++ b/_layouts/page.html
@@ -8,16 +8,7 @@ layout: base
   <div class="row">
     <div class="col-lg-8 col-lg-offset-2 col-md-10 col-md-offset-1">
       {{ content }}
-	    {% if page.comments %}
-        <div class="disqus-comments">
-	        {% include disqus.html %}
-        </div>
-	        {% include fb-comment.html %}
-        <div class="staticman-comments">
-          {% include staticman-comments.html %}
-        </div>
-        {% include utterances-comment.html %}
-	    {% endif %}
+	  {% include comments.html %}
     </div>
   </div>
 </div>
diff --git a/_layouts/post.html b/_layouts/post.html
index c7bea3e..391f26a 100644
--- a/_layouts/post.html
+++ b/_layouts/post.html
@@ -64,17 +64,7 @@ layout: base
         </li>
         {% endif %}
       </ul>
-
-      {% if page.comments %}
-        <div class="disqus-comments">
-          {% include disqus.html %}
-        </div>
-          {% include fb-comment.html %}
-        <div class="staticman-comments">
-          {% include staticman-comments.html %}
-        </div>
-        {% include utterances-comment.html %}
-      {% endif %}
+	  {% include comments.html %}
     </div>
   </div>
 </div>