diff --git a/docs/client_config.rst b/docs/client_config.rst
index f22d040b..ddbeb31e 100644
--- a/docs/client_config.rst
+++ b/docs/client_config.rst
@@ -1,5 +1,3 @@
-\newpage
-
 Client Configuration
 --------------------
 
diff --git a/docs/config_template b/docs/config_template
new file mode 100644
index 00000000..ddc94fae
--- /dev/null
+++ b/docs/config_template
@@ -0,0 +1,2 @@
+Exam Configuration Templates
+-----------------------------
\ No newline at end of file
diff --git a/docs/configurations.rst b/docs/configurations.rst
index d73de3d3..deaff88f 100644
--- a/docs/configurations.rst
+++ b/docs/configurations.rst
@@ -3,14 +3,4 @@ SEB Configurations
 
 TODO
 
-.. include:: client_config.rst
 
-TODO
-
-Exam Configuration
-------------------
-
-TODO
-
-Configuration Templates
------------------------
diff --git a/docs/exam_config.rst b/docs/exam_config.rst
new file mode 100644
index 00000000..79fc2745
--- /dev/null
+++ b/docs/exam_config.rst
@@ -0,0 +1,2 @@
+Exam Configuration
+------------------
diff --git a/docs/index.rst b/docs/index.rst
index b179ec4d..4afc7325 100644
--- a/docs/index.rst
+++ b/docs/index.rst
@@ -22,6 +22,9 @@ Table of Content
    useraccount
    lmssetup
    configurations
+      client_config
+      exam_config
+      config_template
    exams
    monitoring
    troubleshooting
diff --git a/docs/institution.rst b/docs/institution.rst
index 4c31313a..a9953209 100644
--- a/docs/institution.rst
+++ b/docs/institution.rst
@@ -1,6 +1,9 @@
 Institution
 ===========
 
+Overview
+---------
+
 The institution section within SEB Server is used to support built-in multi-tenancy functionality to allow using SEB server as a 
 light-weight stand-alone server but with the possibility to separate operation completely within different institutions.
 
diff --git a/docs/useraccount.rst b/docs/useraccount.rst
index ac98c9e7..918c0c20 100644
--- a/docs/useraccount.rst
+++ b/docs/useraccount.rst
@@ -1,6 +1,9 @@
 User Accounts
 =============
 
+Overview
+---------
+
 The user-account section within SEB Server can be used to create new or modify user-accounts for other user or to modify the own
 user account and changing the password. This section differs most for the different roles in SEB Server.