Reworking the CSS