CMS-2780 FormItemSet - Fix header and footer design