Reorganize CSS to avoid duplicate definitions