CMS - minor UI improvements & fixes