Badges reorganization