fixed form builder code