Badge refactoring

Merge to master