Reorganized the CSS