Reorganize CSS rules