begin of navbar refactoring / responsive broken
fix responsive
Merge remote-tracking branch 'origin/navbar'