Merge pull request #391 from asaadmahmoodspin/master

Multiple UI changes

web/react/components/sidebar.jsx

@@ -366,8 +366,8 @@ module.exports = React.createClass({
                 <li key={channel.name} ref={channel.name} className={linkClass}>
                     <a className={'sidebar-channel ' + titleClass} href={href} onClick={clickHandler}>
                         {status}
-                        {badge}
                         {channel.display_name}
+                        {badge}
                     </a>
                 </li>
             );