more form-creator updates