Fix responsive navbar
Merge branch 'navbar-hacky'