Fixed misc. issues with form builder