Improve edit form