Improved content and CSS