fix form builder