Tilovell/1541 better failed edit ux

This is based on top of another pending PR, the cobranding one, so the diff will look a little weird. Just cherry-pick the last commit if necessary.