CMS-3012 FormItemSet - New adjustments to nested design