Changed look of navbar
Merge branch 'master' into production