improve edit form