New badges
Badges locale refactoring