add nav bar
Merge branch 'master' into add_navbar