diff --git a/dashboard-ui/bower_components/emby-webcomponents/listview/listview.css b/dashboard-ui/bower_components/emby-webcomponents/listview/listview.css
index 92732c965e..293eae81fa 100644
--- a/dashboard-ui/bower_components/emby-webcomponents/listview/listview.css
+++ b/dashboard-ui/bower_components/emby-webcomponents/listview/listview.css
@@ -20,6 +20,8 @@ button.listItem {
     line-height: 160%;
     border-bottom: 1px solid #2a2a2a;
     cursor: pointer;
+    white-space: nowrap;
+    overflow: hidden;
 }
 
 .listItem-nosidepadding {
diff --git a/dashboard-ui/components/medialibraryeditor/medialibraryeditor.js b/dashboard-ui/components/medialibraryeditor/medialibraryeditor.js
index 49a5106e4d..10555ae2a7 100644
--- a/dashboard-ui/components/medialibraryeditor/medialibraryeditor.js
+++ b/dashboard-ui/components/medialibraryeditor/medialibraryeditor.js
@@ -165,7 +165,7 @@
 
                 var html = '';
                 html += '<h2 class="dialogHeader">';
-                html += '<button type="button" is="emby-button" icon="arrow-back" class="fab mini btnCloseDialog" tabindex="-1"><iron-icon icon="arrow-back"></iron-icon></button>';
+                html += '<button type="button" is="emby-button" icon="arrow-back" class="fab mini btnCloseDialog" tabindex="-1"><i class="md-icon">arrow_back</i></button>';
 
                 html += '<div style="display:inline-block;margin-left:.6em;vertical-align:middle;">' + options.library.Name + '</div>';
                 html += '</h2>';
diff --git a/dashboard-ui/scripts/dashboardpage.js b/dashboard-ui/scripts/dashboardpage.js
index 2210de9078..ee86c4a5a4 100644
--- a/dashboard-ui/scripts/dashboardpage.js
+++ b/dashboard-ui/scripts/dashboardpage.js
@@ -427,6 +427,7 @@
 
             //html += '<div>';
             var showTranscodingInfo = false;
+
             if (session.TranscodingInfo && session.TranscodingInfo.IsAudioDirect && session.TranscodingInfo.IsVideoDirect) {
                 html += Globalize.translate('LabelPlayMethodDirectStream');
             }
@@ -455,28 +456,30 @@
 
                 var line = [];
 
-                if (session.TranscodingInfo.Bitrate) {
+                if (session.TranscodingInfo) {
+                    if (session.TranscodingInfo.Bitrate) {
 
-                    if (session.TranscodingInfo.Bitrate > 1000000) {
-                        line.push((session.TranscodingInfo.Bitrate / 1000000).toFixed(1) + ' Mbps');
-                    } else {
-                        line.push(Math.floor(session.TranscodingInfo.Bitrate / 1000) + ' kbps');
+                        if (session.TranscodingInfo.Bitrate > 1000000) {
+                            line.push((session.TranscodingInfo.Bitrate / 1000000).toFixed(1) + ' Mbps');
+                        } else {
+                            line.push(Math.floor(session.TranscodingInfo.Bitrate / 1000) + ' kbps');
+                        }
                     }
-                }
-                if (session.TranscodingInfo.Container) {
+                    if (session.TranscodingInfo.Container) {
 
-                    line.push(session.TranscodingInfo.Container);
-                }
+                        line.push(session.TranscodingInfo.Container);
+                    }
 
-                if (session.TranscodingInfo.VideoCodec) {
+                    if (session.TranscodingInfo.VideoCodec) {
 
-                    //line.push(Globalize.translate('LabelVideoCodec').replace('{0}', session.TranscodingInfo.VideoCodec));
-                    line.push(session.TranscodingInfo.VideoCodec);
-                }
-                if (session.TranscodingInfo.AudioCodec && session.TranscodingInfo.AudioCodec != session.TranscodingInfo.Container) {
+                        //line.push(Globalize.translate('LabelVideoCodec').replace('{0}', session.TranscodingInfo.VideoCodec));
+                        line.push(session.TranscodingInfo.VideoCodec);
+                    }
+                    if (session.TranscodingInfo.AudioCodec && session.TranscodingInfo.AudioCodec != session.TranscodingInfo.Container) {
 
-                    //line.push(Globalize.translate('LabelAudioCodec').replace('{0}', session.TranscodingInfo.AudioCodec));
-                    line.push(session.TranscodingInfo.AudioCodec);
+                        //line.push(Globalize.translate('LabelAudioCodec').replace('{0}', session.TranscodingInfo.AudioCodec));
+                        line.push(session.TranscodingInfo.AudioCodec);
+                    }
                 }
 
                 if (line.length) {