Renamed FieldEditorToolbar to FormFieldToolbar