Updates to form builder