refactor form
refactor form and form builder