Reworked brand picker