major changes to nav
Merge branch 'master' into nav_bar