Reorganize the css