CMS ui improvements