Merge of Working ChannelScreen with new screen manager