diff --git a/dashboard-ui/css/mediaplayer.css b/dashboard-ui/css/mediaplayer.css
index 130bed7081..c2db765b4d 100644
--- a/dashboard-ui/css/mediaplayer.css
+++ b/dashboard-ui/css/mediaplayer.css
@@ -123,10 +123,6 @@ input[type="range"]::-ms-fill-upper {
     display: none; /* display and visibility only */
 }
 
-.remoteControlButton {
-    float: right;
-}
-
 @media all and (max-width: 800px) {
 
     #nowPlayingBar .mediaButton {
@@ -138,6 +134,10 @@ input[type="range"]::-ms-fill-upper {
             display: none;
         }
 
+    .remoteControlButton {
+        float: right;
+    }
+
     #nowPlayingBar #playButton, #nowPlayingBar #pauseButton {
         float: right;
     }
diff --git a/dashboard-ui/dlnaprofile.html b/dashboard-ui/dlnaprofile.html
index f860417ce5..82d902a7b9 100644
--- a/dashboard-ui/dlnaprofile.html
+++ b/dashboard-ui/dlnaprofile.html
@@ -180,6 +180,11 @@
                                         <label for="txtInfoSerialNumber">${LabelSerialNumber}</label>
                                         <input type="text" id="txtInfoSerialNumber" data-mini="true" />
                                     </li>
+                                    <li>
+                                        <label for="txtProtocolInfo">${LabelProtocolInfo}</label>
+                                        <input type="text" id="txtProtocolInfo" data-mini="true" />
+                                        <div class="fieldDescription">${LabelProtocolInfoHelp}</div>
+                                    </li>
                                     <li>
                                         <label for="txtXDlnaCap">${LabelXDlnaCap}</label>
                                         <input type="text" id="txtXDlnaCap" data-mini="true" />
diff --git a/dashboard-ui/edititemmetadata.html b/dashboard-ui/edititemmetadata.html
index 8ce8d7b820..c9b6206127 100644
--- a/dashboard-ui/edititemmetadata.html
+++ b/dashboard-ui/edititemmetadata.html
@@ -131,6 +131,10 @@
                                 <label for="txtOverview">Overview:</label>
                                 <textarea id="txtOverview" data-mini="true"></textarea>
                             </div>
+                            <div data-role="fieldcontain" id="fldShortOverview" style="display: none;">
+                                <label for="txtShortOverview">Short overview:</label>
+                                <textarea id="txtShortOverview" data-mini="true"></textarea>
+                            </div>
                             <div data-role="fieldcontain" id="fldPremiereDate" style="display: none;">
                                 <label id="lblPremiereDate" for="txtPremiereDate">Release date:</label>
                                 <input type="date" id="txtPremiereDate" data-mini="true" />
diff --git a/dashboard-ui/mypreferenceswebclient.html b/dashboard-ui/mypreferenceswebclient.html
index ea68025001..1e8b8c807a 100644
--- a/dashboard-ui/mypreferenceswebclient.html
+++ b/dashboard-ui/mypreferenceswebclient.html
@@ -29,8 +29,9 @@
                         <option value="latestmedia">${OptionLatestMedia}</option>
                         <option value="latestchannelmedia">${OptionLatestChannelMedia}</option>
                         <option value="latesttvrecordings">${OptionLatestTvRecordings}</option>
-                        <option value="librarytiles">${OptionMyLibrary}</option>
-                        <option value="smalllibrarytiles">${OptionMyLibrarySmall}</option>
+                        <option value="librarytiles">${OptionMyViews}</option>
+                        <option value="smalllibrarytiles">${OptionMyViewsSmall}</option>
+                        <option value="librarybuttons">${OptionMyViewsButtons}</option>
                         <option value="folders">${OptionLibraryFolders}</option>
                         <option value="resume">${OptionResumablemedia}</option>
                     </select>
@@ -42,8 +43,9 @@
                         <option value="latestmedia">${OptionLatestMedia}</option>
                         <option value="latestchannelmedia">${OptionLatestChannelMedia}</option>
                         <option value="latesttvrecordings">${OptionLatestTvRecordings}</option>
-                        <option value="librarytiles">${OptionMyLibrary}</option>
-                        <option value="smalllibrarytiles">${OptionMyLibrarySmall}</option>
+                        <option value="librarytiles">${OptionMyViews}</option>
+                        <option value="smalllibrarytiles">${OptionMyViewsSmall}</option>
+                        <option value="librarybuttons">${OptionMyViewsButtons}</option>
                         <option value="folders">${OptionLibraryFolders}</option>
                         <option value="resume">${OptionResumablemedia}</option>
                         <option value="none">${OptionNone}</option>
@@ -56,8 +58,9 @@
                         <option value="latestmedia">${OptionLatestMedia}</option>
                         <option value="latestchannelmedia">${OptionLatestChannelMedia}</option>
                         <option value="latesttvrecordings">${OptionLatestTvRecordings}</option>
-                        <option value="librarytiles">${OptionMyLibrary}</option>
-                        <option value="smalllibrarytiles">${OptionMyLibrarySmall}</option>
+                        <option value="librarytiles">${OptionMyViews}</option>
+                        <option value="smalllibrarytiles">${OptionMyViewsSmall}</option>
+                        <option value="librarybuttons">${OptionMyViewsButtons}</option>
                         <option value="folders">${OptionLibraryFolders}</option>
                         <option value="resume">${OptionResumablemedia}</option>
                         <option value="none">${OptionNone}</option>
@@ -70,8 +73,9 @@
                         <option value="latestmedia">${OptionLatestMedia}</option>
                         <option value="latestchannelmedia">${OptionLatestChannelMedia}</option>
                         <option value="latesttvrecordings">${OptionLatestTvRecordings}</option>
-                        <option value="librarytiles">${OptionMyLibrary}</option>
-                        <option value="smalllibrarytiles">${OptionMyLibrarySmall}</option>
+                        <option value="librarytiles">${OptionMyViews}</option>
+                        <option value="smalllibrarytiles">${OptionMyViewsSmall}</option>
+                        <option value="librarybuttons">${OptionMyViewsButtons}</option>
                         <option value="folders">${OptionLibraryFolders}</option>
                         <option value="resume">${OptionResumablemedia}</option>
                         <option value="none">${OptionNone}</option>
diff --git a/dashboard-ui/scripts/directorybrowser.js b/dashboard-ui/scripts/directorybrowser.js
index c9ec9f2322..7457238488 100644
--- a/dashboard-ui/scripts/directorybrowser.js
+++ b/dashboard-ui/scripts/directorybrowser.js
@@ -54,7 +54,7 @@
             }
 
             if (!path) {
-                html += '<li><a class="lnkPath lnkDirectory" data-path="Network" href="#">Network</a></li>';
+                html += '<li><a class="lnkPath lnkDirectory" data-path="Network" href="#">' + Globalize.translate('ButtonNetwork') + '</a></li>';
             }
 
             $('#ulDirectoryPickerList', page).html(html).listview('refresh');
@@ -90,7 +90,7 @@
                 fileOptions.includeFiles = options.includeFiles;
             }
 
-            options.header = options.header || "Select Media Path";
+            options.header = options.header || Globalize.translate('HeaderSelectMediaPath');
             options.instruction = options.instruction || "";
 
             var html = '<div data-transition="fade" data-role="popup" id="popupDirectoryPicker" class="popup" style="min-width:65%;">';
@@ -103,13 +103,18 @@
             html += '<form>';
 
             var instruction = options.instruction ? options.instruction + '<br/><br/>' : '';
-            
-            html += '<p class="directoryPickerHeadline">' + instruction + 'Network paths can be entered manually in the event the Network button fails to locate your devices. For example, <b>\\\\my-server</b> or <b>\\\\192.168.1.101</b>.</p>';
+
+            html += '<p class="directoryPickerHeadline">';
+            html += instruction;
+            html += Globalize.translate('MessageDirectoryPickerInstruction')
+                .replace('{0}', '<b>\\\\server</b>')
+                .replace('{1}', '<b>\\\\192.168.1.101</b>');
+            html += '</p>';
 
             html += '<div style="margin:20px 0 0;">';
-            html += '<label for="txtDirectoryPickerPath" class="lblDirectoryPickerPath">Current Path:</label>';
+            html += '<label for="txtDirectoryPickerPath" class="lblDirectoryPickerPath">' + Globalize.translate('LabelCurrentPath') + '</label>';
             html += '<div style="width:92%;display:inline-block;"><input id="txtDirectoryPickerPath" name="txtDirectoryPickerPath" type="text" required="required" style="font-weight:bold;" /></div>';
-            html += '<button class="btnRefreshDirectories" type="button" data-icon="refresh" data-inline="true" data-mini="true" data-iconpos="notext">Refresh</button>';
+            html += '<button class="btnRefreshDirectories" type="button" data-icon="refresh" data-inline="true" data-mini="true" data-iconpos="notext">' + Globalize.translate('ButtonRefresh') + '</button>';
             html += '</div>';
 
             html += '<div style="height: 320px; overflow-y: auto;">';
@@ -120,8 +125,8 @@
 
 
             html += '<p>';
-            html += '<button type="submit" data-theme="b" data-icon="check" data-mini="true">OK</button>';
-            html += '<button type="button" data-icon="delete" onclick="$(this).parents(\'.popup\').popup(\'close\');" data-mini="true">Cancel</button>';
+            html += '<button type="submit" data-theme="b" data-icon="check" data-mini="true">' + Globalize.translate('ButtonOk') + '</button>';
+            html += '<button type="button" data-icon="delete" onclick="$(this).parents(\'.popup\').popup(\'close\');" data-mini="true">' + Globalize.translate('ButtonCancel') + '</button>';
             html += '</p>';
             html += '</form>';
             html += '</div>';
diff --git a/dashboard-ui/scripts/dlnaprofile.js b/dashboard-ui/scripts/dlnaprofile.js
index 65cb5c7006..5e62b16e6e 100644
--- a/dashboard-ui/scripts/dlnaprofile.js
+++ b/dashboard-ui/scripts/dlnaprofile.js
@@ -76,6 +76,7 @@
         $('#chkRequiresPlainFolders', page).checked(profile.RequiresPlainFolders).checkboxradio('refresh');
         $('#chkRequiresPlainVideoItems', page).checked(profile.RequiresPlainVideoItems).checkboxradio('refresh');
 
+        $('#txtProtocolInfo', page).val(profile.ProtocolInfo || '');
         $('#txtXDlnaCap', page).val(profile.XDlnaCap || '');
         $('#txtXDlnaDoc', page).val(profile.XDlnaDoc || '');
         $('#txtSonyAggregationFlags', page).val(profile.SonyAggregationFlags || '');
@@ -696,6 +697,7 @@
         profile.IgnoreTranscodeByteRangeRequests = $('#chkIgnoreTranscodeByteRangeRequests', page).checked();
         profile.MaxBitrate = $('#txtMaxAllowedBitrate', page).val();
 
+        profile.ProtocolInfo = $('#txtProtocolInfo', page).val();
         profile.XDlnaCap = $('#txtXDlnaCap', page).val();
         profile.XDlnaDoc = $('#txtXDlnaDoc', page).val();
         profile.SonyAggregationFlags = $('#txtSonyAggregationFlags', page).val();
diff --git a/dashboard-ui/scripts/edititemmetadata.js b/dashboard-ui/scripts/edititemmetadata.js
index 751c40cf22..3c8d9e76ff 100644
--- a/dashboard-ui/scripts/edititemmetadata.js
+++ b/dashboard-ui/scripts/edititemmetadata.js
@@ -82,6 +82,12 @@
                 $('#btnEditSubtitles', page).hide();
             }
 
+            if (item.MediaType == "Video" && item.Type != "Episode") {
+                $('#fldShortOverview', page).show();
+            } else {
+                $('#fldShortOverview', page).hide();
+            }
+
             Dashboard.getCurrentUser().done(function (user) {
 
                 if (user.Configuration.EnableContentDeletion &&
@@ -451,6 +457,7 @@
         $('#txtPath', page).val(item.Path || '');
         $('#txtName', page).val(item.Name || "");
         $('#txtOverview', page).val(item.Overview || "");
+        $('#txtShortOverview', page).val(item.ShortOverview || "");
         $('#txtSortName', page).val(item.ForcedSortName || "");
         $('#txtDisplayMediaType', page).val(item.DisplayMediaType || "");
         $('#txtCommunityRating', page).val(item.CommunityRating || "");
@@ -858,6 +865,7 @@
                 Metascore: $('#txtMetascore', form).val(),
                 AwardSummary: $('#txtAwardSummary', form).val(),
                 Overview: $('#txtOverview', form).val(),
+                ShortOverview: $('#txtShortOverview', form).val(),
                 Status: $('#selectStatus', form).val(),
                 AirDays: getSelectedAirDays(form),
                 AirTime: convertTo12HourFormat($('#txtAirTime', form).val()),
diff --git a/dashboard-ui/scripts/indexpage.js b/dashboard-ui/scripts/indexpage.js
index 1a0b22d937..524754e6eb 100644
--- a/dashboard-ui/scripts/indexpage.js
+++ b/dashboard-ui/scripts/indexpage.js
@@ -14,6 +14,115 @@
         return deferred.promise();
     }
 
+    function createMediaLinks(options) {
+
+        var html = "";
+
+        var items = options.items;
+
+        // "My Library" backgrounds
+        for (var i = 0, length = items.length; i < length; i++) {
+
+            var item = items[i];
+
+            var imgUrl;
+
+            switch (item.CollectionType) {
+                case "movies":
+                    imgUrl = "css/images/items/folders/movies.png";
+                    break;
+                case "music":
+                    imgUrl = "css/images/items/folders/music.png";
+                    break;
+                case "photos":
+                    imgUrl = "css/images/items/folders/photos.png";
+                    break;
+                case "livetv":
+                case "tvshows":
+                    imgUrl = "css/images/items/folders/tv.png";
+                    break;
+                case "games":
+                    imgUrl = "css/images/items/folders/games.png";
+                    break;
+                case "trailers":
+                    imgUrl = "css/images/items/folders/movies.png";
+                    break;
+                case "adultvideos":
+                case "homevideos":
+                    imgUrl = "css/images/items/folders/homevideos.png";
+                    break;
+                case "musicvideos":
+                    imgUrl = "css/images/items/folders/musicvideos.png";
+                    break;
+                case "books":
+                    imgUrl = "css/images/items/folders/books.png";
+                    break;
+                case "channels":
+                    imgUrl = "css/images/items/folders/channels.png";
+                    break;
+                case "boxsets":
+                default:
+                    imgUrl = "css/images/items/folders/folder.png";
+                    break;
+            }
+
+            var cssClass = "posterItem";
+            cssClass += ' ' + options.shape + 'PosterItem';
+
+            if (item.CollectionType) {
+                cssClass += ' ' + item.CollectionType + 'PosterItem';
+            }
+
+            var href = item.url || LibraryBrowser.getHref(item, options.context);
+
+            html += '<a data-itemid="' + item.Id + '" class="' + cssClass + '" href="' + href + '">';
+
+            var style = "";
+
+            if (imgUrl) {
+                style += 'background-image:url(\'' + imgUrl + '\');';
+            }
+
+            var imageCssClass = 'posterItemImage';
+
+            html += '<div class="' + imageCssClass + '" style="' + style + '">';
+            html += '</div>';
+
+            html += "<div class='posterItemDefaultText posterItemText'>";
+            html += item.Name;
+            html += "</div>";
+
+            html += "</a>";
+        }
+
+        return html;
+    }
+
+    function loadlibraryButtons(elem, userId, index) {
+
+        getUserViews(userId).done(function (items) {
+
+            var html = '<br/>';
+
+            if (index) {
+                html += '<h1 class="listHeader">' + Globalize.translate('HeaderMyLibrary') + '</h1>';
+            }
+            html += '<div>';
+            html += createMediaLinks({
+                items: items,
+                shape: 'myLibrary',
+                showTitle: true,
+                centerText: true
+
+            });
+            html += '</div>';
+
+            $(elem).html(html);
+
+            handleLibraryLinkNavigations(elem);
+        });
+    }
+
     function loadRecentlyAdded(elem, userId) {
 
         var screenWidth = $(window).width();
@@ -326,7 +435,8 @@
         loadLibraryFolders: loadLibraryFolders,
         loadResume: loadResume,
         loadLatestChannelItems: loadLatestChannelItems,
-        loadLatestLiveTvRecordings: loadLatestLiveTvRecordings
+        loadLatestLiveTvRecordings: loadLatestLiveTvRecordings,
+        loadlibraryButtons: loadlibraryButtons
     };
 
 })(jQuery, document, ApiClient);
@@ -363,9 +473,12 @@
         else if (section == 'librarytiles') {
             Sections.loadLibraryTiles(elem, userId, 'backdrop', index);
         }
-        else if (section == 'smalllibrarytiles' || section == 'librarybuttons') {
+        else if (section == 'smalllibrarytiles') {
             Sections.loadLibraryTiles(elem, userId, 'smallBackdrop', index);
         }
+        else if (section == 'librarybuttons') {
+            Sections.loadlibraryButtons(elem, userId, index);
+        }
         else if (section == 'resume') {
             Sections.loadResume(elem, userId);
         }
diff --git a/dashboard-ui/scripts/librarymenu.js b/dashboard-ui/scripts/librarymenu.js
index 88247280f0..580c854bb9 100644
--- a/dashboard-ui/scripts/librarymenu.js
+++ b/dashboard-ui/scripts/librarymenu.js
@@ -455,6 +455,8 @@ $.fn.createHoverTouch = function () {
 
         if (preventHover) {
             $(this).trigger('hovertouch');
+            stopTimer(this);
+            preventHover = false;
         }
     });
 
diff --git a/dashboard-ui/scripts/nowplayingbar.js b/dashboard-ui/scripts/nowplayingbar.js
index 081cc52550..21980754b2 100644
--- a/dashboard-ui/scripts/nowplayingbar.js
+++ b/dashboard-ui/scripts/nowplayingbar.js
@@ -22,11 +22,12 @@
 
         html += '<div id="nowPlayingBar" class="nowPlayingBar" style="display:none;">';
         html += '<div style="display:inline-block;width:12px;"></div>';
-        html += '<a id="playlistButton" class="mediaButton playlistButton" href="playlist.html" data-role="button" data-icon="bullets" data-iconpos="notext" data-inline="true" title="' + Globalize.translate('ButtonPlaylist') + '">' + Globalize.translate('ButtonPlaylist') + '</a>';
-        html += '<button id="previousTrackButton" class="mediaButton previousTrackButton" title="' + Globalize.translate('ButtonPreviousTrack') + '" type="button" data-icon="previous-track" data-iconpos="notext" data-inline="true">' + Globalize.translate('ButtonPreviousTrack') + '</button>';
 
         html += '<a class="mediaButton remoteControlButton" title="' + Globalize.translate('ButtonRemoteControl') + '" href="nowplaying.html" data-role="button" data-icon="remote" data-iconpos="notext" data-inline="true">' + Globalize.translate('ButtonRemoteControl') + '</a>';
 
+        html += '<a id="playlistButton" class="mediaButton playlistButton" href="playlist.html" data-role="button" data-icon="bullets" data-iconpos="notext" data-inline="true" title="' + Globalize.translate('ButtonPlaylist') + '">' + Globalize.translate('ButtonPlaylist') + '</a>';
+        html += '<button id="previousTrackButton" class="mediaButton previousTrackButton" title="' + Globalize.translate('ButtonPreviousTrack') + '" type="button" data-icon="previous-track" data-iconpos="notext" data-inline="true">' + Globalize.translate('ButtonPreviousTrack') + '</button>';
+
         html += '<button id="playButton" class="mediaButton unpauseButton" title="' + Globalize.translate('ButtonPlay') + '" type="button" data-icon="play" data-iconpos="notext" data-inline="true">' + Globalize.translate('ButtonPlay') + '</button>';
         html += '<button id="pauseButton" class="mediaButton pauseButton" title="' + Globalize.translate('ButtonPause') + '" type="button" data-icon="pause" data-iconpos="notext" data-inline="true">' + Globalize.translate('ButtonPause') + '</button>';