diff --git a/source/firewall.rst b/source/firewall.rst
new file mode 100644
index 00000000..cec797c2
--- /dev/null
+++ b/source/firewall.rst
@@ -0,0 +1,23 @@
+====================================
+Firewall
+====================================
+
+.. image:: images/architecture-buildings-city-327345.jpg
+    :width: 600px
+    :align: center
+
+
+To manage traffic flowing through your security appliance, a broad range of filtering and shaping features is available.
+These are all combined in the firewall section.
+
+----------------
+
+.. toctree::
+   :maxdepth: 2
+   :titlesonly:
+
+   manual/nat
+   manual/aliases
+   manual/nptv6
+   manual/how-tos/shaper
+   manual/how-tos/carp
diff --git a/source/images/architecture-buildings-city-327345.jpg b/source/images/architecture-buildings-city-327345.jpg
new file mode 100644
index 00000000..6d493ae9
Binary files /dev/null and b/source/images/architecture-buildings-city-327345.jpg differ
diff --git a/source/index.rst b/source/index.rst
index 38572f23..f7561114 100644
--- a/source/index.rst
+++ b/source/index.rst
@@ -27,6 +27,7 @@ Table of Contents
      reporting
      system
      interfaces
+     firewall
      manual
      develop
      relations
diff --git a/source/manual.rst b/source/manual.rst
index 52dca234..a98ad243 100644
--- a/source/manual.rst
+++ b/source/manual.rst
@@ -12,12 +12,9 @@ User Manual
    :maxdepth: 2
    :titlesonly:
 
-   manual/users
    manual/dhcp
    manual/ipv6
-   manual/nat
    manual/logging
-   manual/aliases
    manual/vpnet
    manual/ips
    manual/etpro_telemetry
@@ -30,6 +27,5 @@ User Manual
    manual/dynamic_routing
    manual/opnsense_tools
    manual/monit
-   manual/nptv6
    manual/dynamic_dns
    manual/howtos
diff --git a/source/manual/howtos.rst b/source/manual/howtos.rst
index 52eaf6e4..6a97e7a4 100644
--- a/source/manual/howtos.rst
+++ b/source/manual/howtos.rst
@@ -11,7 +11,6 @@ How-tos
    how-tos/bind
    how-tos/c-icap
    how-tos/cachingproxy
-   how-tos/carp
    how-tos/clamav
    how-tos/dnscrypt-proxy
    how-tos/dynamicrouting_howto
@@ -48,7 +47,6 @@ How-tos
    how-tos/proxyicapantivirusinternal
    how-tos/proxytransparent
    how-tos/proxywebfilter
-   how-tos/shaper
    how-tos/sslvpn_client
    how-tos/sslvpn_s2s
    how-tos/tor
diff --git a/source/manual/users.rst b/source/manual/users.rst
index 11b8d293..f1201ffd 100644
--- a/source/manual/users.rst
+++ b/source/manual/users.rst
@@ -75,14 +75,12 @@ An overview of available settings:
 Configuration
 -------------
 
-Local User Manager
-------------------
-:doc:`how-tos/user-local`
 
-LDAP
-----
-:doc:`how-tos/user-ldap`
+.. toctree::
+   :maxdepth: 2
+   :titlesonly:
 
-Radius
-------
-:doc:`how-tos/user-radius`
+   how-tos/user-local
+   how-tos/user-ldap
+   how-tos/user-radius
+   two_factor
diff --git a/source/reporting.rst b/source/reporting.rst
index ab21160e..5da4ad1b 100644
--- a/source/reporting.rst
+++ b/source/reporting.rst
@@ -21,3 +21,13 @@ into these.
    manual/netflow
    manual/reporting_settings
    manual/reporting_traffic
+
+---------------
+Setup guides
+---------------
+
+.. toctree::
+   :maxdepth: 2
+   :titlesonly:
+
+   manual/how-tos/netflow_exporter
diff --git a/source/setup.rst b/source/setup.rst
index 6dbb6fa8..ad1cfe2d 100644
--- a/source/setup.rst
+++ b/source/setup.rst
@@ -27,7 +27,7 @@ Setup guides
    :maxdepth: 2
    :titlesonly:
 
-   manual/how-tos/how-tos/changelog
+   manual/how-tos/changelog
    manual/how-tos/serial_access
    manual/how-tos/installaws
    manual/how-tos/installova
diff --git a/source/system.rst b/source/system.rst
index f1858835..6f92f864 100644
--- a/source/system.rst
+++ b/source/system.rst
@@ -17,12 +17,14 @@ activities.
    :maxdepth: 2
    :titlesonly:
 
+   manual/users
    manual/how-tos/user-local
    manual/how-tos/user-ldap
    manual/how-tos/user-radius
    manual/two_factor
    manual/how-tos/cloud_backup
    manual/how-tos/multiwan
+   manual/multiwan.rst
    manual/hacarp
    manual/settingsmenu
    manual/certificates
@@ -38,3 +40,4 @@ Setup guides
    :titlesonly:
 
    manual/how-tos/two_factor
+   manual/how-tos/self-signed-chain