Update form builder to handel multiple fieldsets