Refactor the CSS a bit