Fix edit link destination
Fix error message getting overwritten