Fixed cannot delete scenario issue and the order of dialog