Started redesign of navbar
Merge branch 'devel'