Refactor selector components for extensibility
FIX: Category badges were missing stripes in some places