Fixed some css and navbar

- Fixed and combined other extra CSS