Improve content and CSS