fixing form builder