Generic admin updated, and make content_html available