enhanced the form builder