diff --git a/dashboard-ui/css/librarybrowser.css b/dashboard-ui/css/librarybrowser.css
index 4022662d90..cdaef97777 100644
--- a/dashboard-ui/css/librarybrowser.css
+++ b/dashboard-ui/css/librarybrowser.css
@@ -26,6 +26,7 @@
     z-index: 1000;
     top: 0;
     border-bottom: 1px solid #111;
+    padding-left: 10px;
 }
 
 .viewMenuLink {
@@ -502,6 +503,13 @@ a.itemTag:hover {
     max-width: 100%;
 }
 
+@media all and (max-width: 550px) {
+
+    .desktopViewMenuLink {
+        display: none;
+    }
+}
+
 @media all and (min-width: 600px) {
     .inlineDetailSection:not(.hide) {
         display: inline-block;
@@ -522,6 +530,10 @@ a.itemTag:hover {
 
 @media all and (max-width: 750px) {
 
+    .editorMenuLink {
+        display: none;
+    }
+
     .itemBackdrop {
         background-image: none!important;
         height: auto;
diff --git a/dashboard-ui/css/search.css b/dashboard-ui/css/search.css
index 1261930613..3dc68e25d2 100644
--- a/dashboard-ui/css/search.css
+++ b/dashboard-ui/css/search.css
@@ -47,6 +47,7 @@
     overflow: hidden;
     font-size: 12px;
     color: #fff;
+    font-weight: normal !important;
 }
 
 .searchHintSecondaryText {
diff --git a/dashboard-ui/scripts/librarybrowser.js b/dashboard-ui/scripts/librarybrowser.js
index c4eb8cacb9..6f2d57e534 100644
--- a/dashboard-ui/scripts/librarybrowser.js
+++ b/dashboard-ui/scripts/librarybrowser.js
@@ -2382,12 +2382,12 @@
 
         var html = '<div class="viewMenuBar">';
 
-        html += '<a class="viewMenuLink homeMenuLink" href="index.html" title="Home"><img src="css/images/mblogoicon.png" alt="Home" /></a>';
+        html += '<a data-role="button" href="index.html" data-icon="bars" data-iconpos="notext" data-inline="true" title="Menu">Menu</a>';
 
-        html += '<a class="viewMenuLink viewMenuImageLink remoteControlMenuLink" href="#" onclick="RemoteControl.showMenu();" title="Remote Control"><img src="css/images/remote.png" alt="Remote Control" /></a>';
+        html += '<button class="viewMenuRemoteControlButton" onclick="RemoteControl.showMenu();" type="button" data-icon="remote" data-inline="true" data-iconpos="notext" title="Remote Control">Remote Control</button>';
 
         if (user.Configuration.IsAdministrator) {
-            html += '<a class="viewMenuLink viewMenuImageLink editorMenuLink" href="edititemmetadata.html" title="Metadata Manager"><img src="css/images/editor.png" alt=""Metadata Manager" /></a>';
+            html += '<a class="editorMenuLink" href="edititemmetadata.html" data-role="button" data-icon="edit" data-inline="true" data-iconpos="notext" title="Metadata Manager">Metadata Manager</a>';
         }
 
         html += '<div class="viewMenuSecondary">';
@@ -2421,7 +2421,7 @@
 
         $(page).prepend(html);
 
-        Search.onSearchRendered($('.viewMenuBar', page).trigger('create'));
+        $('.viewMenuBar', page).trigger('create');
     }
 
     function insertViews(page, user, counts, liveTvServices) {
@@ -2435,26 +2435,26 @@
 
         if (counts.MovieCount || counts.TrailerCount) {
 
-            html += '<a class="viewMenuLink viewMenuTextLink' + (view == 'movies' ? selectedCssClass : '') + '" href="moviesrecommended.html">' + (view == 'movies' ? selectedHtml : '') + '<span class="viewName">Movies</span></a>';
+            html += '<a class="viewMenuLink viewMenuTextLink desktopViewMenuLink' + (view == 'movies' ? selectedCssClass : '') + '" href="moviesrecommended.html">' + (view == 'movies' ? selectedHtml : '') + '<span class="viewName">Movies</span></a>';
         }
 
         if (counts.EpisodeCount || counts.SeriesCount) {
-            html += '<a class="viewMenuLink viewMenuTextLink' + (view == 'tv' ? selectedCssClass : '') + '" href="tvrecommended.html">' + (view == 'tv' ? selectedHtml : '') + '<span class="viewName">TV</span></a>';
+            html += '<a class="viewMenuLink viewMenuTextLink desktopViewMenuLink' + (view == 'tv' ? selectedCssClass : '') + '" href="tvrecommended.html">' + (view == 'tv' ? selectedHtml : '') + '<span class="viewName">TV</span></a>';
         }
 
         if (liveTvServices.length) {
-            html += '<a class="viewMenuLink viewMenuTextLink' + (view == 'livetv' ? selectedCssClass : '') + '" href="livetvchannels.html">' + (view == 'livetv' ? selectedHtml : '') + '<span class="viewName">Live TV</span></a>';
+            html += '<a class="viewMenuLink viewMenuTextLink desktopViewMenuLink' + (view == 'livetv' ? selectedCssClass : '') + '" href="livetvchannels.html">' + (view == 'livetv' ? selectedHtml : '') + '<span class="viewName">Live TV</span></a>';
         }
 
         if (counts.SongCount || counts.MusicVideoCount) {
-            html += '<a class="viewMenuLink viewMenuTextLink' + (view == 'music' ? selectedCssClass : '') + '" href="musicrecommended.html">' + (view == 'music' ? selectedHtml : '') + '<span class="viewName">Music</span></a>';
+            html += '<a class="viewMenuLink viewMenuTextLink desktopViewMenuLink' + (view == 'music' ? selectedCssClass : '') + '" href="musicrecommended.html">' + (view == 'music' ? selectedHtml : '') + '<span class="viewName">Music</span></a>';
         }
 
         if (counts.GameCount) {
-            html += '<a class="viewMenuLink viewMenuTextLink' + (view == 'games' ? selectedCssClass : '') + '" href="gamesrecommended.html">' + (view == 'games' ? selectedHtml : '') + '<span class="viewName">Games</span></a>';
+            html += '<a class="viewMenuLink viewMenuTextLink desktopViewMenuLink' + (view == 'games' ? selectedCssClass : '') + '" href="gamesrecommended.html">' + (view == 'games' ? selectedHtml : '') + '<span class="viewName">Games</span></a>';
         }
 
-        $('.homeMenuLink', page).after(html);
+        $('.viewMenuRemoteControlButton', page).before(html);
     }
 
     $(document).on('pagebeforeshow', ".libraryPage", function () {
diff --git a/dashboard-ui/scripts/search.js b/dashboard-ui/scripts/search.js
index b38417c59d..04094cbe2d 100644
--- a/dashboard-ui/scripts/search.js
+++ b/dashboard-ui/scripts/search.js
@@ -181,6 +181,10 @@
             html += '<div class="searchHintSecondaryText">' + text + '</div>';
         }
 
+        else if (hint.ProductionYear && hint.MediaType != "Audio" && hint.Type != "Episode") {
+            html += '<div class="searchHintSecondaryText">' + hint.ProductionYear + '</div>';
+        }
+        
         else if (hint.RunTimeTicks) {
             html += '<div class="searchHintSecondaryText">' + Dashboard.getDisplayTime(hint.RunTimeTicks) + '</div>';
         }
@@ -251,25 +255,8 @@
                 }
 
             });
-        }
-
-        return panel;
-    }
-
-    function search() {
-
-        var self = this;
-
-        self.showSearchPanel = function (page) {
-
-            var panel = getSearchPanel(page);
-
-            $(panel).panel('toggle');
-        };
-
-        self.onSearchRendered = function (parentElem) {
-
-            $('#searchHints', parentElem).on("keydown", '.searchHint', function (e) {
+            
+            $('#searchHints', page).on("keydown", '.searchHint', function (e) {
 
                 // Down
                 if (e.keyCode == 40) {
@@ -290,12 +277,25 @@
                     if (prev) {
                         prev.focus();
                     } else {
-                        $('#txtSearch', parentElem)[0].focus();
+                        $('#txtSearch', page)[0].focus();
                     }
                     return false;
                 }
             });
+        }
 
+        return panel;
+    }
+
+    function search() {
+
+        var self = this;
+
+        self.showSearchPanel = function (page) {
+
+            var panel = getSearchPanel(page);
+
+            $(panel).panel('toggle');
         };
     }
 
@@ -304,6 +304,7 @@
     $(document).on('pagehide', ".libraryPage", function () {
 
         $('#txtSearch', this).val('');
+        $('#searchHints', this).empty();
     });