#1519427 CMS usability fixes