Improve content and style