CMS UI enhancements