4 files changed, 17 insertions, 17 deletions
diff --git a/docs/index.rst b/docs/index.rst
index e446ec27..9ca48869 100644
--- a/docs/index.rst
+++ b/docs/index.rst
@@ -7,8 +7,9 @@ VyOS User Guide
 Introduction
 ############
 
-.. _introduction:
 .. toctree::
+   :caption: Introduction
+   :name: intro
    :maxdepth: 2
 
    about
@@ -21,8 +22,9 @@ Introduction
 Basics
 ######
 
-.. _introduction:
 .. toctree::
+   :caption: Basics
+   :name: basics
    :maxdepth: 2
 
    configuration-overview
@@ -34,8 +36,9 @@ Basics
 Advanced
 ########
 
-.. _introduction:
 .. toctree::
+   :caption: Advanced
+   :name: advanced
    :maxdepth: 2
 
    routing/index
@@ -44,7 +47,6 @@ Advanced
    vpn/index
    qos
    services/index
-
    high-availability
    clustering
    load-balancing
@@ -55,8 +57,9 @@ Advanced
 Appendix
 ########
 
-.. _appendix:
 .. toctree::
+   :caption: Appendix
+   :name: appendix
    :maxdepth: 2
 
    appendix/releasenotes
@@ -70,8 +73,9 @@ Appendix
 Contributing
 ############
 
-.. _contributing:
 .. toctree::
+   :caption: Contributing
+   :name: contributing
    :maxdepth: 2
 
    contributing/build-vyos
diff --git a/docs/services/index.rst b/docs/services/index.rst
index 3e81b7a9..e7b05ad6 100644
--- a/docs/services/index.rst
+++ b/docs/services/index.rst
@@ -2,8 +2,9 @@
 
 .. include:: references.rst
 
+########
 Services
-========
+########
 
 This chapter describes the available system/network services provided by VyOS.
 
diff --git a/docs/system/index.rst b/docs/system/index.rst
index 4edfce48..8d952ed7 100644
--- a/docs/system/index.rst
+++ b/docs/system/index.rst
@@ -1,15 +1,11 @@
 .. _system:
 
-System
-======
-
-After a basic system setup by setting up :ref:`interfaces-addresses`, VyOS
-should be ready for further configuration which is described in this chapter.
-
+####################
+System Configuration
+####################
 
 .. toctree::
    :maxdepth: 2
-   :hidden:
 
    config-management
    eventhandler
diff --git a/docs/vpn/index.rst b/docs/vpn/index.rst
index 54b40f8f..d0e440b0 100644
--- a/docs/vpn/index.rst
+++ b/docs/vpn/index.rst
@@ -1,9 +1,8 @@
 .. _vpn:
 
-.. include:: references.rst
-
+###
 VPN
-===
+###
 
 .. toctree::
    :maxdepth: 2