Fixed badges order