diff --git a/index.php b/index.php
index 888c4ce5..527a9165 100755
--- a/index.php
+++ b/index.php
@@ -42,7 +42,7 @@
                     <ul class="side-nav" id="mobile-demo">
                         <?php include("php/panel.php");?>
                     </ul>
-                    <form id="searchform">
+                    <form id="searchform" onsubmit="return false">
                         <div>
                             <input id="search" class="search_input" type="search" required title="Search for songs..." spellcheck="false" placeholder="Search" onsubmit="null;" autocomplete="off">
                             <!--<label for="search"><i class="mdi-action-search"></i></label>
diff --git a/php/activechannels.php b/php/activechannels.php
deleted file mode 100755
index abf7765d..00000000
--- a/php/activechannels.php
+++ /dev/null
@@ -1,18 +0,0 @@
-<?php
-
-$dir = scandir('../lists');
-$channels = array();
-$all_channels = array();
-$time = 60*60*24*4; //4 dager
-foreach($dir as $files){
-	if(strpos($files, '.json') !== FALSE){
-		if(time() - filemtime('../lists/'.$files) < $time){
-			array_push($channels, ucfirst(str_replace(".json", "", $files)));
-		}
-		array_push($all_channels, ucfirst(str_replace(".json", "", $files)));
-	}
-}
-
-print_r(json_encode($channels));
-
-?>
diff --git a/php/change.php b/php/change.php
deleted file mode 100755
index 40307db2..00000000
--- a/php/change.php
+++ /dev/null
@@ -1,279 +0,0 @@
-<?php
-                                                                //making our guid, its unique and coooooool
-$guid=substr(base64_encode(crc32($_SERVER['HTTP_USER_AGENT'].$_SERVER['REMOTE_ADDR'].$_SERVER['HTTP_ACCEPT_LANGUAGE'])), 0, 8);
-
-//save or delete(oid)                                             //getting the list we are in
-$list = explode("/", htmlentities(strtolower($_SERVER["REQUEST_URI"])));
-if($list[1]==""||!isset($list[1])||count($list)<=1)$list="videos";
-else $list = preg_replace('/[^\da-z=?]/i', '', urldecode($list[1]));
-
-$list="../lists/".$list.".json";                                   //actually setting the list for the target. Under is the array for an empty list being created
-$array = array("nowPlaying" => array("30H2Z8Lr-4c" => array("id" => "30H2Z8Lr-4c", "title" => "Empty Channel, search to add a video")), "songs" => array(), "conf" => array("startTime" => time(), "views" => array(), "skips" => array(), "vote" => "false", "addsongs" => "false", "longsongs" => "true", "frontpage" => "true", "allvideos" => "true", "removeplay" => "false", "skip" => "true", "shuffle" => "false", "adminpass" => ""));
-$array = json_encode($array);                                      //encoding the array
-$f = @fopen($list,"x");                                            //opening a file, ignoring warnings
-if($f){ fwrite($f,$array); fclose($f); }                           //if the file doesn't exist, we create a new one, and adds the newly made array there
-$file = file_get_contents($list);                                  //gets the content of the file
-$data = json_decode($file, TRUE);                                  //decoding the file. The true is there for array comprehension in php or something. Don't remove!
-$songs = $data["songs"];                                           //setting the now playing and the next song in the next couplecouple of lines
-$np = $data["nowPlaying"];
-$np = array_values($np);
-$firstSong = array_values($songs);
-$save = false;                                                      //declares the save variable, see further down for why
-
-
-if(isset($_REQUEST['shuffle'])){ //shuffle songs  in list
-
-    $q = $data["conf"];
-    $q = array_key_exists("shuffle", $q);
-    $pass = htmlspecialchars($_GET['pass']);
-    $x = explode("/", htmlspecialchars(strtolower($_SERVER["REQUEST_URI"])));
-    if($pass != "")
-        $pass=crypt($pass, '$6$rounds=9001$'.$x[1].'Fuck0ffuSn34kyn!ggerzZ$');
-    if(sizeof($data["songs"]) == 0){
-        die("size");
-    }
-    if($pass == $data["conf"]["adminpass"] || $data["conf"]["adminpass"] == "" || $q != 1
-        || $data["conf"]["shuffle"] == "true") {
-
-        //shuffle($data["songs"]);
-        foreach($data["songs"] as $k=>$v) { 
-                $data["songs"][$v["id"]]["added"]=rand(0,time());
-                $sort['votes'][$k] = $v['votes'];
-                $sort['added'][$k] = $data["songs"][$k]["added"];
-        }
-        array_multisort($sort['votes'], SORT_DESC, $sort['added'], SORT_ASC, $data["songs"]);
-        file_put_contents($list, json_encode($data));
-        //die("shuffeled");
-        echo "shuffled";
-        die();
-    }else{
-        die("wrong!");
-    }
-}
-
-if(is_array($data["conf"]["views"])){
-    if(!in_array($guid, $data["conf"]["views"])){                       //add viewer in viewers if not already in there
-        array_push($data["conf"]["views"], $guid);
-        file_put_contents($list, json_encode($data));
-    }
-}else{
-    $data["conf"]["views"]=array($guid);
-    file_put_contents($list, json_encode($data));
-}
-
-//If test for either saving when the song is done, or an error has occured
-if(isset($_REQUEST['thisUrl'])){
-    $string = $_REQUEST['thisUrl'];                                 //saving string as the id of the song
-    $action = isset($_REQUEST['act']);                              //checking the action of the request, either save or del
-    $firstToAdd = $firstSong[0]["id"];                              //getting the id of the first in the queue
-    if($np[0]["id"] == $string)                                     //if the string we're sending in matches the id of the song playing now, we proceed
-    {
-        if($action=="save" || $action == "empty"){                  //action save or empty, either way goes further
-            $save = true;                                           //small fix for the editing of viewers. Explain later in file.
-            //array_shift($data["songs"]);
-            //array_shift($data["nowPlaying"]);
-            if(!is_null($np[0]["id"]) && !is_null($firstToAdd)){    //Checking both the next song and the song playing now is null, if so it just skips the flipping around with songs
-                array_shift($data["songs"]);                        //already shifts the array of songs, because we have the first in the queue saved
-                $q = $data["conf"];
-                $q = array_key_exists("removeplay", $q);            
-                if(($data["conf"]["removeplay"] == "false" || $q != 1) && ($np[0]["id"] != "30H2Z8Lr-4c" && !is_null($firstToAdd)))         //checking if removeplay exists or if its false. If its true, the song we just played won't be added to the queue
-                {   //here we just adds the song that was just played into the queue in the songs array, take note here we set added as the current time it was added. This is because of the multisort further down
-                    $data["songs"][$np[0]["id"]] = array("id" => $np[0]["id"], "title" => $np[0]["title"], "votes" => $np[0]["votes"], "added" => time(), "guids" => array());
-                }
-                array_shift($data["nowPlaying"]);                   //shifting the nowPlaying array, and moving the first in line to the nowPlaying array
-                $data["nowPlaying"][$firstSong[0]["id"]] = array("id" => $firstSong[0]["id"], "title" => $firstSong[0]["title"], "votes" => 0, "added" => $firstSong[0]["added"], "guids" => $firstSong[0]["guids"]);
-            
-            }
-            
-            //array_push($data["songs"], $add);
-            $data["conf"]["skips"] = array();                        //resets the skip count
-            $data["conf"]["startTime"] = time();                     //resets the starttime of the song so it will be sorted accordingly
-            $data["conf"]["views"]= array($guid);                    //reset the viewers so you dont count old viewers
-            foreach($data["songs"] as $k=>$v) {                      //the next 5 lines of code is just for sorting the array with highest votes at the top, and the lowest time added at the top, so that the voting will be alot more fair
-                $sort['votes'][$k] = $v['votes'];
-                $sort['added'][$k] = $v['added'];
-            }
-            array_multisort($sort['votes'], SORT_DESC, $sort['added'], SORT_ASC, $data["songs"]);           
-        }
-       /* else if($action=="delete"){
-            array_shift($firstSong[0]);
-        }*/
-        file_put_contents($list, json_encode($data));                   //sending the encoded json array to the file
-     }else if(is_null($np[0]["id"]))                                    //if nowPlaying is null, it just moves the first song in the queue up
-     {
-        array_shift($data["songs"]);
-        array_shift($data["nowPlaying"]);
-        $data["nowPlaying"][$firstSong[0]["id"]] = array("id" => $firstSong[0]["id"], "title" => $firstSong[0]["title"], "votes" => 0, "added" => $firstSong[0]["added"], "guids" => $firstSong[0]["guids"]);
-            
-     }
-     if($action == "save" && !$save)                                    //count views
-     {
-        file_put_contents($list, json_encode($data));
-     }
-     $newPlaying = array_values($data["nowPlaying"]);                   //returning the new songs id to the javascript so it gets what song to start next
-     echo json_encode(array( "id" => $newPlaying[0]["id"], "title" => $newPlaying[0]["title"]));                                      
-}
-else if(isset($_GET['v'])){                                             //if it gets v, we start our add "function"
-    $q = $data["conf"];
-    $q = array_key_exists("addsongs", $q);
-    $pass = htmlspecialchars($_GET['pass']);
-    $x = explode("/", htmlspecialchars(strtolower($_SERVER["REQUEST_URI"])));
-    $pass=crypt($pass, '$6$rounds=9001$'.$x[1].'Fuck0ffuSn34kyn!ggerzZ$');
-    if($pass == $data['conf']['adminpass'] || $data['conf']['addsongs'] == "false" || $q != 1) //checking wether it has been set so only admins can add songs. If its false, or the value doesn't exist, we continue
-    {
-        $video = htmlspecialchars($_GET['v']);                          //id of the video
-        $name = htmlspecialchars($_GET['n']);                           //name of the video
-        if($np[0]["id"] == "30H2Z8Lr-4c")
-        {
-            $q = array("nowPlaying" => array($video => array("id" => $video, "title" => $name, "votes" => 0, "added" => time(), "guids" => array())), "songs" => array(), "conf" => array("startTime" => time(), "views" => array(), "skips" => array(), "vote" => "false", "addsongs" => "false", "longsongs" => "true", "frontpage" => "true", "allvideos" => "true", "removeplay" => "false", "skip" => "true", "shuffle" => "false", "adminpass" => ""));
-            //$q = array("nowPlaying" => array($video => array("id" => $video, "title" => $name, "votes" => 0, "added" => time(), "guids" => array())), "songs" => array(), "conf" => array("startTime" => time(), "views" => array(), "skips" => array()));
-            $q["nowPlaying"][$video]["votes"] = 1;                         //Upping the votes, so it comes further up than the ones already played
-            array_push($q["nowPlaying"][$video]["guids"], $guid); 
-            file_put_contents($list, json_encode($q));
-            print("added");
-        }else if(!in_array($video, $data["songs"]))                           //checking if the video already is in the array of songs (should check the now playing to)
-        {
-            if(count($data["nowPlaying"]) > 0) $place = "songs";        //checking if the nowPlaying array is empty, if it is, the "place" to add it is nowPlaying, if not it is songs
-            else $place = "nowPlaying";                                 //Adding to the array
-            $data[$place][$video] = array("id" => $video, "title" => $name, "votes" => 0, "added" => time(), "guids" => array());
-            $data[$place][$video]["votes"] = 1;                         //Upping the votes, so it comes further up than the ones already played
-            array_push($data[$place][$video]["guids"], $guid);          //adding the users GUID to the array so he can't vote infinite times                                            
-            if($place != "nowPlaying")
-            {
-                $sort = array();
-                foreach($data["songs"] as $k=>$v) {
-                    $sort['votes'][$k] = $v['votes'];                   //Again sorting, explained further up
-                    $sort['added'][$k] = $v['added'];
-                }
-                array_multisort($sort['votes'], SORT_DESC, $sort['added'], SORT_ASC, $data["songs"]);
-            }
-            file_put_contents($list, json_encode($data));
-            print("added");                                             //Just telling the javascript that it has been added for some reason...
-        }
-    }else{
-        print("wrong");
-    }
-}
-
-else if(isset($_GET['vote'])){                                           //if the getvaluethingy is vote, this starts
-    $vote=$_GET['vote'];                                                 //The javascript either sends in neg or pos, this is where we save the value
-    $id=$_GET['id'];                                                    //id of the video/song the user is voting for
-    if($vote=='del'){                                                   //This is so we don't have to make a seperate function for the delete
-        $pass=$_GET['pass'];
-        $x = explode("/", htmlspecialchars(strtolower($_SERVER["REQUEST_URI"])));
-        $pass=crypt($pass, '$6$rounds=9001$'.$x[1].'Fuck0ffuSn34kyn!ggerzZ$');
-        $adminpass=$data["conf"]["adminpass"];    
-        
-        if($adminpass == $pass){                                        //checking if the password is correct, then deleting the song (this is not in use yet.)
-            unset($data["songs"][$id]);
-            file_put_contents($list, json_encode($data));
-            echo "removed song with ID: ".$id." from list: ".$list;
-        }
-
-    }else                                                               //if we don't get the del, we're voting, WOHO!
-    {
-        $q = $data["conf"];
-        $q = array_key_exists("vote", $q);
-        $pass = htmlspecialchars($_GET['pass']);
-        $x = explode("/", htmlspecialchars(strtolower($_SERVER["REQUEST_URI"])));
-        $pass=crypt($pass, '$6$rounds=9001$'.$x[1].'Fuck0ffuSn34kyn!ggerzZ$');
-        if($pass == $data['conf']['adminpass'] || $data['conf']['vote'] == "false" || $q != 1)
-        {
-            if($vote == 'neg'){$voteAdd = -1;}                              //setting the votetoadd to the array depending of what way you swing.
-            else if($vote == 'pos'){$voteAdd = 1;}                          //checking if the key exists in the array, and if we're already voted
-            if(array_key_exists($id, $data["songs"]) && !in_array($guid, $data["songs"][$id]["guids"]))
-            {                                                               //finally adding the vote to the votings
-                $data["songs"][$id]["votes"] = $data["songs"][$id]["votes"] + $voteAdd;
-                if($data["songs"][$id]["votes"] > -1)                       //but only if we're still above or equal to 0
-                {
-                    $data["songs"][$id]["added"] = time();                  //updating the added time, so it comes on the bottom of its own "level" of votes
-                    array_push($data["songs"][$id]["guids"], $guid);        //pushing the users guid to the array so he/she can't vote again
-                    foreach($data["songs"] as $k=>$v) {
-                        $sort['votes'][$k] = $v['votes'];                   //again, sorting
-                        $sort['added'][$k] = $v['added'];
-                    }
-                    array_multisort($sort['votes'], SORT_DESC, $sort['added'], SORT_ASC, $data["songs"]);
-                    file_put_contents($list, json_encode($data));
-                    echo "Vote registrated. I hope";                        
-                }else
-                {
-                    print("many");
-                }
-            }else
-            {
-                print("many");                                             //not in use..i think..
-            }
-        }else{
-            print("wrong");
-        }
-        
-
-    }
-}
-else if(isset($_GET['skip'])){                                          //skip, really similar to the save function, not going in depth here.
-    $q = $data["conf"];
-    $q = array_key_exists("skip", $q);
-    $viewers=count($data["conf"]["views"]);
-    $skips=count($data["conf"]["skips"]);                               //Counting how many GUIDS there are under the skip key
-    if($data["conf"]["skip"] == "true" || $q != 1){                       //If the users GUID isn't in the array, its added
-        array_push($data["conf"]["skips"], $guid);
-        $skips+=1;                                                      //and the number of skips is upped
-        //$data["conf"]["skips"]=$skips;
-        if($skips>=$viewers/2){                                         //checking if the skips wanted is larger than the viewers/2, if so its skipping, woohooo!
-            array_shift($data["songs"]);
-            $q = $data["conf"];
-            $q = array_key_exists("removeplay", $q);
-            if($data["conf"]["removeplay"] == "false" || $q != 1)
-            {
-                $data["songs"][$np[0]["id"]] = array("id" => $np[0]["id"], "title" => $np[0]["title"], "votes" => $np[0]["votes"], "added" => time(), "guids" => array());
-            }
-            array_shift($data["nowPlaying"]);
-            $data["nowPlaying"][$firstSong[0]["id"]] = array("id" => $firstSong[0]["id"], "title" => $firstSong[0]["title"], "votes" => 0, "added" => $firstSong[0]["added"], "guids" => $firstSong[0]["guids"]);
-            //array_push($data["songs"], $add);
-            $data["conf"]["skips"] = array();
-            $data["conf"]["startTime"] = time(); 
-            foreach($data["songs"] as $k=>$v) {
-                $sort['votes'][$k] = $v['votes'];
-                $sort['added'][$k] = $v['added'];
-            }
-            array_multisort($sort['votes'], SORT_DESC, $sort['added'], SORT_ASC, $data["songs"]);
-        }
-        file_put_contents($list, json_encode($data));
-        echo($skips."/".$viewers);
-    }else if($data["conf"]["skip"] == "false")
-    {
-        echo("wrong!");
-    }
-
-}else if(isset($_POST['conf']))                                            //conf, this is for admin settings/channel settings
-{
-    $data["conf"]["vote"] = $_POST['vote'];                                //setting all the settings from the post gotten from admin.js
-    $data["conf"]["addsongs"] = $_POST['addsongs'];
-    $data["conf"]["longsongs"] = $_POST['longsongs'];
-    $data["conf"]["frontpage"] = $_POST['frontpage'];
-    $data["conf"]["allvideos"] = $_POST['allvideos'];
-    $data["conf"]["removeplay"] = $_POST['removeplay'];
-    $data["conf"]["skip"] = $_POST['skip'];
-    $data["conf"]["shuffle"] = $_POST['shuffling'];
-    $pass = htmlspecialchars($_POST['pass']);
-    if($pass != ""){
-        $x = explode("/", htmlspecialchars(strtolower($_SERVER["REQUEST_URI"])));
-        $pass=crypt($pass, '$6$rounds=9001$'.$x[1].'Fuck0ffuSn34kyn!ggerzZ$');
-    }
-    $q = $data["conf"];
-    $q = array_key_exists("adminpass", $q);
-
-    if($data["conf"]["adminpass"] == $pass || $q != 1 || $data["conf"]["adminpass"] == "")                      //if the password is the same as the one in the jsonfile, we are updating the settings (not in use yet)
-    {
-        $data["conf"]["adminpass"] = $pass;
-        echo "correct";
-        file_put_contents($list, json_encode($data));
-    }else
-    {
-        echo "wrong";
-    }
-}else{                                                                      //printing the whole data array json encoded for youtube.js or list.js to pick up
-    echo json_encode($data); 
-}
-
-?>
\ No newline at end of file
diff --git a/php/footer-old.php b/php/footer-old.php
deleted file mode 100755
index 7754172d..00000000
--- a/php/footer-old.php
+++ /dev/null
@@ -1,11 +0,0 @@
-<div class="footer small centered top anim">
-    &copy; 2014 <a class="anim" href="//nixo.no">Nixo</a> &amp; <a class="anim" href="//kasperrt.no">KasperRT </a>
-</div>
-<script src="//ajax.googleapis.com/ajax/libs/jquery/2.1.1/jquery.min.js"></script>
-<script src="//ajax.googleapis.com/ajax/libs/jqueryui/1.11.2/jquery-ui.min.js"></script>
-<script type="text/javascript" src="static/js/iscroll.js"></script>  
-<script type="text/javascript" src="static/js/list-min.js"></script>  
-<script type="text/javascript" src="static/js/playercontrols-min.js"></script>
-<script type="text/javascript" src="static/js/youtube-min.js"></script>
-<script type="text/javascript" src="static/js/search-min.js"></script> 
-<script type="text/javascript" src="static/js/admin-min.js"></script>
\ No newline at end of file
diff --git a/php/timedifference.php b/php/timedifference.php
deleted file mode 100755
index 2d651545..00000000
--- a/php/timedifference.php
+++ /dev/null
@@ -1,17 +0,0 @@
-<?php
-	$list = explode("/", htmlspecialchars(strtolower($_SERVER["REQUEST_URI"])));
-	if($list[1]==""||!isset($list[1])||count($list)<=1)$list="videos";
-	else $list=$list[1];
-	$list="../lists/".$list.".json";
-	$data = json_decode(file_get_contents($list), true);
-	$songs = $data["nowPlaying"];
-	$id = array_values($songs);
-	if(count($id)>0){
-		$diff = (time() - $data["conf"]["startTime"]);
-		$returnArray = array($diff, $id[0]["id"], time(), $data["conf"]["startTime"], $id[0]["title"], $data["conf"]["views"]);
-		$returnArray = json_encode($returnArray);
-		echo $returnArray;
-	}else{
-		echo("[0,0,0,0,0,0]");
-	}
-?>
diff --git a/php/videos.php b/php/videos.php
deleted file mode 100755
index 63044cfa..00000000
--- a/php/videos.php
+++ /dev/null
@@ -1,8 +0,0 @@
-<?php
-$list = htmlspecialchars($_REQUEST['list']);
-if(!isset($_REQUEST['list']))$list="videos";
-$filename = "../lists/".$list.'.json';
-if(!file_exists($filename)){ $f=fopen($filename, "a+"); fwrite($f,"[]"); fclose($f);}
-$file = file_get_contents($filename);
-print($file);
-?>
\ No newline at end of file
diff --git a/static/css/controlstyle.css b/static/css/controlstyle.css
index 989371d6..cb279309 100755
--- a/static/css/controlstyle.css
+++ b/static/css/controlstyle.css
@@ -2,10 +2,9 @@
 #controls
 {
 	opacity:0;
-	height:30px;
+	height:5%;
 	background-color:rgba(255, 255, 255, 0.25);
-	position:absolute;
-	width:54%;
+	width:100%;
 	transition: 0.75s -webkit-filter linear;
 	-webkit-transform: translate3d(0,0,0);
 	-moz-transform: translate3d(0,0,0);
@@ -116,7 +115,7 @@
 
 #bar
 {
-	height:30px;
+	height:100%;
 	background-color:rgba(0,0,0,0.5);
 	-webkit-transition: width 1s ease;
     transition: width 1s ease;
diff --git a/static/css/style.css b/static/css/style.css
index fa829417..3ff8341b 100755
--- a/static/css/style.css
+++ b/static/css/style.css
@@ -130,7 +130,7 @@ hide mdi-action-visibility mdi-action-visibility-off
     margin: 0px;
     padding:0px;
 }
-nav{
+#nav{
     background-color:rgba(255,255,255, 0.1);
 }
 .video-container{
@@ -142,8 +142,10 @@ nav{
 
 #player{
   height:95%;
+  position: relative;
 }
 
+
 .nav-btn
 {
     transition: background-color .2s;
@@ -161,7 +163,12 @@ nav{
 
 .list-song{background-color: rgba(255, 255, 255, 0.1);}
 .card .card-content{padding:0;}
-.list-title{display:block; color:white;font-size:1em; text-align:left;}
+.list-title{
+    display:block;
+    color:white;font-size:1em;
+    text-align:left;
+    padding: 0 10px 0 10px;
+}
 .card-image{cursor:pointer}
 .card{margin:5px 0 5px 0 !important;}
 #result img{float:left;padding-right:20px !important;}
diff --git a/static/js/playercontrols.js b/static/js/playercontrols.js
index 2f0e72e2..4a51a90a 100755
--- a/static/js/playercontrols.js
+++ b/static/js/playercontrols.js
@@ -18,18 +18,9 @@ function initControls()
 function fitToScreen()
 {
 	if(peis)
-	{
 		player_name = "#jplayer";
-	}else player_name = "#player";
-	//document.getElementById("controls").style.top = document.getElementById("player").offsetTop + $("#player").height() + "px";
-	document.getElementById("controls").style.top = $(player_name).height() + "px";
-	//document.getElementById("controls").style.left = document.getElementById("player").offsetLeft + "px";
-	//document.getElementById("controls").style.left = $(player_name).position()["left"] + "px";
-	//document.getElementById("controls").style.left = "10px";
-	$("#controls").width($(player_name).width());
-	//document.getElementById("qS").style.top = "-80px";
-	//document.getElementById("qS").style.left =  $("#controls").width()-125+"px";
-
+	else
+		player_name = "#player";
 }
 
 function initSlider()