Navbar edits
Merge branch 'navbar'