Form updates
Updated edit form to match new
Fixing migration errors