diff --git a/server/public/assets/css/style.css b/server/public/assets/css/style.css
index 4d474efa..d8c681dc 100755
--- a/server/public/assets/css/style.css
+++ b/server/public/assets/css/style.css
@@ -1786,12 +1786,16 @@ margin-right: 52%;
 .nav-btn
 {
     transition: background-color .2s;
-    min-width: 64px;
+    min-width: 50px;
     float:right;
     text-align: center;
     display: flex;
     justify-content: center;
 }
+
+.settings-hamburger {
+    min-width: 50px;
+}
 .nav-btn:hover{background-color:rgba(0,0,0,0.6);}
 .hover-text{display:none;}
 .nav-btn:hover > .hover-text {
@@ -3171,7 +3175,7 @@ nav ul li:hover, nav ul li.active {
 
     .control-list{
         position: absolute !important;
-        width: 120px;
+        /*width: 120px;*/
     }
 
     .client-control-list {
@@ -3223,7 +3227,7 @@ nav ul li:hover, nav ul li.active {
     .chan {
         text-shadow: 0px 0px 0px rgba(0, 0, 0, 0.42);
         width: calc(100vw - 170px) !important;
-        max-width: 100%;
+        max-width: calc(100% - 87.5px - 130px);
         font-size: 2rem;
         padding-right:0px;
         overflow: hidden;
@@ -3233,6 +3237,10 @@ nav ul li:hover, nav ul li.active {
         text-overflow: ellipsis;
     }
 
+    .chan-client {
+        max-width: calc(100% - 87.5px - 170px);
+    }
+
     .control-list li a{ min-width: 0px; width: 37px; padding: 0 0 0 0px;}
 
     nav .zbrand{
diff --git a/server/public/assets/js/channel.js b/server/public/assets/js/channel.js
index 0c42f3fd..053dc603 100644
--- a/server/public/assets/js/channel.js
+++ b/server/public/assets/js/channel.js
@@ -5,7 +5,7 @@ var Channel = {
             $("#wrapper").removeClass("tabs_height");
             $("#wrapper").addClass("client-wrapper");
             //$(".embed-button-footer").addClass("hide");
-            $(".skip_next_client").removeClass("hide");
+            //$(".skip_next_client").removeClass("hide");
             if(!Helper.mobilecheck()) {
                 $(".skip_next_client").tooltip({
                     delay: 5,
@@ -13,6 +13,7 @@ var Channel = {
                     html: "Skip"
                 });
             }
+            $("#chan").addClass("chan-client");
             $("#results").addClass("client-results-height");
             $(".pagination-results").addClass("client-pagination-height");
             $(".control-list").addClass("client-control-list");
@@ -177,11 +178,13 @@ var Channel = {
         }
 
         if(!Helper.mobilecheck()) {
-            $("#chan").tooltip({
-                delay: 5,
-                position: "bottom",
-                html: "Show join URL",
-            });
+            if(!client) {
+                $("#chan").tooltip({
+                    delay: 5,
+                    position: "bottom",
+                    html: "Show join URL",
+                });
+            }
 
             $("#viewers").tooltip({
                 delay: 5,
@@ -510,7 +513,6 @@ var Channel = {
 
             $("#embed-button").css("display", "none");
             if(!Helper.mobilecheck()) {
-                $("#chan").tooltip("destroy");
                 $('.castButton').tooltip("destroy");
                 $("#viewers").tooltip("destroy");
                 //$('.castButton-unactive').tooltip("destroy");
@@ -528,11 +530,14 @@ var Channel = {
             }
             $("#seekToDuration").remove();
             $(".sidenav").sidenav("destroy");
-            if(M.TapTarget.getInstance($(".tap-target"))) {
-                $('.tap-target').tapTarget('close');
-            }
-            if(M.TapTarget.getInstance($(".tap-target-join"))) {
-                $('.tap-target-join').tapTarget('close');
+            if(!client) {
+                $("#chan").tooltip("destroy");
+                if(M.TapTarget.getInstance($(".tap-target"))) {
+                    $('.tap-target').tapTarget('close');
+                }
+                if(M.TapTarget.getInstance($(".tap-target-join"))) {
+                    $('.tap-target-join').tapTarget('close');
+                }
             }
             clearTimeout(tap_target_timeout);
             before_toast();
diff --git a/server/public/assets/js/functions.js b/server/public/assets/js/functions.js
index 64edfa65..32e7f901 100644
--- a/server/public/assets/js/functions.js
+++ b/server/public/assets/js/functions.js
@@ -425,6 +425,7 @@ function get_list_listener(){
 }
 
 function setup_suggested_listener(){
+    if(client) return;
     socket.on("suggested", function(params){
         var single = true;
         if(params.id === undefined)
diff --git a/server/public/assets/js/listeners.js b/server/public/assets/js/listeners.js
index 7c751a4a..1cc2cae9 100755
--- a/server/public/assets/js/listeners.js
+++ b/server/public/assets/js/listeners.js
@@ -148,7 +148,7 @@ window.zoff = {
     disable_debug: disable_debug
 }
 
-if(!Helper.mobilecheck() && window.location.host != "localhost") {
+if(!Helper.mobilecheck() && (window.location.host != "localhost" && window.location.host != "client.localhost")) {
     window.onerror = function(e, source, lineno, colno, error) {
         if(e == "Script error.") return true;
         Helper.logs.unshift({log: e.toString().replace(/(\r\n|\n|\r)/gm,""), date: new Date(), lineno: lineno, colno: colno, source:source});
diff --git a/server/public/layouts/client/channel.handlebars b/server/public/layouts/client/channel.handlebars
index 13acb0e0..60e83bbe 100755
--- a/server/public/layouts/client/channel.handlebars
+++ b/server/public/layouts/client/channel.handlebars
@@ -5,10 +5,9 @@
     </div>
     <main class="container center-align main">
         <div id="main-row" class="row">
-            {{#if client}}
-            {{else}}
+            {{#unless client}}
                 {{> channel/players}}
-            {{/if}}
+            {{/unless}}
             {{> channel/tabs}}
         </div>
     </main>
diff --git a/server/public/partials/channel/header.handlebars b/server/public/partials/channel/header.handlebars
index e802e1d5..ed164b05 100644
--- a/server/public/partials/channel/header.handlebars
+++ b/server/public/partials/channel/header.handlebars
@@ -37,11 +37,13 @@
                             <i class="material-icons">search</i>
                         </div>
                     </li>
-                    <li class="skip_next_client hide">
-                        <div class="nav-btn skip">
-                            <i class="material-icons">skip_next</i>
-                        </div>
-                    </li>
+                    {{#if client}}
+                        <li class="skip_next_client">
+                            <div class="nav-btn skip">
+                                <i class="material-icons">skip_next</i>
+                            </div>
+                        </li>
+                    {{/if}}
                     <li class="shuffle-btn-container">
                         <div class="nav-btn" id="shuffle">
                             <i class="material-icons">shuffle</i>
diff --git a/server/routing/client/router.js b/server/routing/client/router.js
index 74ea1ac7..61690a8b 100644
--- a/server/routing/client/router.js
+++ b/server/routing/client/router.js
@@ -188,10 +188,9 @@ function channel(req, res, next) {
                     embed: false,
                     client:false,
                 }
-                if(subdomain == "client") {
+                if(subdomain[0] == "client") {
                     data.client = true;
                 }
-
                 if(req.params.channel_name == "404") {
                     res.status(404);
                 }