Added Channel

Added Channel, updated icon and cleaned up the code