Changed display of badges to be grouped by badge name