Bug fixes
Add new modal for channels