Reworked channel list