tweaked form builder structure