Refactor the CSS