Improve order of badges