Navigation update

Updated the navigation so that the pages appear in the right order.
Merge branch 'hotfix/0.0.2.3' into develop