diff --git a/archetypes/chapter.md b/archetypes/chapter.md
index 3fe15e2cec..1d975216f1 100644
--- a/archetypes/chapter.md
+++ b/archetypes/chapter.md
@@ -1,9 +1,6 @@
 ---
 title: "Some Chapter title"
 weight: 0
-prev: /prev/path
-next: /next/path
-chapter: true
 icon: "<b>X. </b>" # HTML code as prefix in the menu
 ---
 
diff --git a/archetypes/default.md b/archetypes/default.md
index 2b35103feb..e47481e95a 100644
--- a/archetypes/default.md
+++ b/archetypes/default.md
@@ -1,8 +1,6 @@
 ---
 title: "Some Title"
 weight: 5
-prev: /prev/path
-next: /next/path
 toc: true
 ---
 
diff --git a/layouts/_default/list.html b/layouts/_default/list.html
index e69de29bb2..8d1fdab11d 100644
--- a/layouts/_default/list.html
+++ b/layouts/_default/list.html
@@ -0,0 +1,10 @@
+{{ partial "header.html" . }}
+{{ if .Content }}
+{{ .Content }}
+{{ else }}
+{{ with (index (index .Site.Sections .Section) 0)  }}
+{{ .Page.Content }}
+{{ $.Scratch.Set "uniqueId" .Page.UniqueID }}
+{{ end }}
+{{ end }}
+{{ partial "footer.html" . }}
diff --git a/layouts/partials/footer.html b/layouts/partials/footer.html
index c07802bcc3..76d197f506 100644
--- a/layouts/partials/footer.html
+++ b/layouts/partials/footer.html
@@ -1,14 +1,55 @@
 
-      {{ if .Params.chapter }}
+      {{ $isChapter := or (eq .Kind "section") (.Params.chapter)}}
+      {{ if $isChapter }}
         </div> <!-- end chapter-->
       {{ end }}
       </div>
     </div>
 
+    {{ if $.Site.Params.autoNav }}
+    {{ $.Scratch.Set "_sectionpages" (slice) }}
+    {{ if $.Site.Params.menu }}
+      {{ range $sname := $.Site.Params.menu }}
+        {{ $.Scratch.Add "_sectionpages" ($.Site.GetPage "section" $sname) }}
+      {{ end }}
+    {{ else }}
+      {{ range $sname, $spages := .Site.Sections }}
+        {{ $.Scratch.Add "_sectionpages" ($.Site.GetPage "section" $sname) }}
+      {{ end }}
+      {{ $.Scratch.Set "_sectionpages" (sort ($.Scratch.Get "_sectionpages") "Weight") }}
+    {{ end }}
+    {{ $.Scratch.Set "_allpages" (slice) }}
+    {{ range $.Scratch.Get "_sectionpages" }}
+      {{ if .Content }}
+        {{ $.Scratch.Add "_allpages" . }}
+      {{ end }}
+      {{ range index $.Site.Sections .Section }}
+        {{ $.Scratch.Add "_allpages" .Page }}
+      {{ end }}
+    {{ end }}
+    {{ end }}
+
     <div id="navigation">
-        {{ $Site := .Site }}
-        {{ with .Params.prev }}<a class="nav nav-prev" href="{{ $Site.BaseURL }}{{ . }}"> <i class="fa fa-chevron-left"></i></a>{{ end }}
-        {{ with .Params.next }}<a class="nav nav-next" href="{{ $Site.BaseURL }}{{ . }}" style="margin-right: 0px;"><i class="fa fa-chevron-right"></i></a>{{ end }}
+        {{ if $.Site.Params.autoNav }}
+        {{ $allpages := $.Scratch.Get "_allpages" }}
+        {{ range $index, $element := $allpages }}
+          {{ $uniqueid := ($.Scratch.Get "uniqueId" | default $.UniqueID ) }}
+          {{if eq $element.UniqueID $uniqueid }}
+            {{ if not (isset $.Params "prev") }}
+              {{ with index $allpages (sub $index 1) }}
+                <a class="nav nav-prev" href="{{ $.Site.BaseURL }}{{ .URL }}"> <i class="fa fa-chevron-left"></i></a>
+              {{ end }}
+            {{ end }}
+            {{ if not (isset $.Params "next") }}
+              {{ with index $allpages (add $index 1) }}
+                <a class="nav nav-next" href="{{ $.Site.BaseURL }}{{ .URL }}" style="margin-right: 0px;"><i class="fa fa-chevron-right"></i></a>
+              {{ end }}
+            {{ end }}
+          {{ end }}
+        {{ end }}
+        {{ end }}
+        {{ with .Params.prev }}<a class="nav nav-prev" href="{{ $.Site.BaseURL }}{{ . }}"> <i class="fa fa-chevron-left"></i></a>{{ end }}
+        {{ with .Params.next }}<a class="nav nav-next" href="{{ $.Site.BaseURL }}{{ . }}" style="margin-right: 0px;"><i class="fa fa-chevron-right"></i></a>{{ end }}
     </div>
 
     </section>
diff --git a/layouts/partials/header.html b/layouts/partials/header.html
index 7a34089eb4..c61851a5fe 100644
--- a/layouts/partials/header.html
+++ b/layouts/partials/header.html
@@ -22,6 +22,7 @@
     {{ partial "style.html" . }}
   </head>
   <body class="" data-url="{{ .RelPermalink }}">
+    {{ $isChapter := or (eq .Kind "section") (.Params.chapter)}}
     {{ partial "menu.html" . }}
         <section id="body">
         <div id="overlay"></div>
@@ -47,7 +48,7 @@
                         <i class="fa fa-bars"></i>
                       </a>
                   </span>
-                {{ if and (not .Params.chapter) (.Params.toc) }}
+                {{ if and (not $isChapter) (.Params.toc) }}
                 <span id="toc-menu"><a href=""><i class="fa fa-list-alt"></i></a></span>
                 {{ end }}
                 {{ $type := .Type }}
@@ -67,10 +68,10 @@
               {{ end }}
 
             </div>
-            {{ if .Params.chapter }}
+            {{ if $isChapter }}
               <div id="chapter">
             {{ end }}
-    	        <div id="body-inner">
-                {{ if not .Params.chapter }}
+              <div id="body-inner">
+                {{ if not $isChapter }}
                 <h1>{{.Title}}</h1>
                 {{ end }}
diff --git a/layouts/partials/menu.html b/layouts/partials/menu.html
index 5d344a4735..6b11ea63c1 100644
--- a/layouts/partials/menu.html
+++ b/layouts/partials/menu.html
@@ -12,31 +12,34 @@
   <div class="highlightable">
     <ul class="topics">
       {{ $page := . }}
-      {{ if .Site.Params.menu }}
-        {{ $.Scratch.Set "menuItems" (slice) }}
-        {{ range $i, $key := .Site.Params.menu }}
-          {{ if isset $page.Site.Sections $key }}
-            {{ $.Scratch.Add "menuItems" $key }}
-          {{ else }}
-            <li class="dd-item"><div class="notices warning"><p>
-            {{ printf "Unknown section '%s' found in site menu" $key }}
-            </p></div></li>
-          {{ end }}
-        {{ end }}
+      {{ if $.Site.Params.menu }}
+        {{ $.Scratch.Set "menuItems" $.Site.Params.menu }}
       {{ else }}
-        {{ $.Scratch.Set "menuItems" .Site.Sections }}
+        {{ $.Scratch.Set "_pages" (slice) }}
+        {{ range $key, $value := .Site.Sections }}
+          {{ $.Scratch.Add "_pages" ($.Site.GetPage "section" $key) }}
+        {{ end }}
+        {{ $.Scratch.Set "menuItems" (slice)}}
+        {{ range $key, $value := sort ($.Scratch.Get "_pages") "Weight" }}
+          {{ $.Scratch.Add "menuItems" $value.Section }}
+        {{ end }}
       {{ end }}
       {{ $menuItems := $.Scratch.Get "menuItems" }}
       {{ range $i, $key := $menuItems }}
       {{ if ne $key "" }}
 
-      {{ if not $.Site.Params.menu }}
-        {{ $.Scratch.Set "currentItem" (index $page.Site.Sections $i) }}
-      {{ else }}
-        {{ $.Scratch.Set "currentItem" (index $page.Site.Sections $key) }}
+      {{ $value := (index $page.Site.Sections $key) }}
+      {{ $.Scratch.Set "_value" $value }}
+      {{ with $index := $.Site.GetPage "section" $key }}
+        {{ if .Content }}
+          {{ $.Scratch.Set "first" $index }}
+        {{ else }}
+          {{ $.Scratch.Set "first" (index $value 0).Page }}
+          {{ $.Scratch.Set "_value" (after 1 $value) }}
+        {{ end }}
       {{ end }}
-      {{ $value := $.Scratch.Get "currentItem" }}
-      {{ $first := (index $value 0).Page }}
+      {{ $first := $.Scratch.Get "first" }}
+      {{ $value := $.Scratch.Get "_value" }}
 
       <li class="dd-item {{ if eq $page.RelPermalink $first.RelPermalink }}active{{ end }} {{if in $page.RelPermalink $first.RelPermalink }}parent{{ end }}" data-nav-id="{{ $first.RelPermalink }}">
         <a href="{{ $first.RelPermalink }}">
@@ -50,17 +53,15 @@
              {{ end }}
            </span>
         </a>
-        {{ if gt $value.Len 1}}
+        {{ if gt $value.Len 0}}
         <ul>
           {{ range $k, $p := $value }}
-          {{ if gt $k 0 }}
             <li class="dd-item {{ if eq $page.RelPermalink $p.Page.RelPermalink }}active{{ end }}" data-nav-id="{{ $p.Page.RelPermalink }}">
               <a href="{{ $p.Page.RelPermalink }}">
                 <span>{{ $p.Page.Title }}    {{ if $page.Site.Params.showVisitedLinks}}  <i class="fa fa-check read-icon">  {{ end }} </i></span>
               </a>
             </li>
           {{ end }}
-          {{ end }}
         </ul>
         {{ end }}
       </li>