diff --git a/airtime_mvc/application/views/scripts/library/get-file-metadata.ajax.phtml b/airtime_mvc/application/views/scripts/library/get-file-metadata.ajax.phtml
index 15aeb1bc4..7e4770332 100644
--- a/airtime_mvc/application/views/scripts/library/get-file-metadata.ajax.phtml
+++ b/airtime_mvc/application/views/scripts/library/get-file-metadata.ajax.phtml
@@ -54,11 +54,11 @@
             <?php
             $titleMaxStrLen = 35;
             if (mb_strlen($row["track_title"], 'UTF-8') > $titleMaxStrLen) {
-                $row["track_title"] = substr($row["track_title"], 0, 34)."...";
+                $row["track_title"] = mb_substr($row["track_title"], 0, 34, 'UTF-8')."...";
             }
             $artistMaxStrLen = 22;
-            if (strlen($row["creator"]) > $artistMaxStrLen) {
-                $row["creator"] = substr($row["creator"], 0, 21)."...";
+            if (mb_strlen($row["creator"], 'UTF-8') > $artistMaxStrLen) {
+                $row["creator"] = mb_substr($row["creator"], 0, 21, 'UTF-8')."...";
             }
             ?>
             <?php if ($row["type"] == 2) {
diff --git a/airtime_mvc/public/css/styles.css b/airtime_mvc/public/css/styles.css
index cb54d5554..ff0a78974 100644
--- a/airtime_mvc/public/css/styles.css
+++ b/airtime_mvc/public/css/styles.css
@@ -440,31 +440,37 @@ table.library-get-file-md{
 
 table.library-get-file-md.table-small{
     width: 290px !important;
-}    
+}
 
 .file-md-qtip-nowrap{
     white-space: nowrap;
+    overflow: hidden;
 }
 
 .file-md-qtip-criteria-width-small{
     width:70px;
+    max-width: 70px;
 }
 
 .file-md-qtip-criteria-width{
     width:110px;
+    max-width: 110px;
 }
 
 .file-md-qtip-row-width-title{
     width:170px;
+    max-width: 170px;
     padding-right:5px !important;
 }
 
 .file-md-qtip-row-width-artist{
     width:110px;
+    max-width: 110px;
 }
 
 .file-md-qtip-row-width-small{
     width:40x;
+    max-width: 40px;
     text-align:right;
 }