PATCH: making component choosing (much!) more usable
PATCH: making component choosing (much!) more usable