Styles for various parts of the site
Fixed merge conflict in css file