User badges refactored