Improvement to edit form