12 files changed, 43 insertions, 28 deletions
diff --git a/layouts/docs/baseof.html b/layouts/docs/baseof.html
index 7f05ac8..9f7f942 100644
--- a/layouts/docs/baseof.html
+++ b/layouts/docs/baseof.html
@@ -1,25 +1,31 @@
 <!DOCTYPE html>
 <html>
 <head>
-  {{ partial "book-html-head" . }}
-  <title>{{ .Site.Title }}</title>
+  {{ partial "book/html-head" . }}
+  <title>{{ block "title" . }}{{ .Site.Title }}{{ end }}</title>
 </head>
 
 <body>
   <div class="pure-g">
+
     <div class="pure-u book-nav">
-        {{ partial "book-nav" . }}
+      {{ partial "book/nav" . }}
     </div>
     <div class="pure-u book-content">
       <div class="pure-g">
+
         <div class="pure-u book-page markdown">
           {{ block "main" . }}{{ end }}
         </div>
+        {{ if and (default true .Site.Params.BookShowTOC) (.Page.TableOfContents) }}
         <div class="pure-u book-toc">
-          {{ partial "book-toc" . }}
+          {{ partial "book/toc" . }}
         </div>
+        {{ end }}
+
       </div>
     </div>
+
   </div>
 </body>
 </html>
 \ No newline at end of file
diff --git a/layouts/docs/index.html b/layouts/docs/index.html
deleted file mode 100644
index 9b519ff..0000000
--- a/layouts/docs/index.html
+++ /dev/null
@@ -1,7 +0,0 @@
-{{ define "title" }}
-  {{ .Title }} &ndash; {{ .Site.Title }}
-{{ end }}
-
-{{ define "main" }}
-  <div>{{ .Content }}</div>
-{{ end }}
-\ No newline at end of file
diff --git a/layouts/docs/list.html b/layouts/docs/list.html
index 9b519ff..130cc89 100644
--- a/layouts/docs/list.html
+++ b/layouts/docs/list.html
@@ -1,7 +1,7 @@
-{{ define "title" }}
-  {{ .Title }} &ndash; {{ .Site.Title }}
+{{- define "title" -}}
+  {{ .Site.Title }}
 {{ end }}
 
-{{ define "main" }}
+{{- define "main" -}}
   <div>{{ .Content }}</div>
 {{ end }}
 \ No newline at end of file
diff --git a/layouts/docs/single.html b/layouts/docs/single.html
index 9b991dd..130cc89 100644
--- a/layouts/docs/single.html
+++ b/layouts/docs/single.html
@@ -1,3 +1,7 @@
-{{ define "main" }}
+{{- define "title" -}}
+  {{ .Site.Title }}
+{{ end }}
+
+{{- define "main" -}}
   <div>{{ .Content }}</div>
 {{ end }}
 \ No newline at end of file
diff --git a/layouts/partials/book-toc.html b/layouts/partials/book-toc.html
deleted file mode 100644
index 59e6b35..0000000
--- a/layouts/partials/book-toc.html
+++ /dev/null
@@ -1 +0,0 @@
-{{ .Page.TableOfContents }}  
-\ No newline at end of file
diff --git a/layouts/partials/book-html-head.html b/layouts/partials/book/html-head.html
index 682423f..bf7db42 100644
--- a/layouts/partials/book-html-head.html
+++ b/layouts/partials/book/html-head.html
@@ -3,7 +3,7 @@
 
 <link href="https://fonts.googleapis.com/css?family=Roboto:300,400,600" rel="stylesheet">
 <link href="/css/pure-min.css" rel="stylesheet">
-<link href="/css/grids-responsive-min.css" rel="stylesheet">
+<!-- <link href="/css/grids-responsive-min.css" rel="stylesheet"> -->
 
 {{ $styles := resources.Get "styles.scss" | resources.ToCSS | resources.Minify | resources.Fingerprint }}
 <link rel="stylesheet" href="{{ $styles.Permalink }}">
 \ No newline at end of file
diff --git a/layouts/partials/book/nav-after.html b/layouts/partials/book/nav-after.html
new file mode 100644
index 0000000..e69de29
--- /dev/null
+++ b/layouts/partials/book/nav-after.html
diff --git a/layouts/partials/book-nav.html b/layouts/partials/book/nav-auto.html
index fc89891..c54f960 100644
--- a/layouts/partials/book-nav.html
+++ b/layouts/partials/book/nav-auto.html
@@ -12,27 +12,29 @@
 
 {{ end }}
 
-<nav role="navigation" class="pure-menu">
-  {{ partial "book-brand" . }}
+<nav role="navigation">
+  {{ partial "book/nav-brand" . }}
 
-  <ul class="pure-menu-list pure-menu-root">
+  <ul>
   {{ range .Scratch.Get "BookSections" }}
     {{ template "book-section" (dict "Section" . "CurrentPage" $.Permalink) }}
   {{ end }}
   </ul>
+
+  {{ partial "book/nav-after" . }}
 </nav>
 
 <!-- Single section of menu (recursive) -->
 {{ define "book-section" }}
-  <li class="pure-menu-item">
+  <li {{ if .Section.Params.booktopsection }}class="book-nav-section"{{ end }}>
     {{ template "book-heading" .Section }}
-    <ul class="pure-menu-list">
+    <ul>
       {{ range .Section.Sections }}
         {{ template "book-section" (dict "Section" . "CurrentPage" $.CurrentPage) }}
       {{ end }}
       {{ range .Section.Pages }}
-        <li class="pure-menu-item">
-          <a href="{{ .RelPermalink }}" class="pure-menu-link {{ if eq $.CurrentPage .Permalink }}active{{ end }}">
+        <li>
+          <a href="{{ .RelPermalink }}" class="{{ if eq $.CurrentPage .Permalink }}active{{ end }}">
             {{ default .Title (.File | humanize | title) }}
           </a>
         </li>
@@ -49,13 +51,13 @@
 {{ $title := default .Title $title }}
 
 {{ if .Content }}
-<a href="{{ .RelPermalink }}" class="pure-menu-link {{ if .IsSection }}section{{ end }}">
-  {{- $title -}}
+<a href="{{ .RelPermalink }}">
+  {{- $title -}} 
 </a>
 {{ else }}
-<span class="pure-menu-heading {{ if .IsSection }}section{{ end }}">
+<a>
   {{- $title -}}
-</span>
+</a>
 {{ end }}
 
 {{ end }}
diff --git a/layouts/partials/book-brand.html b/layouts/partials/book/nav-brand.html
index 5a2c9cb..5a2c9cb 100644
--- a/layouts/partials/book-brand.html
+++ b/layouts/partials/book/nav-brand.html
diff --git a/layouts/partials/book/nav-bundle.html b/layouts/partials/book/nav-bundle.html
new file mode 100644
index 0000000..46665ad
--- /dev/null
+++ b/layouts/partials/book/nav-bundle.html
@@ -0,0 +1,5 @@
+<nav role="navigation">
+  {{ partial "book/nav-brand" . }}
+  {{ with .Site.GetPage .Site.Params.BookMenuBundle }}{{ .Content }}{{ end }}
+  {{ partial "book/nav-after" . }}
+</nav>
diff --git a/layouts/partials/book/nav.html b/layouts/partials/book/nav.html
new file mode 100644
index 0000000..cc24df7
--- /dev/null
+++ b/layouts/partials/book/nav.html
@@ -0,0 +1,5 @@
+{{ if .Site.Params.BookMenuBundle }}
+  {{ partial "book/nav-bundle" . }}
+{{ else }}
+  {{ partial "book/nav-auto" . }}
+{{ end }}
+\ No newline at end of file
diff --git a/layouts/partials/book/toc.html b/layouts/partials/book/toc.html
new file mode 100644
index 0000000..aca3785
--- /dev/null
+++ b/layouts/partials/book/toc.html
@@ -0,0 +1 @@
+{{ .Page.TableOfContents }}
+\ No newline at end of file