Reorganize CSS and HTML