24 Refactor Channel implementation and UI