updated form builder