diff --git a/themes/nluug/layouts/custom/sitemap.html b/themes/nluug/layouts/custom/sitemap.html
index bae303f..659a253 100644
--- a/themes/nluug/layouts/custom/sitemap.html
+++ b/themes/nluug/layouts/custom/sitemap.html
@@ -3,22 +3,13 @@
 <div>{{ .Content }}</div>
 
 <h2>Secties</h2>
-{{ $sections := (where $.Site.Pages ".Kind" "section").ByTitle }}
 
-
-{{ range $sections }}
-    <h3><a href="{{ .Permalink }}">{{ .Title | default .Site.Params.textNoTitle }}</a></h3>
-    {{ $sectionName := .Section | singularize }}
-    {{ $pages := (where $.Site.RegularPages ".Section" $sectionName) }}
-    <ul>
-    {{ range $pages.ByParam "title" }}
-      <li>
-        <a href="{{ .RelPermalink }}">{{ .Title | default .Site.Params.textNoTitle }}</a>
-      </li>
-    {{ end }}
-    </ul>
+{{ range $.Site.Sections.ByTitle }}
+  <h3><a href="{{ .RelPermalink }}">{{ .Title | default .Site.Params.textNoTitle }}</a></h3>
+  {{ partial "recursive-pages.html" . }}
 {{ end }}
 
+
 <h2>Laatste wijzigingen</h2>
   {{ $byLastMod := .Site.RegularPages.ByLastmod.Reverse }}
   <div class="table-wrapper">
@@ -34,7 +25,7 @@
           </tr>
         </thead>
         <tbody>
-      {{ range first 50 $byLastMod }}
+      {{ range first 20 $byLastMod }}
       <tr>
         <td>{{ .Lastmod | dateFormat "2006-01-02 15:04:05" }}</td>
         <td><a href="{{ .RelPermalink }}">{{ .Title }}</a></td>
diff --git a/themes/nluug/layouts/partials/recursive-pages.html b/themes/nluug/layouts/partials/recursive-pages.html
new file mode 100644
index 0000000..07bc42f
--- /dev/null
+++ b/themes/nluug/layouts/partials/recursive-pages.html
@@ -0,0 +1,11 @@
+{{ $child_pages := union .Sections .Pages }}
+<ul>
+  {{ range $child_pages.ByTitle }}
+  <li>
+    <a href="{{ .RelPermalink }}"> {{ .Title }} </a>
+    {{ if or (.Sections) (.Pages) }}
+      {{ partial "recursive-pages.html" . }}
+    {{ end }}
+  </li>
+  {{ end }}
+</ul>