diff --git a/layouts/_default/list.html b/layouts/_default/list.html
index 3896140..8d45305 100644
--- a/layouts/_default/list.html
+++ b/layouts/_default/list.html
@@ -9,7 +9,12 @@
 <header class="list-content">
     {{ .Content }}
 </header>
-{{ range .Pages }}
-{{ .Render "summary"}}
+{{ range $index, $page := (.Paginate (where .Pages ".Params.hidden" "!=" "true")).Pages }}
+{{ if ne $index 0 }}
 {{ end }}
+{{ .Render "summary" }}
+{{ end }}
+{{ end }}
+{{ define "content-footer" }}
+{{ partial "paginator.html" .Paginator }}
 {{ end }}
\ No newline at end of file
diff --git a/layouts/_default/single.html b/layouts/_default/single.html
index a3fd5ae..6245c11 100644
--- a/layouts/_default/single.html
+++ b/layouts/_default/single.html
@@ -9,4 +9,7 @@
 <article>
     {{ .Content }}
 </article>
+{{ end }}
+{{ define "content-footer" }}
+{{ partial "prev-next-page.html" . }}
 {{ end }}
\ No newline at end of file
diff --git a/layouts/index.html b/layouts/index.html
index fe2186e..8739a38 100644
--- a/layouts/index.html
+++ b/layouts/index.html
@@ -4,7 +4,12 @@
   {{.Content}}
 </article>
 <!-- Note that .Pages is the same as .Site.RegularPages on the homepage template. -->
-{{ range first 10 .Pages }}
-{{ .Render "summary"}}
+{{ range $index, $page := (.Paginate (where (where .Site.RegularPages "Type" "in" site.Params.mainSections) ".Params.hidden" "!=" "true" )).Pages }}
+{{ if ne $index 0 }}
 {{ end }}
+{{ .Render "summary" }}
+{{ end }}
+{{ end }}
+{{ define "content-footer" }}
+{{ partial "paginator.html" .Paginator }}
 {{ end }}
\ No newline at end of file
diff --git a/layouts/partials/paginator.html b/layouts/partials/paginator.html
new file mode 100644
index 0000000..f0196ad
--- /dev/null
+++ b/layouts/partials/paginator.html
@@ -0,0 +1,19 @@
+<nav>
+    <ul>
+        <li>
+            {{if .HasPrev}}
+            <a alt="Newer articles" href="{{ .Prev.URL }}">&larr; Newer</a>
+            {{ else }}
+            &nbsp;
+            {{end}}
+        </li>
+        <li>Page {{ .PageNumber }} of {{ .TotalPages }}</li>
+        <li>
+            {{if .HasNext}}
+            <a alt="Older articles" href="{{ .Next.URL }}">Older &rarr;</a>
+            {{ else }}
+            &nbsp;
+            {{end}}
+        </li>
+    </ul>
+</nav>
\ No newline at end of file
diff --git a/layouts/partials/prev-next-page.html b/layouts/partials/prev-next-page.html
new file mode 100644
index 0000000..e88880e
--- /dev/null
+++ b/layouts/partials/prev-next-page.html
@@ -0,0 +1,20 @@
+{{ if not .Params.Menu }}
+<nav>
+    <ul>
+        <li>
+            {{ if .NextInSection }}
+            <a alt="Newer article" href="{{ .NextInSection.Permalink }}">&larr; Newer</a>
+            {{ else }}
+            &nbsp;
+            {{ end }} </li>
+        <li><a alt="Top of page" href="#">Top</a></li>
+        <li>
+            {{ if .PrevInSection }}
+            <a alt="Older article" href="{{ .PrevInSection.Permalink }}">Older &rarr;</a>
+            {{ else }}
+            &nbsp;
+            {{ end }}
+        </li>
+    </ul>
+</nav>
+{{ end }}
\ No newline at end of file