Re-structured the CSS