Changes to css and navbar
Fixing merge head