[UPDATE] Big refactoring on the CCControlPicker