navigation and layout changes
Merge branch 'master' of https://github.com/maaaark/visionward