Add undo button, fix bug with get original avatar.