form-builder improvements