Changed edit to form for new and edit
Finished changing edit to form