diff --git a/server/public/assets/js/functions.js b/server/public/assets/js/functions.js
index 2af36551..e867c075 100644
--- a/server/public/assets/js/functions.js
+++ b/server/public/assets/js/functions.js
@@ -40,8 +40,6 @@ function hide_native(way) {
             Player.player.stopVideo();
         } catch(e){}
         Player.stopInterval = true;
-        $("#player_overlay").removeClass("hide");
-        $("#player_overlay").css("display", "block");
         if(Helper.mobilecheck()){
             if($("#pause").hasClass("hide")){
                 $("#play").toggleClass("hide");
@@ -53,13 +51,23 @@ function hide_native(way) {
         } else {
             $("#volume").slider("value", 100);
         }
-        $("#player_overlay").css("background", "url(https://i.ytimg.com/vi/" + video_id + "/maxresdefault.jpg)");
-        $("#player_overlay").css("background-position", "center");
-        $("#player_overlay").css("background-size", "100%");
-        $("#player_overlay").css("background-color", "black");
-        $("#player_overlay").css("background-repeat", "no-repeat");
-        $("#playing_on").css("display", "flex");
-        $("#chromecast_text").html("Playing on<br>" + castSession.La.friendlyName);
+        if(Helper.mobilecheck()) {
+            if(!$("#player_overlay").hasClass("hide")) {
+                $("#player_overlay").addClass("hide")
+            }
+            $("#player_overlay").css("display", "none");
+            $("#playing_on").css("display", "none");
+        } else {
+            $("#player_overlay").removeClass("hide");
+            $("#player_overlay").css("display", "block");
+            $("#player_overlay").css("background", "url(https://i.ytimg.com/vi/" + video_id + "/maxresdefault.jpg)");
+            $("#player_overlay").css("background-position", "center");
+            $("#player_overlay").css("background-size", "100%");
+            $("#player_overlay").css("background-color", "black");
+            $("#player_overlay").css("background-repeat", "no-repeat");
+            $("#playing_on").css("display", "flex");
+            $("#chromecast_text").html("Playing on<br>" + castSession.La.friendlyName);
+        }
         Player.player.setVolume(100);
 
         $("#player_overlay_text").toggleClass("hide");
diff --git a/server/public/assets/js/listeners.js b/server/public/assets/js/listeners.js
index 789f548f..0e01f8ea 100755
--- a/server/public/assets/js/listeners.js
+++ b/server/public/assets/js/listeners.js
@@ -210,50 +210,57 @@ initializeCastApi = function() {
         Helper.log(event.sessionState);
         switch (event.sessionState) {
             case cast.framework.SessionState.SESSION_STARTED:
-            castSession = cast.framework.CastContext.getInstance().getCurrentSession();
-            castSession.addMessageListener("urn:x-cast:zoff.me", chromecastListener)
-            chrome.cast.media.GenericMediaMetadata({title:song_title, image: 'https://img.youtube.com/vi/'+video_id+'/mqdefault.jpg'});
-            chrome.cast.Image('https://img.youtube.com/vi/'+video_id+'/mqdefault.jpg');
-            chromecastAvailable = true;
-            paused = false;
-            mobile_beginning = false;
-            var _seekTo;
-            try{
-                _seekTo = Player.player.getCurrentTime();
-            } catch(e){
-                _seekTo = seekTo;
-            }
-            castSession.sendMessage("urn:x-cast:zoff.me", {type: "loadVideo", start: Player.np.start, end: Player.np.end, videoId: video_id, seekTo: _seekTo, channel: chan.toLowerCase()})
-            castSession.sendMessage("urn:x-cast:zoff.me", {type: "nextVideo", videoId: full_playlist[0].id, title: full_playlist[0].title})
+                castSession = cast.framework.CastContext.getInstance().getCurrentSession();
+                castSession.addMessageListener("urn:x-cast:zoff.me", chromecastListener)
+                chrome.cast.media.GenericMediaMetadata({title:song_title, image: 'https://img.youtube.com/vi/'+video_id+'/mqdefault.jpg'});
+                chrome.cast.Image('https://img.youtube.com/vi/'+video_id+'/mqdefault.jpg');
+                chromecastAvailable = true;
+                paused = false;
+                mobile_beginning = false;
+                var _seekTo;
+                try{
+                    _seekTo = Player.player.getCurrentTime();
+                } catch(e){
+                    _seekTo = seekTo;
+                }
+                castSession.sendMessage("urn:x-cast:zoff.me", {type: "loadVideo", start: Player.np.start, end: Player.np.end, videoId: video_id, seekTo: _seekTo, channel: chan.toLowerCase()})
+                castSession.sendMessage("urn:x-cast:zoff.me", {type: "nextVideo", videoId: full_playlist[0].id, title: full_playlist[0].title})
 
-            if(Helper.mobilecheck() && !chromecast_specs_sent) {
-                chromecast_specs_sent = true;
-                castSession.sendMessage("urn:x-cast:zoff.me", {type: "mobilespecs", guid: guid, socketid: socket.id, adminpass: adminpass == "" ? "" : Crypt.crypt_pass(adminpass), channel: chan.toLowerCase(), userpass: embed ? '' : Crypt.crypt_pass(Crypt.get_userpass(chan.toLowerCase()))})
-            }
-            hide_native(1);
-            break;
+                if(Helper.mobilecheck() && !chromecast_specs_sent) {
+                    chromecast_specs_sent = true;
+                    castSession.sendMessage("urn:x-cast:zoff.me", {type: "mobilespecs", guid: guid, socketid: socket.id, adminpass: adminpass == "" ? "" : Crypt.crypt_pass(adminpass), channel: chan.toLowerCase(), userpass: embed ? '' : Crypt.crypt_pass(Crypt.get_userpass(chan.toLowerCase()))})
+                }
+                hide_native(1);
+                if(Helper.mobilecheck()) {
+                    Player.playVideo();
+                }
+                $("#channel-load").css("display", "none");
+                $('.castButton').addClass('castButton-white-active');
+                break;
             case cast.framework.SessionState.SESSION_RESUMED:
-            castSession = cast.framework.CastContext.getInstance().getCurrentSession();
-            castSession.addMessageListener("urn:x-cast:zoff.me", chromecastListener);
-            chrome.cast.media.GenericMediaMetadata({title:song_title, image: 'https://img.youtube.com/vi/'+video_id+'/mqdefault.jpg'});
-            chrome.cast.Image('https://img.youtube.com/vi/'+video_id+'/mqdefault.jpg');
-            chromecastAvailable = true;
-            paused = false;
-            mobile_beginning = false;
-            var _seekTo;
-            try{
-                _seekTo = Player.player.getCurrentTime();
-            } catch(e){
-                _seekTo = seekTo;
-            }
-            castSession.sendMessage("urn:x-cast:zoff.me", {type: "loadVideo", start: Player.np.start, end: Player.np.end, videoId: video_id, seekTo: _seekTo, channel: chan.toLowerCase()})
-            castSession.sendMessage("urn:x-cast:zoff.me", {type: "nextVideo", videoId: full_playlist[0].id, title: full_playlist[0].title})
-            hide_native(1);
-            break;
+                castSession = cast.framework.CastContext.getInstance().getCurrentSession();
+                castSession.addMessageListener("urn:x-cast:zoff.me", chromecastListener);
+                chrome.cast.media.GenericMediaMetadata({title:song_title, image: 'https://img.youtube.com/vi/'+video_id+'/mqdefault.jpg'});
+                chrome.cast.Image('https://img.youtube.com/vi/'+video_id+'/mqdefault.jpg');
+                chromecastAvailable = true;
+                paused = false;
+                mobile_beginning = false;
+                var _seekTo;
+                try{
+                    _seekTo = Player.player.getCurrentTime();
+                } catch(e){
+                    _seekTo = seekTo;
+                }
+                castSession.sendMessage("urn:x-cast:zoff.me", {type: "loadVideo", start: Player.np.start, end: Player.np.end, videoId: video_id, seekTo: _seekTo, channel: chan.toLowerCase()})
+                castSession.sendMessage("urn:x-cast:zoff.me", {type: "nextVideo", videoId: full_playlist[0].id, title: full_playlist[0].title})
+                hide_native(1);
+                $("#channel-load").css("display", "none");
+                $('.castButton').addClass('castButton-white-active');
+                break;
             case cast.framework.SessionState.SESSION_ENDED:
-            chromecastAvailable = false;
-            hide_native(0);
-            break;
+                chromecastAvailable = false;
+                hide_native(0);
+                break;
         }
     });
 
diff --git a/server/public/assets/js/player.js b/server/public/assets/js/player.js
index a229c71c..aae2030c 100755
--- a/server/public/assets/js/player.js
+++ b/server/public/assets/js/player.js
@@ -639,7 +639,9 @@ var Player = {
                 //currDurr = currDurr - Player.np.start;
                 minutes = Math.floor(currDurr / 60);
                 seconds = currDurr - (minutes * 60);
-                document.getElementById("duration").innerHTML = Helper.pad(minutes)+":"+Helper.pad(seconds)+" <span id='dash'>/</span> "+Helper.pad(dMinutes)+":"+Helper.pad(dSeconds);
+                if(!isNaN(minutes) && !isNaN(seconds) && !isNaN(dMinutes) && !isNaN(dSeconds)) {
+                    $("#duration").html(Helper.pad(minutes)+":"+Helper.pad(seconds)+" <span id='dash'>/</span> "+Helper.pad(dMinutes)+":"+Helper.pad(dSeconds));
+                }
                 per = (100 / duration) * currDurr;
                 if(per >= 100) {
                     per = 100;