[WIP] Fix edit view

- [x] Fix edit form