Numerous fixes for form builder