Updated badge order