Refactored a lot of the css