Re-write of CSS