diff --git a/docs/_includes/navigation.html b/docs/_includes/navigation.html
index 084b8f103..f4c1db676 100644
--- a/docs/_includes/navigation.html
+++ b/docs/_includes/navigation.html
@@ -9,6 +9,16 @@
     {% endfor %}
 </ul>
 
+<h3>Setup</h3>
+<ul>
+    {% assign pages = site.pages | sort: 'order' %}
+    {% for doc in pages %}
+      {% if doc.category == "setup" %}
+        <li><a href=".{{ doc.url }}">{{ doc.title }}</a></li>
+      {% endif %}
+    {% endfor %}
+</ul>
+
 <h3>Online Projects</h3>
 <ul>
     {% assign pages = site.pages | sort: 'order' %}
diff --git a/docs/collections/_development/file-formats.md b/docs/collections/_development/file-formats.md
index 6cc7c965c..2760bbaff 100644
--- a/docs/collections/_development/file-formats.md
+++ b/docs/collections/_development/file-formats.md
@@ -3,7 +3,7 @@ title: Object File Formats
 order: 40
 ---
 
-All files for an object is located in the same folder, each folder corresponds to a package. Subpackages are organized under parent packages(directories) according to the logic described in http://docs.abapgit.org/ref-dot-abapgit.html
+All files for an object are located in the same folder, each folder corresponds to a package. Subpackages are organized under parent packages(directories) according to the logic described in http://docs.abapgit.org/ref-dot-abapgit.html
 
 # CLAS
 Files corresponding to the editable parts in source based class builder or ABAP in Eclipse:
diff --git a/docs/guide-development-version.md b/docs/guide-development-version.md
new file mode 100644
index 000000000..6dbb8de95
--- /dev/null
+++ b/docs/guide-development-version.md
@@ -0,0 +1,8 @@
+---
+title: Development version
+category: setup
+order: 30
+---
+
+Install the abapGit development version using abapGit, either via online or offline projects.
+Recommend keeping the compiled report in a different package, so it can be used as fallback in case of syntax errors.
\ No newline at end of file
diff --git a/docs/guide-install.md b/docs/guide-install.md
index 1c6a9bd94..93f1e961c 100644
--- a/docs/guide-install.md
+++ b/docs/guide-install.md
@@ -7,15 +7,7 @@ order: 10
 ## ABAP Report ##
 Copy the [ABAP code](https://raw.githubusercontent.com/abapGit/build/master/zabapgit.abap) into a new report via SE38 or SE80. To update abapGit to a newer version, replace the code in the report with the most recent.
 
-To use the online feature, SSL must be setup. Offline projects will work behind firewalls and without SSL.
-
-## STRUST/SSL setup(online projects only) ##
-
-[SSL setup](guide-ssl-setup.html)
-
-## Proxy setup(online projects only) ##
-If your server is behind a proxy, it can be configured under Advanced -> Settings,
-![](img/proxy.png)
+To use the online feature, [SSL must be setup](guide-ssl-setup.html). Offline projects will work behind firewalls and without SSL.
 
 ## Done ##
 Run report
diff --git a/docs/guide-proxy-configuration.md b/docs/guide-proxy-configuration.md
new file mode 100644
index 000000000..37155fd16
--- /dev/null
+++ b/docs/guide-proxy-configuration.md
@@ -0,0 +1,10 @@
+---
+title: Proxy configuration
+category: setup
+order: 20
+---
+
+Online projects only
+
+If your server is behind a proxy, it can be configured under Advanced -> Settings,
+![](img/proxy.png)
\ No newline at end of file
diff --git a/docs/guide-ssl-setup.md b/docs/guide-ssl-setup.md
index 49bed8a16..2de565533 100644
--- a/docs/guide-ssl-setup.md
+++ b/docs/guide-ssl-setup.md
@@ -1,7 +1,7 @@
 ---
 title: SSL setup
-category: online projects
-order: 70
+category: setup
+order: 10
 ---
 
 ##### Option A - Chrome #####