diff --git a/layouts/book/all.html b/layouts/book/all.html
index 2e81a33..616c6aa 100644
--- a/layouts/book/all.html
+++ b/layouts/book/all.html
@@ -19,10 +19,10 @@
 {{ end }}
 
 {{- range ($indexScratch.Get "sections").ByTitle -}}
-<p><a href="{{ .RelPermalink }}">{{ .Title }}</a></p>
+<p><a href="{{ .RelPermalink }}">{{ .Title }}{{- if .Draft -}} :: Draft {{- end -}}</a></p>
 <ul>
   {{- range .Pages.ByTitle -}}
-  <li><a href="{{ .RelPermalink }}">{{ .Title }}</a></li>
+  <li><a href="{{ .RelPermalink }}">{{ .Title }}{{- if .Draft -}} :: Draft {{- end -}}</a></li>
   {{- end -}}
 </ul>
 {{- end -}}
diff --git a/layouts/book/chapters.html b/layouts/book/chapters.html
index 7a74400..c83bf80 100644
--- a/layouts/book/chapters.html
+++ b/layouts/book/chapters.html
@@ -7,11 +7,17 @@
 
 {{ partial "content.header.html" . }}
 
+{{ with .Content }}
+<section>
+{{ . }}
+</section>
+{{ end }}
+
 <section class="list-page">
 <ul>
 {{ range .Pages.ByTitle }}
 {{ if .IsPage }}
-<li><a href="{{ .RelPermalink }}">{{.Title}}</a></li>
+<li><a href="{{ .RelPermalink }}">{{ .Title }}{{- if .Draft -}} :: Draft {{- end -}}</a></li>
 {{ end }}
 {{ end }}
 </ul>
diff --git a/layouts/book/volumes.html b/layouts/book/volumes.html
index a401f27..d714c2b 100644
--- a/layouts/book/volumes.html
+++ b/layouts/book/volumes.html
@@ -7,11 +7,17 @@
 
 {{ partial "content.header.html" . }}
 
+{{ with .Content }}
+<section>
+{{ . }}
+</section>
+{{ end }}
+
 <section class="list-page">
 <ul>
 {{ range .Pages.ByTitle }}
 {{ if .IsSection }}
-<li><a href="{{ .RelPermalink }}">{{.Title}}</a></li>
+<li><a href="{{ .RelPermalink }}">{{ .Title }}{{- if .Draft -}} :: Draft {{- end -}}</a></li>
 {{ end }}
 {{ end }}
 </ul>
diff --git a/layouts/index.html b/layouts/index.html
index 9c07738..08414c3 100644
--- a/layouts/index.html
+++ b/layouts/index.html
@@ -7,9 +7,10 @@
   </section>
 {{ end }}
 <section class="page-list">
-{{ range (.Paginate .Site.RegularPages).Pages }}
-{{/* range where .Site.RegularPages "Type" "posts" */}}
-{{ if ne .Draft true}}
+{{ $pgFilter1 := where .Site.RegularPages "Draft" false }}
+{{ $pgFilter2 := where .Site.RegularPages "Params.date" "!=" nil }}
+{{ $pgFilter := $pgFilter1 | intersect $pgFilter2 }}
+{{ range (.Paginate $pgFilter).Pages }}
   <h2 class="content-title">
   {{ if .IsNode }}
   <a href="{{ .Permalink }}">{{ .Title}}</a>
@@ -23,8 +24,6 @@
   {{ else }}
   <p>{{ truncate 140 .Summary }}</p>
   {{ end }}
-
-{{ end }}
 {{ end }}
 </section>
 
diff --git a/layouts/partials/content.header.html b/layouts/partials/content.header.html
index e20e82f..b87811e 100644
--- a/layouts/partials/content.header.html
+++ b/layouts/partials/content.header.html
@@ -2,30 +2,27 @@
 <h1 class="content-title">
 {{- .Title -}}{{- if .Draft -}} :: Draft {{- end -}}
 </h1>
+{{- if .Params.subtitle -}}
+<p class=subtitle>{{ .Params.subtitle }}</p>
+{{- end -}}
 
-{{- if .IsPage -}}
-  {{- if .Params.subtitle -}}
-  <p class=subtitle>{{ .Params.subtitle }}</p>
+{{- if and (.IsPage) (.Params.meta) -}}
+<span class="content-meta">
+  {{- if .Params.author -}}
+  <p class="author">{{ .Params.author }}</p>
   {{- end -}}
 
-  {{- if .Params.meta -}}
-  <span class="content-meta">
-    {{- if .Params.author -}}
-    <p class="author">{{ .Params.author }}</p>
-    {{- end -}}
-
-    {{- if not .Params.hidedate -}}
-    <p class="date">{{ .Date.Format "2006-01-02" }}</p>
-    {{- end -}}
-
-    {{- if not .Params.hidereadtime -}}
-    <span>{{ .ReadingTime }} min read&nbsp;</span>
-    {{- end -}}
-
-    {{- range .Params.tags -}}
-    <a href="{{ "/tags/" | absURL }}{{ . | urlize }}">{{ . }}</a>&nbsp;
-    {{- end -}}
-  </span>
+  {{- if not .Params.hidedate -}}
+  <p class="date">{{ .Date.Format "2006-01-02" }}</p>
   {{- end -}}
+
+  {{- if not .Params.hidereadtime -}}
+  <span>{{ .ReadingTime }} min read&nbsp;</span>
+  {{- end -}}
+
+  {{- range .Params.tags -}}
+  <a href="{{ "/tags/" | absURL }}{{ . | urlize }}">{{ . }}</a>&nbsp;
+  {{- end -}}
+</span>
 {{- end -}}
 </section>