nav bar stuff
Merge origin/master