Navbar

Navbar doesn’t do weird stuff. Still need to fix collapsed menu.
Merge branch 'master' into gh-pages