Reorganized css