form builder improvements