Updates to the Channel Picker