Add cancel button to edit form
Remove AddForm
Rename modals