diff --git a/mopidy_musicbox_webclient/static/css/webclient.css b/mopidy_musicbox_webclient/static/css/webclient.css
index 4e6771d..777be12 100644
--- a/mopidy_musicbox_webclient/static/css/webclient.css
+++ b/mopidy_musicbox_webclient/static/css/webclient.css
@@ -481,7 +481,12 @@ a {
 #infocover {
     height: 50px;
     width: 50px;
-    position: absolute;
+}
+
+.playicon {
+    width: 10%;
+    float: right;
+    text-align: right;
 }
 
 #btplay {
@@ -490,17 +495,16 @@ a {
 
 .songinfo {
     height: 100%;
+    width: 90%;
+    float: left;
 }
 
 .songinfo-text {
     text-align: left;
     line-height: 22px;
-    display:inline-block;
-    padding: 6px;
     color: white;
-    position: absolute;
-    padding-left: 55px;
-    padding-right: 55px;
+    overflow: hidden;
+    padding: 3px;
 }
 
 #nowPlayingpane{
diff --git a/mopidy_musicbox_webclient/static/index.html b/mopidy_musicbox_webclient/static/index.html
index 2798776..9dc3d67 100644
--- a/mopidy_musicbox_webclient/static/index.html
+++ b/mopidy_musicbox_webclient/static/index.html
@@ -438,14 +438,14 @@
 
 <div data-role="footer" data-tap-toggle="false" data-position="fixed" id="normalFooter">
     <div class="footerControls">
-        <div id="songinfo" style="float: left">
-            <a href="#"><div><img id="infocover" src="images/default_cover.png"/></div></a>
+        <div class="songinfo" id="songinfo">
+            <a href="#"><div style="float: left"><img id="infocover" src="images/default_cover.png"/></div></a>
             <div class="songinfo-text">
                 <div id="infoname"></div>
                 <div id="infoartist"></div>
             </div>
         </div>
-        <div style="float: right;">
+        <div class="playicon">
             <a href="#" onclick="doPlay(); return false"><span id="btplay" title="Play"><i class="fa fa-play"></i></span></a>
         </div>
     </div>
diff --git a/mopidy_musicbox_webclient/static/js/gui.js b/mopidy_musicbox_webclient/static/js/gui.js
index e5c99fa..7f2cd66 100644
--- a/mopidy_musicbox_webclient/static/js/gui.js
+++ b/mopidy_musicbox_webclient/static/js/gui.js
@@ -24,7 +24,9 @@ function resetSong() {
 
 function resizeMb() {
     $("#infoname").html(songdata.track.name);
+    $("#infoname").truncate();
     $("#infoartist").html(artiststext);
+    $("#infoartist").truncate();
 
     if ($(window).width() <= 960) {
 //        $('#playlisttracksdiv').hide();
diff --git a/mopidy_musicbox_webclient/static/mb.manifest b/mopidy_musicbox_webclient/static/mb.manifest
index 779e318..7f4e333 100644
--- a/mopidy_musicbox_webclient/static/mb.manifest
+++ b/mopidy_musicbox_webclient/static/mb.manifest
@@ -1,6 +1,6 @@
 CACHE MANIFEST
 
-# 2016-02-4:v1
+# 2016-02-4:v2
 
 NETWORK:
 *