improve edit/add form
merged with feature-editor-form