CMS-1213 Content Form - Close icon and header adjustments