Improvements to CSS