diff --git a/index.php b/index.php
index 92a480d3..4919bac8 100755
--- a/index.php
+++ b/index.php
@@ -20,18 +20,21 @@
                 <a href="/" class="brand-logo hide-on-small-only">
                     <img id="zicon" src="static/images/squareicon_small.png" alt="zöff" title="Zöff">
                 </a>
-                <div class="brand-logo zbrand">
+                <div class="brand-logo truncate zbrand">
                     <a href="//zoff.no" class="hide-on-med-and-up">Zöff</a>
                     <span class="hide-on-med-and-up">/</span>
                     <span id="chan" class="chan clickable" title="Show big URL" onclick="show()"><?php echo(ucfirst($list));?></span>
                 </div>
-                <ul>
-                    <li id="song-title">
-                    </li>
-                    <li>
-                        <input id="search" class="search_input" type="search" required title="Search for songs..." spellcheck="false" placeholder="Search" onsubmit="null;" autocomplete="off">
-                    </li>
-                <div id="results"></div>
+                <div class="container">
+                    <ul class="row">
+                        <li class="col s6" id="song-title">
+                        </li>
+                        <!--<li>
+                            <input id="search" class="search_input" type="search" required title="Search for songs..." spellcheck="false" placeholder="Search" onsubmit="null;" autocomplete="off">
+                        </li>-->
+                    </ul>
+                </div>
+
                 <ul class="right">
                     <li>
                         <a class="nav-btn" href="#" id="search-btn" onclick="">
@@ -61,6 +64,7 @@
                 <ul class="side-nav" id="settings-bar">
                     <?php include("php/panel.php");?>
                 </ul>
+                <div id="results"></div>
             </div>
         </nav>
       </div>
@@ -91,15 +95,17 @@
             <div id="playlist" class="col s12 m3">
                 <div id="wrapper">
                     <div id="list-song-html">
-                        <div id="list-song" class="card left-align clickable list-song" title="Vote!">
-                            <a class="clickable center-align votebg">
-                                <span class="card-image cardbg list-image"></span>
-                            </a>
-                            <span class="card-content">
-                                <span class="flow-text truncate list-title"></span>
-                                <span class="vote-span">
-                                    <span class="list-votes"></span>
-                                    <span class="highlighted vote-text">&nbsp;votes</span>
+                        <div id="list-song" class="card left-align list-song">
+                            <span class="clickable vote-container" title="Vote!">
+                                <a class="clickable center-align votebg">
+                                    <span class="card-image cardbg list-image"></span>
+                                </a>
+                                <span class="card-content">
+                                    <span class="flow-text truncate list-title"></span>
+                                    <span class="vote-span">
+                                        <span class="list-votes"></span>
+                                        <span class="highlighted vote-text">&nbsp;votes</span>
+                                    </span>
                                 </span>
                             </span>
                             <div class="list-remove card-action center-align hide">
diff --git a/php/footer.php b/php/footer.php
index 49298b93..cf4f59f9 100755
--- a/php/footer.php
+++ b/php/footer.php
@@ -21,15 +21,19 @@
                         <a href="https://github.com/nixolas1/Zoff">
                             <img title="Contribute on GitHub" src="static/images/GitHub_Logo.png">
                         </a>
-                        <a href="https://www.facebook.com/sharer/sharer.php?u=http://zoff.no/<?php echo $list; ?>" target="popup" onclick="window.open('https://www.facebook.com/sharer/sharer.php?u=http://zoff.no/<?php echo $list; ?>','Share Playlist','width=600,height=300')">
-                          Share on Facebook
-                        </a>
-                        <br>
-                        <a href="http://twitter.com/intent/tweet?url=http://zoff.no/<?php echo $list; ?>&text=Check out this playlist <?php echo ucfirst($list); ?> on Zöff!&via=zoffmusic" target="popup" onclick="window.open('http://twitter.com/intent/tweet?url=http://zoff.no/<?php echo $list; ?>&text=Check out this playlist <?php echo ucfirst($list); ?> on Zöff!&via=zoffmusic','Share Playlist','width=600,height=300')">
-                          Share on Twitter
-                        </a>
-                        <br>
-                        <img src="https://chart.googleapis.com/chart?chs=150x150&cht=qr&chl=http://zoff.no/<?php echo $list; ?>&choe=UTF-8&chld=L|1" alt="QRCode for link" title="QRCode">
+                        <p>
+                            <a class="waves-effect waves-light btn light-blue share shareface" href="https://www.facebook.com/sharer/sharer.php?u=http://zoff.no/<?php echo $list; ?>" target="popup" onclick="window.open('https://www.facebook.com/sharer/sharer.php?u=http://zoff.no/<?php echo $list; ?>','Share Playlist','width=600,height=300')">
+                                <img class="left" src="static/images/facebook.png">Share on Facebook
+                            </a>
+                        </p>
+                        <p>
+                            <a class="waves-effect waves-light btn light-blue share" href="http://twitter.com/intent/tweet?url=http://zoff.no/<?php echo $list; ?>&text=Check out this playlist <?php echo ucfirst($list); ?> on Zöff!&via=zoffmusic" target="popup" onclick="window.open('http://twitter.com/intent/tweet?url=http://zoff.no/<?php echo $list; ?>&text=Check out this playlist <?php echo ucfirst($list); ?> on Zöff!&via=zoffmusic','Share Playlist','width=600,height=300')">
+                                <img class="left" src="static/images/twitter.png">Share on Twitter
+                            </a>
+                        </p>
+                        <p>
+                            <img src="https://chart.googleapis.com/chart?chs=150x150&cht=qr&chl=http://zoff.no/<?php echo $list; ?>&choe=UTF-8&chld=L|1" alt="QRCode for link" title="QRCode">
+                        </p>
                     </li>
                 </ul>
             </div>
diff --git a/php/nochan.php b/php/nochan.php
index 00e3b99e..54935d53 100755
--- a/php/nochan.php
+++ b/php/nochan.php
@@ -132,15 +132,19 @@ if(isset($_GET['chan'])){
                             <a href="https://github.com/nixolas1/Zoff">
                                 <img title="Contribute on GitHub" src="static/images/GitHub_Logo.png">
                             </a>
-                            <a href="https://www.facebook.com/sharer/sharer.php?u=http://zoff.no/" target="popup" onclick="window.open('https://www.facebook.com/sharer/sharer.php?u=http://zoff.no/','Share Playlist','width=600,height=300')">
-                              Share on Facebook
-                            </a>
-                            <br>
-                            <a href="http://twitter.com/intent/tweet?url=http://zoff.no/&text=Check out Zöff!&via=zoffmusic" target="popup" onclick="window.open('http://twitter.com/intent/tweet?url=http://zoff.no/&text=Check out Zöff!&via=zoffmusic','Share Playlist','width=600,height=300')">
-                              Share on Twitter
-                            </a>
-                            <br>
-                            <img src="https://chart.googleapis.com/chart?chs=150x150&cht=qr&chl=http://zoff.no/&choe=UTF-8&chld=L|1" alt="QRCode for link" title="QRCode">
+                            <p>
+                                <a class="waves-effect waves-light btn light-blue share shareface" href="https://www.facebook.com/sharer/sharer.php?u=http://zoff.no/<?php echo $list; ?>" target="popup" onclick="window.open('https://www.facebook.com/sharer/sharer.php?u=http://zoff.no/<?php echo $list; ?>','Share Playlist','width=600,height=300')">
+                                    <img class="left" src="static/images/facebook.png">Share on Facebook
+                                </a>
+                            </p>
+                            <p>
+                                <a class="waves-effect waves-light btn light-blue share" href="http://twitter.com/intent/tweet?url=http://zoff.no/<?php echo $list; ?>&text=Check out this playlist <?php echo ucfirst($list); ?> on Zöff!&via=zoffmusic" target="popup" onclick="window.open('http://twitter.com/intent/tweet?url=http://zoff.no/<?php echo $list; ?>&text=Check out this playlist <?php echo ucfirst($list); ?> on Zöff!&via=zoffmusic','Share Playlist','width=600,height=300')">
+                                    <img class="left" src="static/images/twitter.png">Share on Twitter
+                                </a>
+                            </p>
+                            <p>
+                                <img src="https://chart.googleapis.com/chart?chs=150x150&cht=qr&chl=http://zoff.no/<?php echo $list; ?>&choe=UTF-8&chld=L|1" alt="QRCode for link" title="QRCode">
+                            </p>
                         </li>
                     </ul>
                 </div>
diff --git a/static/css/style.css b/static/css/style.css
index ed83dcc7..e1e913d0 100755
--- a/static/css/style.css
+++ b/static/css/style.css
@@ -65,6 +65,8 @@ main {
 
 nav .zbrand{
     left:90px;
+    max-width: 22%;
+    overflow: hidden;
 }
 
 .fullwidth{
@@ -120,6 +122,17 @@ nav .zbrand{
   color:grey;
 }
 
+.share, .shareface{
+    padding-left: 10px !important;
+}
+
+.shareface {background-color: rgb(42, 134, 200) !important;}
+
+.share img{
+    height: 50px;
+    margin-right:10px;
+}
+
 
 /*
 play mdi-av-play-arrow
@@ -221,7 +234,7 @@ hide mdi-action-visibility mdi-action-visibility-off
     opacity:0;
     transition: all .1s ease;
 }
-.list-song:hover .list-image:after {
+.vote-container:hover .list-image:after {
     opacity:1;
 }
 
@@ -246,7 +259,7 @@ hide mdi-action-visibility mdi-action-visibility-off
 .card{margin:5px 0 5px 0 !important;}
 #result img{float:left;padding-right:20px !important;}
 #result{height:100px;margin-left:40px;}
-#results{margin-top:-12px;background-color: rgba(0,0,0,0.6);}
+#results{background-color: rgba(0,0,0,0.6);}
 .result:hover {
   background-color: rgba(0,0,0,0.4);
  }
diff --git a/static/images/ajax-loader.gif b/static/images/ajax-loader.gif
deleted file mode 100755
index f28c9d5f..00000000
Binary files a/static/images/ajax-loader.gif and /dev/null differ
diff --git a/static/images/bg1.jpg b/static/images/bg1.jpg
deleted file mode 100755
index fd34b223..00000000
Binary files a/static/images/bg1.jpg and /dev/null differ
diff --git a/static/images/bg2.jpg b/static/images/bg2.jpg
deleted file mode 100755
index 03e0f657..00000000
Binary files a/static/images/bg2.jpg and /dev/null differ
diff --git a/static/images/bg3.jpg b/static/images/bg3.jpg
deleted file mode 100755
index 13759df2..00000000
Binary files a/static/images/bg3.jpg and /dev/null differ
diff --git a/static/images/bg4.jpg b/static/images/bg4.jpg
deleted file mode 100755
index a8c0d649..00000000
Binary files a/static/images/bg4.jpg and /dev/null differ
diff --git a/static/images/bg5.jpg b/static/images/bg5.jpg
deleted file mode 100755
index d38fd845..00000000
Binary files a/static/images/bg5.jpg and /dev/null differ
diff --git a/static/images/bg6.jpg b/static/images/bg6.jpg
deleted file mode 100755
index ad1f3813..00000000
Binary files a/static/images/bg6.jpg and /dev/null differ
diff --git a/static/images/facebook.png b/static/images/facebook.png
new file mode 100755
index 00000000..e655224b
Binary files /dev/null and b/static/images/facebook.png differ
diff --git a/static/images/player.webp b/static/images/player.webp
deleted file mode 100755
index 03e5ca2d..00000000
Binary files a/static/images/player.webp and /dev/null differ
diff --git a/static/images/search.png b/static/images/search.png
deleted file mode 100755
index 4178239d..00000000
Binary files a/static/images/search.png and /dev/null differ
diff --git a/static/images/search2.png b/static/images/search2.png
deleted file mode 100755
index a14a3900..00000000
Binary files a/static/images/search2.png and /dev/null differ
diff --git a/static/images/settings2.png b/static/images/settings2.png
deleted file mode 100755
index f64026bc..00000000
Binary files a/static/images/settings2.png and /dev/null differ
diff --git a/static/images/skip.png b/static/images/skip.png
deleted file mode 100755
index a7fdcfd9..00000000
Binary files a/static/images/skip.png and /dev/null differ
diff --git a/static/images/twitter.png b/static/images/twitter.png
new file mode 100755
index 00000000..f5c5c34c
Binary files /dev/null and b/static/images/twitter.png differ
diff --git a/static/js/list.js b/static/js/list.js
index 19f787e6..df0ada3a 100755
--- a/static/js/list.js
+++ b/static/js/list.js
@@ -67,7 +67,7 @@ function populate_list(msg, conf_only)
 				song.find(".list-title").text(video_title);
 				song.find(".list-title").attr("title", video_title);
 				song.find(".list-votes").text(video_votes);
-				song.attr("onclick", "vote('"+video_id+"','pos')");
+				song.find(".vote-container").attr("onclick", "vote('"+video_id+"','pos')");
 				song.find(".list-image").attr("style",video_thumb);
 				song.attr("id",video_id);
 				song.find("#del").attr("onclick", "vote('"+video_id+"', 'del')");