Reorganized css code