Refactor forms to use field groups