Added another channel mask and text view to control channel switching
Same fixes