Starting to refactor the CSS