Improvement on CSS