Nav bar updates, etc.
Merge branch 'master' into development