Fix and improve labels and badges.