diff --git a/layouts/index.html b/layouts/_default/index.html
similarity index 100%
rename from layouts/index.html
rename to layouts/_default/index.html
diff --git a/layouts/_default/single.html b/layouts/_default/single.html
index 3518de1..dfe5e2b 100644
--- a/layouts/_default/single.html
+++ b/layouts/_default/single.html
@@ -1,12 +1,9 @@
 {{ partial "header.html" . }}
-<div class="main column">
-    <div class="container">
-        <div class="content">
-            {{ partial "page-heading.html" . }}
-            <div class="markdown">
-                {{ partial "content" . }}
-            </div>
-        </div>
-    </div>
-</div>
+
+{{ if in .Site.Params.blogs .Section }}
+{{ partial "blog_single.html" . }}
+{{ else }}
+{{ partial "base_single.html" . }}
+{{ end }}
+
 {{ partial "footer.html" . }}
diff --git a/layouts/partials/base_single.html b/layouts/partials/base_single.html
new file mode 100644
index 0000000..28321d1
--- /dev/null
+++ b/layouts/partials/base_single.html
@@ -0,0 +1,10 @@
+<div class="main column">
+    <div class="container">
+        <div class="content">
+            {{ partial "page-heading.html" . }}
+            <div class="markdown">
+                {{ partial "content" . }}
+            </div>
+        </div>
+    </div>
+</div>
diff --git a/layouts/blog/single.html b/layouts/partials/blog_single.html
similarity index 96%
rename from layouts/blog/single.html
rename to layouts/partials/blog_single.html
index a4c6bbb..51b1573 100644
--- a/layouts/blog/single.html
+++ b/layouts/partials/blog_single.html
@@ -1,5 +1,3 @@
-{{ partial "header.html" . }}
-
 {{ if .Site.Params.issoHost }}
   <style type="text/css" media="screen">
     .isso section {
@@ -84,9 +82,11 @@
                 </div>
             {{ end }}
             <br>
+            {{ if .Site.Params.disqusShortname }}
             <div class="disqus">
                 {{ template "_internal/disqus.html" . }}
             </div>
+            {{ end }}
             {{ if .Site.Params.issoHost }}
             <div class="isso" id="isso-thread"></div>
             <script
@@ -95,9 +95,9 @@
                 data-isso-lang="{{ .Site.LanguageCode }}"
                 src="//{{ .Site.Params.issoHost }}/js/embed.min.js"
             ></script>
+            {{ else }}
+            this is where comments would go
             {{ end }}
         </div>
     </div>
 </div>
-
-{{ partial "footer.html" . }}