Cleanup of navigation
Merge pull request #4 from GertjanReynaert/gr-navigation-structure

Cleanup of navigation