Navbar work
Merge branch 'alexz/more_stuff'