Navbar edits
Merge branch 'master' into design