Started badge refactoring
Finalized badges refactoring