UI fixes in CMS