diff --git a/doc/config/_default/config.toml b/doc/config/_default/config.toml
index 59df7f5d24..52c995c12c 100644
--- a/doc/config/_default/config.toml
+++ b/doc/config/_default/config.toml
@@ -39,7 +39,7 @@ pygmentsUseClasses = true
   [[menu.about_us]]
     name = "The Things Industries"
     url = "https://www.thethingsindustries.com"
-    weight = 2
+    weight = 3
 
   [[menu.buttons]]
     name = "Get The Things Stack"
@@ -47,3 +47,8 @@ pygmentsUseClasses = true
     weight = 1
     [menu.buttons.params]
       target = "_blank"
+
+  [[menu.sitemap]]
+    name = "View our Sitemap"
+    url = "https://www.thethingsindustries.com/docs/sitemap/"
+    weight = 2
diff --git a/doc/content/concepts/features/cli/_index.md b/doc/content/concepts/features/cli/_index.md
index 9276ec31b3..0294436654 100644
--- a/doc/content/concepts/features/cli/_index.md
+++ b/doc/content/concepts/features/cli/_index.md
@@ -25,7 +25,7 @@ To use the CLI, you need to complete three steps:
 
 If you need help with any CLI command, use the `--help` flag to get a list of subcommands, flags and their description and aliases.
 
-For a complete list of CLI commands, see the [CLI reference]({{< ref "/concepts/features/cli" >}}).
+For a complete list of CLI commands, see the [CLI reference]({{< ref "/concepts/features/cli/reference" >}}).
 
 For troubleshooting common CLI errors, see the [Troubleshooting CLI]({{< relref "troubleshooting" >}}) section.
 
diff --git a/doc/content/sitemap/_index.md b/doc/content/sitemap/_index.md
new file mode 100644
index 0000000000..666feb3f0a
--- /dev/null
+++ b/doc/content/sitemap/_index.md
@@ -0,0 +1,7 @@
+---
+title: "Sitemap"
+description: ""
+weight: 10
+---
+
+{{< sitemap >}}
\ No newline at end of file
diff --git a/doc/content/ttn-lw-cli/_index.md b/doc/content/ttn-lw-cli/_index.md
new file mode 100644
index 0000000000..817261e1f3
--- /dev/null
+++ b/doc/content/ttn-lw-cli/_index.md
@@ -0,0 +1,4 @@
+---
+title: "Command-line Interface Reference"
+description: ""
+---
\ No newline at end of file
diff --git a/doc/themes/the-things-stack/layouts/partials/footer/footer.html b/doc/themes/the-things-stack/layouts/partials/footer/footer.html
index 050538cf60..99713b8de8 100644
--- a/doc/themes/the-things-stack/layouts/partials/footer/footer.html
+++ b/doc/themes/the-things-stack/layouts/partials/footer/footer.html
@@ -1,15 +1,22 @@
 <footer class="footer">
   <div class="container">
     <div class="columns">
-      <nav class="column is-one-third">
-        <h3 class="title is-6">The Things Stack</h3>
+      <nav class="column is-one-fourth">
+        <h3 class="title is-6">Sections</h3>
         {{- $currentPage := . -}}
         {{- range .Site.Menus.main }}
         <p><a class="{{ if $currentPage.IsMenuCurrent "main" . }} is-active{{ end }}" href="{{ .URL }}">{{ .Name }}</a></p>
         {{- end }}
       </nav>
+      <nav class="column is-one-fourth">
+        <h3 class="title is-6">Sitemap</h3>
+        {{- $currentPage := . -}}
+        {{- range .Site.Menus.sitemap }}
+        <p><a class="{{ if $currentPage.IsMenuCurrent "sitemap" . }} is-active{{ end }}" href="{{ .URL }}">{{ .Name }}</a></p>
+        {{- end }}
+      </nav>
       {{- if .Site.Menus.contributing }}
-      <nav class="column is-one-third">
+      <nav class="column is-one-fourth">
         <h3 class="title is-6">Contributing</h3>
         {{- $currentPage := . -}}
         {{- range .Site.Menus.contributing }}
@@ -18,7 +25,7 @@ <h3 class="title is-6">Contributing</h3>
       </nav>
       {{ end -}}
       {{- if .Site.Menus.about_us }}
-      <nav class="column is-one-third">
+      <nav class="column is-one-fourth">
         <h3 class="title is-6">About Us</h3>
         {{- $currentPage := . -}}
         {{- range .Site.Menus.about_us }}
diff --git a/doc/themes/the-things-stack/layouts/partials/sitemap-recursion.html b/doc/themes/the-things-stack/layouts/partials/sitemap-recursion.html
new file mode 100644
index 0000000000..d89eb32619
--- /dev/null
+++ b/doc/themes/the-things-stack/layouts/partials/sitemap-recursion.html
@@ -0,0 +1,11 @@
+
+<li>
+    <a href="{{ .Permalink }}">{{ .Title }}</a>
+    {{ if .Pages }}
+        <ul>
+            {{ range .Pages }}
+                {{ partial "sitemap-recursion.html" . }}
+            {{ end }}
+        </ul>
+    {{ end }}
+</li>
\ No newline at end of file
diff --git a/doc/themes/the-things-stack/layouts/shortcodes/sitemap.html b/doc/themes/the-things-stack/layouts/shortcodes/sitemap.html
new file mode 100644
index 0000000000..c5d3c38349
--- /dev/null
+++ b/doc/themes/the-things-stack/layouts/shortcodes/sitemap.html
@@ -0,0 +1,19 @@
+<!DOCTYPE html>
+<html lang="en">
+<head>
+    <meta charset="UTF-8">
+    <meta name="viewport" content="width=device-width, initial-scale=1.0">
+    <title>{{ .Site.Title }} - Sitemap</title>
+</head>
+<body>
+    <div class="sitemap-container">
+        <ul>
+            {{ range .Site.Sections }}
+                {{ if ne .Title "Sitemap" }}
+                    {{ partial "sitemap-recursion.html" . }}
+                {{ end }}
+            {{ end }}
+        </ul>
+    </div>
+</body>
+</html>
\ No newline at end of file