diff --git a/layouts/_default/category.html b/layouts/_default/category.html
index f66747e..d885ed1 100644
--- a/layouts/_default/category.html
+++ b/layouts/_default/category.html
@@ -3,10 +3,10 @@
Category: {{ .Title }}
{{ range .Data.Pages -}}
-
- {{ .Title }}
-
-
+
{{- end }}
diff --git a/layouts/_default/list.html b/layouts/_default/list.html
index 752b805..917ca38 100644
--- a/layouts/_default/list.html
+++ b/layouts/_default/list.html
@@ -3,12 +3,12 @@
{{ .Title }}
{{ range .Data.Pages -}}
-
- {{ .Title }}
- {{ if eq .Kind "page" }}
-
- {{ end }}
-
+
+
{{ .Title }}
+ {{ if eq .Kind "page" }}
+
+ {{ end }}
+
{{- end }}
diff --git a/layouts/_default/single.html b/layouts/_default/single.html
index bb342dc..3d46668 100644
--- a/layouts/_default/single.html
+++ b/layouts/_default/single.html
@@ -5,7 +5,7 @@
{{ if ne .Type "page" -}}
- · {{ .ReadingTime }} min read
+ · {{ .ReadingTime }} min read
{{- end }}
@@ -18,11 +18,12 @@
{{ if (and (ne .Params.DisableShare true) (ne .Params.disable_share true)) -}}
{{ partial "share.html" . }}
{{- end }}
+
+ {{ if (and .Site.DisqusShortname (ne .Params.DisableComments true) (ne .Params.disable_comments true)) -}}
+
+ {{- end }}
-
-{{ if (and .Site.DisqusShortname (ne .Params.DisableComments true) (ne .Params.disable_comments true)) -}}
-Comments
-{{ template "_internal/disqus.html" . }}
-{{- end }}
-
{{- end }}
diff --git a/layouts/_default/taxonomy.html b/layouts/_default/taxonomy.html
index 34a87e0..8e4521f 100644
--- a/layouts/_default/taxonomy.html
+++ b/layouts/_default/taxonomy.html
@@ -3,10 +3,10 @@
Tag: {{ .Title }}
{{ range .Data.Pages -}}
-
- {{ .Title }}
-
-
+
{{- end }}
diff --git a/layouts/partials/sidebar.html b/layouts/partials/sidebar.html
index 8384905..48bfd1a 100644
--- a/layouts/partials/sidebar.html
+++ b/layouts/partials/sidebar.html
@@ -3,12 +3,16 @@
Comments
+ {{ template "_internal/disqus.html" . }} +