Changed some styling on the navbar
Merge branch 'who-what'