Navbar fixes

- Navbar now collapses when necessary
- Navbar doesn't overlap content anymore
deal with merge conflicts
Merge branch 'nikolas-navbar-fixes'