Changed channel cell layout
closes #29 closes #22