Added field groups to the form builder