Tidy up form, add toastrs on successful save of edit