Improvements to CSS and pagination