diff --git a/server/public/assets/js/channel.js b/server/public/assets/js/channel.js
index 74ff9250..bd04b513 100644
--- a/server/public/assets/js/channel.js
+++ b/server/public/assets/js/channel.js
@@ -608,7 +608,7 @@ var Channel = {
                         Helper.removeClass("#video-container", "no-opacity");
                         document.getElementById("main-row").insertAdjacentHTML("afterbegin", "<div id='player_bottom_overlay' class='player player_bottom'></div>");
                         document.getElementById("player_bottom_overlay").insertAdjacentHTML("afterbegin", "<a id='closePlayer' title='Close Player'>X</a>");
-                        Helper.removeElement("#wrapper");
+                        Helper.removeElement("#playlist");
                     } else {
                         try{
                             Player.player.destroy();
@@ -644,6 +644,7 @@ var Channel = {
                         frontpage 	= true;
                         Frontpage.init();
                     }
+
                     changing_to_frontpage = false;
 
                     if(document.querySelectorAll("#alreadychannel").length === 0 && !user_auth_avoid){
diff --git a/server/public/assets/js/frontpage.js b/server/public/assets/js/frontpage.js
index 0d07e1c9..a4198532 100755
--- a/server/public/assets/js/frontpage.js
+++ b/server/public/assets/js/frontpage.js
@@ -376,7 +376,7 @@ var Frontpage = {
                 if(document.querySelectorAll("#alreadychannel").length === 0 || Helper.mobilecheck() || Player.player === undefined){
                     document.getElementsByTagName("main")[0].innerHTML = response.querySelectorAll("main")[0].innerHTML;
                 } else {
-                    document.getElementById("main-row").insertAdjacentHTML("beforeend", response.querySelectorAll("#wrapper")[0].outerHTML);
+                    document.getElementById("main-row").insertAdjacentHTML("beforeend", response.querySelectorAll("#playlist")[0].outerHTML);
                     if(!client) document.getElementById("video-container").insertAdjacentHTML("beforeend", response.querySelectorAll("#main_components")[0].outerHTML);
                     document.getElementById("main-row").insertAdjacentHTML("beforeend", "<div id='playbar'></div>");
                     Helper.removeClass("#player", "player_bottom");
diff --git a/server/public/assets/js/player.js b/server/public/assets/js/player.js
index d2af7837..95dcf2b6 100755
--- a/server/public/assets/js/player.js
+++ b/server/public/assets/js/player.js
@@ -610,11 +610,10 @@ var Player = {
                 }else
                 Player.seekTo(seekTo);
             }
+            Player.player.setVolume(Crypt.get_volume());
             Player.readyLooks();
             Playercontrols.initYoutubeControls(Player.player);
-            Player.player.setVolume(Crypt.get_volume());
             Playercontrols.initSlider();
-            Player.player.setVolume(Crypt.get_volume());
         }catch(e){
         }
     },
diff --git a/server/public/assets/js/suggestions.js b/server/public/assets/js/suggestions.js
index 065d1178..7141bc8b 100755
--- a/server/public/assets/js/suggestions.js
+++ b/server/public/assets/js/suggestions.js
@@ -69,7 +69,9 @@ var Suggestions = {
                             var video_id 	= song.id;
                             var video_title = song.snippet.title;
 
-                            document.getElementById("suggest-song-html").insertAdjacentHTML("beforeend", List.generateSong({id: video_id, title: video_title, length: length, duration: duration}, false, false, false));
+                            try {
+                                document.getElementById("suggest-song-html").insertAdjacentHTML("beforeend", List.generateSong({id: video_id, title: video_title, length: length, duration: duration}, false, false, false));
+                            } catch(e) {}
                         }
                     }
                 });