Improvements to the CSS