#62 updated new and edit forms