diff --git a/gulpfile.js b/gulpfile.js
index f2c7b3b6..2ae8c87b 100755
--- a/gulpfile.js
+++ b/gulpfile.js
@@ -5,11 +5,11 @@ var gulp    = require('gulp'),
 
 gulp.task('js', function () {
     gulp.src(['server/VERSION.js', 'server/config/api_key.js', 'server/public/assets/js/*.js', '!server/public/assets/js/embed*', '!server/public/assets/js/token*', '!server/public/assets/js/remotecontroller.js', '!server/public/assets/js/callback.js'])
-        /*.pipe(uglify({
+        .pipe(uglify({
         	mangle: true,
             compress: true,
         	enclose: true
-        }))*/
+        }))
         .pipe(concat('main.min.js'))
         .pipe(gulp.dest('server/public/assets/dist'));
 });
diff --git a/server/public/assets/js/channel.js b/server/public/assets/js/channel.js
index 2488e018..74ff9250 100644
--- a/server/public/assets/js/channel.js
+++ b/server/public/assets/js/channel.js
@@ -44,7 +44,38 @@ var Channel = {
 
         if(!client) {
             //Helper.tabs('.playlist-tabs');
-            Helper.tabs('.playlist-tabs-loggedIn');
+            Helper.tabs('.playlist-tabs-loggedIn', {
+                onShow: function(e) {
+                    if(this.index == 2) {
+                        document.getElementById("text-chat-input").focus();
+                        Chat.channel_received = 0;
+                        Chat.all_received = 0;
+                        Helper.addClass(document.querySelector(".chat-link span.badge.new.white"), "hide");
+                        document.getElementById("favicon").setAttribute("href", "/assets/images/favicon.png");
+
+                        chat_active = true;
+                        unseen = false;
+                        chat_unseen = false;
+                        document.getElementsByClassName("chat-link")[0].setAttribute("style", "color: white !important;");
+                        blinking = false;
+                        //Helper.css("#chat-container", "display", "block");
+                        //Helper.css("#wrapper", "display", "none");
+                        //Helper.css("#suggestions", "display", "none");
+                        document.getElementById("text-chat-input").focus();
+                        Helper.css("#pageButtons", "display", "none");
+                        scrollChat();
+                    }
+                }
+            });
+
+            if(window.location.hash == "#chat-container") {
+                M.Tabs.getInstance(document.querySelector('.playlist-tabs-loggedIn')).select("chat-container");
+            } else if(window.location.hash == "#suggestions") {
+                M.Tabs.getInstance(document.querySelector('.playlist-tabs-loggedIn')).select("suggestions");
+            } else if(window.location.hash == "#wrapper") {
+                M.Tabs.getInstance(document.querySelector('.playlist-tabs-loggedIn')).select("wrapper");
+            }
+
             Helper.tabs('.chatTabs');
         }
         var sidenavElem = document.getElementsByClassName("sidenav")[0];
@@ -577,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("#playlist");
+                        Helper.removeElement("#wrapper");
                     } else {
                         try{
                             Player.player.destroy();
diff --git a/server/public/assets/js/chat.js b/server/public/assets/js/chat.js
index 853d06fb..798e660d 100755
--- a/server/public/assets/js/chat.js
+++ b/server/public/assets/js/chat.js
@@ -178,16 +178,5 @@ var Chat = {
             document.getElementById("chatchannel").scrollTop = document.getElementById("chatchannel").scrollHeight;
             programscroll = false;
         }
-    },
-
-    chat_blink: function() {
-        blinking = true;
-        document.querySelector(".chat-link").setAttribute("style", "color: grey !important;");
-        setTimeout(function () {
-            document.querySelector(".chat-link").setAttribute("style", "color: white !important;");
-            setTimeout(function() {
-                if(blinking) Chat.chat_blink();
-            }, 1000);
-        }, 1000);
     }
 };
diff --git a/server/public/assets/js/embed.js b/server/public/assets/js/embed.js
index 9323bf71..3799918c 100755
--- a/server/public/assets/js/embed.js
+++ b/server/public/assets/js/embed.js
@@ -66,9 +66,7 @@ function receiveMessage(event) {
 }
 
 window.addEventListener("message", receiveMessage, false);
-console.log("qq");
 window.addEventListener("DOMContentLoaded", function() {
-    console.log("ads");
     if(hash.length >= 3 && hash[2] == "autoplay"){
         autoplay = true;
         Helper.css("#player", "visibility", "hidden");
@@ -77,7 +75,7 @@ window.addEventListener("DOMContentLoaded", function() {
     }
 
     if(hash.indexOf("videoonly") > -1) {
-        Helper.addClass("#playlist", "hide");
+        Helper.addClass("#wrapper", "hide");
         Helper.addClass("#controls", "hide");
         Helper.addClass("#player", "video_only");
         Helper.css("#zoffbutton", "bottom", "0px");
@@ -122,7 +120,7 @@ window.addEventListener("DOMContentLoaded", function() {
     Playercontrols.initSlider();
     window.setVolume = setVolume;
     Helper.css("#controls", "background-color", color);
-    Helper.css("#playlist", "background-color", color);
+    Helper.css("#wrapper", "background-color", color);
     if(hash.indexOf("controll") > -1) {
         Hostcontroller.change_enabled(true);
     } else {
diff --git a/server/public/assets/js/frontpage.js b/server/public/assets/js/frontpage.js
index 70f0f52f..0d07e1c9 100755
--- a/server/public/assets/js/frontpage.js
+++ b/server/public/assets/js/frontpage.js
@@ -225,11 +225,13 @@ var Frontpage = {
                     headers: {"Content-Type": "application/json;charset=UTF-8"},
                     success: function(data){
                         setTimeout(function(){
-                            Helper.css("#mega-background", "background", "url(/assets/images/thumbnails/"+data+")");
-                            Helper.css("#mega-background", "background-size" , "cover");
-                            Helper.css("#mega-background", "background-repeat" , "no-repeat");
-                            Helper.css("#mega-background", "opacity", 1);
-                            document.querySelector(".autocomplete").setAttribute("placeholder", list[i]._id);
+                            try {
+                                Helper.css("#mega-background", "background", "url(/assets/images/thumbnails/"+data+")");
+                                Helper.css("#mega-background", "background-size" , "cover");
+                                Helper.css("#mega-background", "background-repeat" , "no-repeat");
+                                Helper.css("#mega-background", "opacity", 1);
+                                document.querySelector(".autocomplete").setAttribute("placeholder", list[i]._id);
+                            } catch(e) {}
                         },500);
                     },
                     error: function() {
@@ -238,11 +240,13 @@ var Frontpage = {
                 });
             };
             img.onload = function(){ // Loaded successfully
-                Helper.css("#mega-background", "background", "url("+img.src+")");
-                Helper.css("#mega-background", "background-size" , "cover");
-                Helper.css("#mega-background", "background-repeat" , "no-repeat");
-                Helper.css("#mega-background", "opacity", 1);
-                document.querySelector(".autocomplete").setAttribute("placeholder", list[i]._id);
+                try {
+                    Helper.css("#mega-background", "background", "url("+img.src+")");
+                    Helper.css("#mega-background", "background-size" , "cover");
+                    Helper.css("#mega-background", "background-repeat" , "no-repeat");
+                    Helper.css("#mega-background", "opacity", 1);
+                    document.querySelector(".autocomplete").setAttribute("placeholder", list[i]._id);
+                } catch(e) {}
             };
 
         }
@@ -372,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("#playlist")[0].outerHTML);
+                    document.getElementById("main-row").insertAdjacentHTML("beforeend", response.querySelectorAll("#wrapper")[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/functions.js b/server/public/assets/js/functions.js
index a41abd6a..82380836 100644
--- a/server/public/assets/js/functions.js
+++ b/server/public/assets/js/functions.js
@@ -871,11 +871,11 @@ function before_toast(){
 }
 
 function scrollChat() {
-    var current = document.querySelector(".chat-tab active").getAttribute("href");
+    var current = document.querySelector(".chatTabs .active").getAttribute("href");
     if(current == "#channelchat") {
-        document.querySelector('#chatchannel').scrollTop(document.querySelector('#chatchannel').scrollHeight);
+        document.querySelector('#chatchannel').scrollTop = document.querySelector('#chatchannel').scrollHeight;
     } else if(current == "#all_chat") {
-        document.querySelector('#chatall').scrollTop(document.querySelector('#chatall').scrollHeight);
+        document.querySelector('#chatall').scrollTop = document.querySelector('#chatall').scrollHeight;
     }
 }
 
diff --git a/server/public/assets/js/list.js b/server/public/assets/js/list.js
index 5c1f8829..fa5d9a01 100755
--- a/server/public/assets/js/list.js
+++ b/server/public/assets/js/list.js
@@ -171,7 +171,6 @@ var List = {
             List.can_fit = Math.round((window.innerHeight - Helper.computedStyle(".tabs", "height") - Helper.computedStyle("header", "height") - 64 - 40) / 71);
             List.element_height = ((window.innerHeight - Helper.computedStyle(".tabs", "height") - Helper.computedStyle("header", "height") - 64 - 40) / List.can_fit)-5;
         }
-        console.log(List.can_fit, List.element_height, List.page);
         if(list_html === undefined) list_html = Helper.html("#list-song-html");
         full_playlist = msg;
         if(offline && !no_reset){
@@ -315,7 +314,6 @@ var List = {
             }
         } else {
             if(way==-10) {
-                console.log(wrapperChildren, List.page, List.can_fit);
                 Helper.css(wrapperChildren.slice(List.page, List.page + List.can_fit), "display", "none");
                 List.page = 0;
                 Helper.css(wrapperChildren.slice(List.page, List.page + List.can_fit), "display", "inline-flex");
@@ -991,13 +989,5 @@ var List = {
             }
 
         } catch(e) {}
-    },
-
-    scrollTop: function() {
-        document.querySelector("#wrapper").scrollTop(0);
-    },
-
-    scrollBottom: function(){
-        document.querySelector("#wrapper").scrollTop(document.querySelector("#wrapper").scrollHeight);
     }
 };
diff --git a/server/public/assets/js/listeners.js b/server/public/assets/js/listeners.js
index 5e7bb633..0a246f9f 100755
--- a/server/public/assets/js/listeners.js
+++ b/server/public/assets/js/listeners.js
@@ -513,10 +513,10 @@ addListener("click", ".delete-context-menu", function(e) {
 
         var to_display = number_suggested > 9 ? "9+" : number_suggested;
         if(to_display == 0){
-            Helper.addClass(document.querySelector(".chat-link span.badge.new.white"), "hide");
+            Helper.addClass(document.querySelector(".suggested-link span.badge.new.white"), "hide");
         }
 
-        Helper.setHtml(document.querySelector(".chat-link span.badge.new.white"), to_display);
+        Helper.setHtml(document.querySelector(".suggested-link span.badge.new.white"), to_display);
     }
 
     List.vote(id, "del");
@@ -1049,17 +1049,7 @@ addListener("submit", "#remoteform", function(e) {
     Mobile_remote.get_input(document.getElementById("remote_channel").value);
 });
 
-addListener("click", ".chat-link", function(){
-    document.getElementById("text-chat-input").focus();
-    Helper.css(document.querySelector("#chat-btn i"), "opacity", 1);
-    Chat.channel_received = 0;
-    Chat.all_received = 0;
-    Helper.addClass(document.querySelector(".chat-link span.badge.new.white"), "hide");
-    unseen = false;
-    document.getElementById("favicon").setAttribute("href", "/assets/images/favicon.png");
 
-    scrollChat();
-});
 
 addListener("click", ".chat-tab-li", function() {
     scrollChat();
@@ -1113,19 +1103,7 @@ addListener("click", "#embed-button", function() {
     ga('send', 'event', "button-click", "embed-channel", "channel-name", chan.toLowerCase());
 })
 
-addListener("click", ".chat-link", function(e){
-    chat_active = true;
-    unseen = false;
-    chat_unseen = false;
-    document.getElementsByClassName("chat-link")[0].setAttribute("style", "color: white !important;");
-    blinking = false;
-    document.getElementById("favicon").setAttribute("href", "/assets/images/favicon.png");
-    Helper.css("#chat-container", "display", "block");
-    Helper.css("#wrapper", "display", "none");
-    Helper.css("#suggestions", "display", "none");
-    document.getElementById("text-chat-input").focus();
-    Helper.css("#pageButtons", "display", "none");
-});
+
 
 addListener("click", ".playlist-link", function(e){
     chat_active = false;
@@ -1380,7 +1358,7 @@ addListener("click", ".add-suggested", function(e){
 
         var to_display = number_suggested > 9 ? "9+" : number_suggested;
         if(!document.querySelector(".suggested-link span.badge.new.white").classList.contains("hide") && to_display == 0){
-            Helper.addClass(document.querySelector(".chat-link span.badge.new.white"), "hide");
+            Helper.addClass(document.querySelector(".suggested-link span.badge.new.white"), "hide");
             Helper.addClass("#user_suggests", "hide");
             Helper.addClass("#suggest_bar", "hide");
         }
@@ -1405,7 +1383,7 @@ addListener("click", ".del_user_suggested", function(e){
 
     var to_display = number_suggested > 9 ? "9+" : number_suggested;
     if(to_display == 0){
-        Helper.addClass(document.querySelector(".chat-link span.badge.new.white"), "hide");
+        Helper.addClass(document.querySelector(".suggested-link span.badge.new.white"), "hide");
     }
 
     docu.querySelector(".suggested-link span.badge.new.white").innerText = to_display;
diff --git a/server/public/assets/js/suggestions.js b/server/public/assets/js/suggestions.js
index 8d99fa2c..065d1178 100755
--- a/server/public/assets/js/suggestions.js
+++ b/server/public/assets/js/suggestions.js
@@ -13,7 +13,7 @@ var Suggestions = {
         }
         var to_display = number_suggested > 9 ? "9+" : number_suggested;
         if(number_suggested > 0 && Admin.logged_in){
-            Helper.removeClass(document.querySelector(".chat-link span.badge.new.white"), "hide");
+            Helper.removeClass(document.querySelector(".suggested-link span.badge.new.white"), "hide");
         }
         document.querySelector(".suggested-link span.badge.new.white").innerText = to_display;
         if(single){
@@ -31,7 +31,7 @@ var Suggestions = {
         var video_id 	= params.id;
         var video_title = params.title;
         var song 		= List.generateSong({id: video_id, title: video_title, length: params.duration, duration: duration}, false, false, false, true);
-        if(document.querySelectorAll("#" + song.getAttribute("id")).length == 0) {
+        if(document.querySelectorAll("#" + video_id).length == 0) {
             document.getElementById("user-suggest-html").insertAdjacentHTML("beforeend", song);
         }
     },
diff --git a/server/public/partials/channel/tabs.handlebars b/server/public/partials/channel/tabs.handlebars
index b16c2620..d6cb64b1 100644
--- a/server/public/partials/channel/tabs.handlebars
+++ b/server/public/partials/channel/tabs.handlebars
@@ -3,7 +3,7 @@
     <ul class="tabs playlist-tabs-loggedIn tabs-fixed-width" style="width: 96%;">
         <li class="tab col s3"><a class="playlist-tab-links playlist-link active truncate" href="#wrapper">Playlist</a></li>
         <li class="tab col s3"><a class="playlist-tab-links suggested-link truncate" href="#suggestions">Suggested<span class="new badge white hide suggested-badge"></span></a></li>
-        <li class="tab col s3"><a class="playlist-tab-links chat-link truncate" href="#chat">Chat<span class="new badge white hide"></span></a></li>
+        <li class="tab col s3"><a class="playlist-tab-links chat-link truncate" href="#chat-container">Chat<span class="new badge white hide"></span></a></li>
     </ul>
     {{/unless}}
     <div id="find_div" class="hide">