Adding some changes to style css
Resolving merge conficts
Adding some font changes to css