diff --git a/docs/_data/navigation.yml b/docs/_data/navigation.yml
deleted file mode 100644
index 9ee82a13b..000000000
--- a/docs/_data/navigation.yml
+++ /dev/null
@@ -1,54 +0,0 @@
-- title: Guides
- items:
- - file: guide-install
- title: Installation
- - file: guide-upgrade
- title: Upgrading
- - file: guide-uninstall
- title: Uninstalling
- - title: Online projects
- subitems:
- - file: guide-online-install
- title: Installing a repository
- - title: Keeping code up to date
- file: guide-online-update
- - title: Uninstalling a repository
- file: guide-online-uninstall
- - title: Your first abapGit project
- file: guide-first-project
- - title: Moving package into git
- file: guide-moving-package
- - title: Contributing to a project
- file: guide-contributing
- - title: Offline projects
- subitems:
- - title: Importing zip
- file: guide-import-zip
- - title: Exporting zip
- file: guide-export-zip
- - title: Regular backup
- file: guide-regular-backup
- - title: Migrating from SAPlink
- file: guide-saplink
-
-- title: Reference
- items:
- - title: .abapgit.xml
- file: ref-dot-abapgit
- - title: Write protect
- file: ref-write-protect
- - title: Supported object types
- file: ref-supported
-
-- title: Other
- items:
- - title: Articles and Presentations
- file: other-articles-and-presentations
- - title: ZABAPGIT_TEST_SSL
- file: other-test-ssl
- - title: XML mismatch
- file: other-xml-mismatch
- - title: Object File Formats
- file: other-file-formats
- - title: Technical Links
- file: other-technical-links
diff --git a/docs/_includes/navigation.html b/docs/_includes/navigation.html
index 6568f8773..9a6783e00 100644
--- a/docs/_includes/navigation.html
+++ b/docs/_includes/navigation.html
@@ -1,34 +1,50 @@
-
- {% for section in site.data.navigation %}
-
- {% endfor %}
+ {% endfor %}
+
+
+Offline Projects
+
+ {% assign pages = site.pages | sort: 'order' %}
+ {% for doc in pages %}
+ {% if doc.category == "offline projects" %}
+ - {{ doc.title }}
+ {% endif %}
+ {% endfor %}
+
+
+Reference
+
+ {% assign pages = site.pages | sort: 'order' %}
+ {% for doc in pages %}
+ {% if doc.category == "reference" %}
+ - {{ doc.title }}
+ {% endif %}
+ {% endfor %}
+
+
+Other
+
+ {% assign pages = site.pages | sort: 'order' %}
+ {% for doc in pages %}
+ {% if doc.category == "other" %}
+ - {{ doc.title }}
+ {% endif %}
+ {% endfor %}
+
\ No newline at end of file
diff --git a/docs/guide-contributing.md b/docs/guide-contributing.md
index 469462c62..fbbc6ff83 100644
--- a/docs/guide-contributing.md
+++ b/docs/guide-contributing.md
@@ -1,5 +1,7 @@
---
title: Contributing to a project
+category: online projects
+order: 60
---
* Fork the repository
diff --git a/docs/guide-export-zip.md b/docs/guide-export-zip.md
index 9b00b48f6..14a1dfde9 100644
--- a/docs/guide-export-zip.md
+++ b/docs/guide-export-zip.md
@@ -1,5 +1,7 @@
---
title: Export zip
+category: offline projects
+order: 20
---
Assuming the offline project has been created.
diff --git a/docs/guide-first-project.md b/docs/guide-first-project.md
index caf551f4f..835757480 100644
--- a/docs/guide-first-project.md
+++ b/docs/guide-first-project.md
@@ -1,5 +1,7 @@
---
title: First project
+category: online projects
+order: 40
---
## Repository Setup ##
diff --git a/docs/guide-import-zip.md b/docs/guide-import-zip.md
index 7f58a4ea6..bd985afea 100644
--- a/docs/guide-import-zip.md
+++ b/docs/guide-import-zip.md
@@ -1,5 +1,7 @@
---
title: Import zip
+category: offline projects
+order: 10
---
1: Run report ZABAPGIT via SE38 or SA38
diff --git a/docs/guide-install.md b/docs/guide-install.md
index d5dc653bf..a8990a300 100644
--- a/docs/guide-install.md
+++ b/docs/guide-install.md
@@ -1,5 +1,7 @@
---
title: Installation
+category: getting-started
+order: 10
---
## ABAP Report ##
diff --git a/docs/guide-moving-package.md b/docs/guide-moving-package.md
index 97af6efc2..3beb63312 100644
--- a/docs/guide-moving-package.md
+++ b/docs/guide-moving-package.md
@@ -1,5 +1,7 @@
---
-title: Moving existing package contents into git
+title: Moving package into git
+category: online projects
+order: 50
---
You have an existing package in your system that you want to copy to a new git repository,
diff --git a/docs/guide-online-install.md b/docs/guide-online-install.md
index ff17d6d62..ab232ea1f 100644
--- a/docs/guide-online-install.md
+++ b/docs/guide-online-install.md
@@ -1,5 +1,7 @@
---
title: Installing online repo
+category: online projects
+order: 10
---
* Start ZABAPGIT
diff --git a/docs/guide-online-uninstall.md b/docs/guide-online-uninstall.md
index dcfdc38bc..8c4a821ef 100644
--- a/docs/guide-online-uninstall.md
+++ b/docs/guide-online-uninstall.md
@@ -1,5 +1,7 @@
---
title: Uninstall repository
+category: online projects
+order: 30
---
* Start ZABAPGIT
diff --git a/docs/guide-online-update.md b/docs/guide-online-update.md
index a5d2cc4fe..52ab47b91 100644
--- a/docs/guide-online-update.md
+++ b/docs/guide-online-update.md
@@ -1,5 +1,7 @@
---
title: Keeping code up to date
+category: online projects
+order: 20
---
* Start ZABAPGIT, it will automatically compare local and remote code. If code is updated in the remote repository a "pull" link will appear
diff --git a/docs/guide-regular-backup.md b/docs/guide-regular-backup.md
index 5b504a411..732723ce8 100644
--- a/docs/guide-regular-backup.md
+++ b/docs/guide-regular-backup.md
@@ -1,5 +1,7 @@
---
title: Regular backup
+category: other
+order: 10
---
Editing Using abapGit and abapGitServer for regular backup
diff --git a/docs/guide-saplink.md b/docs/guide-saplink.md
index 82c7c4dcc..6653138f9 100644
--- a/docs/guide-saplink.md
+++ b/docs/guide-saplink.md
@@ -1,5 +1,7 @@
---
title: Migrating from SAPlink
+category: other
+order: 20
---
1: Install the slinkee/nuggets into the ABAP system using saplink
diff --git a/docs/guide-uninstall.md b/docs/guide-uninstall.md
index fe12221f0..e5d5ea5de 100644
--- a/docs/guide-uninstall.md
+++ b/docs/guide-uninstall.md
@@ -1,5 +1,7 @@
---
-title: Uinstalling abapGit
+title: Uninstalling
+category: getting-started
+order: 30
---
* Delete ABAP reports ZABAPGIT* using SE38 or SE80
diff --git a/docs/guide-upgrade.md b/docs/guide-upgrade.md
index bbdabba27..2df6ab3e8 100644
--- a/docs/guide-upgrade.md
+++ b/docs/guide-upgrade.md
@@ -1,5 +1,7 @@
---
-title: Upgrading abapGit
+title: Upgrading
+category: getting-started
+order: 20
---
diff --git a/docs/other-articles-and-presentations.md b/docs/other-articles-and-presentations.md
index 758121400..8e3946e89 100644
--- a/docs/other-articles-and-presentations.md
+++ b/docs/other-articles-and-presentations.md
@@ -1,5 +1,7 @@
---
title: Articles and Presentations
+category: other
+order: 30
---
### 2014
diff --git a/docs/other-file-formats.md b/docs/other-file-formats.md
index 7b572bc70..9184178c6 100644
--- a/docs/other-file-formats.md
+++ b/docs/other-file-formats.md
@@ -1,5 +1,7 @@
---
title: Object File Formats
+category: other
+order: 40
---
# CLAS
diff --git a/docs/other-technical-links.md b/docs/other-technical-links.md
index 82e87b4de..f7514daae 100644
--- a/docs/other-technical-links.md
+++ b/docs/other-technical-links.md
@@ -1,5 +1,7 @@
---
title: Technical Links
+category: other
+order: 50
---
Collection of links to various git related documentation,
diff --git a/docs/other-test-ssl.md b/docs/other-test-ssl.md
index 15089a99a..5567489ce 100644
--- a/docs/other-test-ssl.md
+++ b/docs/other-test-ssl.md
@@ -1,5 +1,7 @@
---
title: ZABAPGIT_TEST_SSL
+category: other
+order: 60
---
Following report can be used to test SSL connection to github,
diff --git a/docs/other-xml-mismatch.md b/docs/other-xml-mismatch.md
index fb61ab227..9729a86ff 100644
--- a/docs/other-xml-mismatch.md
+++ b/docs/other-xml-mismatch.md
@@ -1,5 +1,7 @@
---
title: XML Mismatch
+category: other
+order: 70
---
### For end-users
diff --git a/docs/ref-dot-abapgit.md b/docs/ref-dot-abapgit.md
index 0b9118e88..b0fdbf5ac 100644
--- a/docs/ref-dot-abapgit.md
+++ b/docs/ref-dot-abapgit.md
@@ -1,5 +1,7 @@
---
title: .abapgit.xml
+category: reference
+order: 10
---
**.abapgit.xml** is a special abapGit file. It contains meta information of the abapGit project.
diff --git a/docs/ref-supported.md b/docs/ref-supported.md
index 22367bd27..ad881886f 100644
--- a/docs/ref-supported.md
+++ b/docs/ref-supported.md
@@ -1,5 +1,7 @@
---
title: Supported object types
+category: reference
+order: 20
---
diff --git a/docs/ref-write-protect.md b/docs/ref-write-protect.md
index 749f57247..5d700ea37 100644
--- a/docs/ref-write-protect.md
+++ b/docs/ref-write-protect.md
@@ -1,5 +1,7 @@
---
title: Write protect
+category: reference
+order: 30
---
The write protected repository feature will make sure users cannot overwrite objects in the SAP system with objects from the git repository. So it helps enforcing that data can only go from the SAP system to the Git repository.