more improvements to form builder