UI fixes on CMS