diff --git a/source/images/blur-close-up-connection-1624895.jpg b/source/images/blur-close-up-connection-1624895.jpg
new file mode 100644
index 00000000..54dfa7bd
Binary files /dev/null and b/source/images/blur-close-up-connection-1624895.jpg differ
diff --git a/source/index.rst b/source/index.rst
index 778a2af3..38572f23 100644
--- a/source/index.rst
+++ b/source/index.rst
@@ -26,6 +26,7 @@ Table of Contents
      lobby
      reporting
      system
+     interfaces
      manual
      develop
      relations
diff --git a/source/interfaces.rst b/source/interfaces.rst
new file mode 100644
index 00000000..177d4f1d
--- /dev/null
+++ b/source/interfaces.rst
@@ -0,0 +1,18 @@
+====================================
+Interfaces
+====================================
+
+.. image:: images/blur-close-up-connection-1624895.jpg
+    :width: 600px
+    :align: center
+
+
+All traffic flowing through your appliance is using (virtual) interfaces, this is where you manage most settings.
+
+----------------
+
+.. toctree::
+   :maxdepth: 2
+   :titlesonly:
+
+   manual/interfaces
diff --git a/source/manual.rst b/source/manual.rst
index 233be082..104af7f5 100644
--- a/source/manual.rst
+++ b/source/manual.rst
@@ -15,12 +15,10 @@ User Manual
    manual/users
    manual/dhcp
    manual/ipv6
-   manual/interfaces
    manual/nat
    manual/two_factor
    manual/logging
    manual/aliases
-   manual/certificates
    manual/vpnet
    manual/ips
    manual/etpro_telemetry
@@ -32,7 +30,6 @@ User Manual
    manual/captiveportal
    manual/dynamic_routing
    manual/opnsense_tools
-   manual/diagnostics
    manual/monit
    manual/nptv6
    manual/dynamic_dns
diff --git a/source/manual/certificates.rst b/source/manual/certificates.rst
index 81782f8d..854dea7c 100644
--- a/source/manual/certificates.rst
+++ b/source/manual/certificates.rst
@@ -31,4 +31,10 @@ certficate signed by an external CA.
 
     Make sure that you select the correct certificate type, as many clients will refuse connection (or at least show
     errors) if an incorrect certificate type is used. For example, you can use either a server certificate or a
-    combined client/server certificate to secure the connection to the web interface, but not a CA or client certificate.
\ No newline at end of file
+    combined client/server certificate to secure the connection to the web interface, but not a CA or client certificate.
+
+
+-------------------------
+Usage examples
+-------------------------
+In :doc:`/manual/how-tos/self-signed-chain` you will find examples of how to setup certificate chains yourself.
diff --git a/source/manual/howtos.rst b/source/manual/howtos.rst
index f172a54b..30421422 100644
--- a/source/manual/howtos.rst
+++ b/source/manual/howtos.rst
@@ -62,7 +62,6 @@ How-tos
    how-tos/proxyicapantivirusinternal
    how-tos/proxytransparent
    how-tos/proxywebfilter
-   how-tos/self-signed-chain
    how-tos/shaper
    how-tos/SkyUK
    how-tos/sslvpn_client
diff --git a/source/manual/interfaces.rst b/source/manual/interfaces.rst
index f532b17d..b5dd488b 100644
--- a/source/manual/interfaces.rst
+++ b/source/manual/interfaces.rst
@@ -1,6 +1,6 @@
-==========
-Interfaces
-==========
+=========================
+Interface configuration
+=========================
 
 All traffic in OPNsense travels via interfaces. By default, WAN and LAN are assigned, but many more are possible, like
 GUESTNET (:doc:`captive portal </manual/captiveportal>`) and PFSYNC (:doc:`high availability </manual/hacarp>`).
diff --git a/source/system.rst b/source/system.rst
index b207cbbe..be47ec19 100644
--- a/source/system.rst
+++ b/source/system.rst
@@ -24,3 +24,5 @@ activities.
    manual/how-tos/multiwan
    manual/hacarp
    manual/settingsmenu
+   manual/certificates
+   manual/diagnostics