diff --git a/layouts/_default/list.html b/layouts/_default/list.html
index 144130f..5e65b2a 100644
--- a/layouts/_default/list.html
+++ b/layouts/_default/list.html
@@ -10,15 +10,7 @@
   {{ end }}
 </ul>
 {{ else }}
-<h3>Subpages:</h3>
-<ul>
-  <li><a href="..">Go back</a></li>
-    {{ range .Pages }}
-    <li>
-        <a href="{{ .Permalink }}">{{ .Title }}</a> <br>
-    </li>
-    {{ end }}
-</ul>
+{{ partial "pageslist.html" }}
 {{ end }}
 
 <hr>
@@ -31,4 +23,4 @@
 
 {{ .Content }}
 
-{{ end }}
+{{ end }}
\ No newline at end of file
diff --git a/layouts/_default/single.html b/layouts/_default/single.html
index a06cade..fdae686 100644
--- a/layouts/_default/single.html
+++ b/layouts/_default/single.html
@@ -1,13 +1,11 @@
 {{ define "main" }}
-
-<h3>Subpages:</h3>
-<ul>
-    {{ range .Pages }}
-    <li>
-        <a href="{{ .Permalink }}">{{ .Title }}</a> <br>
-    </li>
-    {{ end }}
-</ul>
-
+{{ partial "pageslist.html" }}
+<hr>
+<h2>{{ .Title }}</h2>
+{{ if $.Params.enabletoc }}
+<div class="toc">
+  {{ .Page.TableOfContents }}
+</div>
+{{ end }}
 {{ .Content }}
 {{ end }}
\ No newline at end of file
diff --git a/layouts/partials/pageslist.html b/layouts/partials/pageslist.html
new file mode 100644
index 0000000..dfbac4f
--- /dev/null
+++ b/layouts/partials/pageslist.html
@@ -0,0 +1,8 @@
+<ul>
+  <li><a href="..">Go back</a></li>
+  {{ range .Pages }}
+  <li>
+    <a href="{{ .Permalink }}">{{ .Title }}</a>
+  </li>
+  {{ end }}
+</ul>
\ No newline at end of file