minor bug fixes
adding checks to channels controller
Merge branch 'next-happy' into next-alex
fixed merge conflicts and channels list is working
linked to channels from channels list