Better handling of Edit success/error