Tidied up badges.