Improve edit form interactions
Continue rewording delete form