diff --git a/layouts/book/all.html b/layouts/book/all.html
index 83fd858..f5c8843 100644
--- a/layouts/book/all.html
+++ b/layouts/book/all.html
@@ -14,26 +14,21 @@
 <section class="list-page">
 <!-- preambles -->
 
+{{- if .RegularPages -}}
 <ul>
-{{ range .Pages.ByTitle }}
-{{ if .IsPage }}
-<li><a href="{{ .RelPermalink }}">{{ .Title }}{{- if .Draft -}} :: Draft {{- end -}}</a></li>
-{{ end }}
-{{ end }}
+  {{ range .RegularPages.ByTitle -}}
+  <li><a href="{{ .RelPermalink }}">{{ .Title }}{{- if .Draft -}}&nbsp;:: Draft{{- end -}}</a></li>
+  {{ end -}}
 </ul>
+{{- end -}}
 
 <!-- sub categories & pages -->
 
-{{ $indexScratch := .Scratch }}
-{{ range .Sections }}
-{{ $indexScratch.Add "sections" (slice . ) }}
-{{ end }}
-
-{{- range ($indexScratch.Get "sections").ByTitle -}}
-<p><a href="{{ .RelPermalink }}">{{ .Title }}{{- if .Draft -}} :: Draft {{- end -}}</a></p>
+{{- range .Sections.ByTitle -}}
+<p><a href="{{ .RelPermalink }}">{{ .Title }}{{- if .Draft -}}&nbsp;:: Draft{{- end -}}</a></p>
 <ul>
-  {{- range .Pages.ByTitle -}}
-  <li><a href="{{ .RelPermalink }}">{{ .Title }}{{- if .Draft -}} :: Draft {{- end -}}</a></li>
+  {{- range .RegularPages.ByTitle -}}
+  <li><a href="{{ .RelPermalink }}">{{ .Title }}{{- if .Draft -}}&nbsp;:: Draft{{- end -}}</a></li>
   {{- end -}}
 </ul>
 {{- end -}}
diff --git a/layouts/book/chapters.html b/layouts/book/chapters.html
index 856d3da..42b105c 100644
--- a/layouts/book/chapters.html
+++ b/layouts/book/chapters.html
@@ -15,7 +15,7 @@
 <ul>
 {{ range .Pages.ByTitle }}
 {{ if .IsPage }}
-<li><a href="{{ .RelPermalink }}">{{ .Title }}{{- if .Draft -}} :: Draft {{- end -}}</a></li>
+<li><a href="{{ .RelPermalink }}">{{ .Title }}{{- if .Draft -}}&nbsp;:: Draft{{- end -}}</a></li>
 {{ end }}
 {{ end }}
 </ul>
diff --git a/layouts/book/volumes.html b/layouts/book/volumes.html
index a55499c..dc32104 100644
--- a/layouts/book/volumes.html
+++ b/layouts/book/volumes.html
@@ -15,23 +15,24 @@
 
 <!-- preambles -->
 
+{{- if .RegularPages -}}
 <ul>
-{{ range .Pages.ByTitle }}
-{{ if .IsPage }}
-<li><a href="{{ .RelPermalink }}">{{ .Title }}{{- if .Draft -}} :: Draft {{- end -}}</a></li>
-{{ end }}
+{{ range .RegularPages.ByTitle }}
+<li><a href="{{ .RelPermalink }}">{{ .Title }}{{- if .Draft -}}&nbsp;:: Draft{{- end -}}</a></li>
 {{ end }}
 </ul>
+{{- end -}}
 
 <!-- sub categories -->
 
+{{- if .Sections -}}
 <ul>
-{{ range .Pages.ByTitle }}
-{{ if .IsSection }}
-<li><a href="{{ .RelPermalink }}">{{ .Title }}{{- if .Draft -}} :: Draft {{- end -}}</a></li>
-{{ end }}
+{{ range .Sections.ByTitle }}
+<li><a href="{{ .RelPermalink }}">{{ .Title }}{{- if .Draft -}}&nbsp;:: Draft{{- end -}}</a></li>
 {{ end }}
 </ul>
+{{- end -}}
+
 </section>
 
 {{ partial "footer.html" . }}
diff --git a/layouts/index.html b/layouts/index.html
index f851398..ba63012 100644
--- a/layouts/index.html
+++ b/layouts/index.html
@@ -15,7 +15,7 @@
   {{ if .IsNode }}
   <a href="{{ .Permalink }}">{{ .Title}}</a>
   {{ else }}
-  <a href="{{ .RelPermalink }}">{{ .Title }}{{ if .Draft }} :: Draft {{end}}</a>
+  <a href="{{ .RelPermalink }}">{{ .Title }}{{ if .Draft }}&nbsp;:: Draft{{end}}</a>
   {{ end }}
   </h2>
 
diff --git a/layouts/partials/content.header.html b/layouts/partials/content.header.html
index b87811e..d31ebe7 100644
--- a/layouts/partials/content.header.html
+++ b/layouts/partials/content.header.html
@@ -1,6 +1,6 @@
 <section>
 <h1 class="content-title">
-{{- .Title -}}{{- if .Draft -}} :: Draft {{- end -}}
+{{- .Title -}}{{- if .Draft -}}&nbsp;:: Draft{{- end -}}
 </h1>
 {{- if .Params.subtitle -}}
 <p class=subtitle>{{ .Params.subtitle }}</p>