Make the navigation 2-layered closes #1
Merge branch 'master' of https://github.com/davidjpurser/OneEngine