diff --git a/dashboard-ui/itembynamedetails.html b/dashboard-ui/itembynamedetails.html
index 8d132a0026..23889d0232 100644
--- a/dashboard-ui/itembynamedetails.html
+++ b/dashboard-ui/itembynamedetails.html
@@ -78,10 +78,10 @@
         <div id="musicGenreTabs" class="itemTabs" style="display: none;">
             <div class="libraryViewNav scopedLibraryViewNav">
                 <a href="musicrecommended.html">${TabSuggestions}</a>
-                <a href="songs.html" class="musicSongsTab">${TabSongs}</a>
                 <a href="musicalbums.html">${TabAlbums}</a>
                 <a href="musicalbumartists.html">${TabAlbumArtists}</a>
                 <a href="musicartists.html" class="musicArtistsTab">${TabArtists}</a>
+                <a href="songs.html" class="musicSongsTab">${TabSongs}</a>
                 <a href="musicgenres.html" class="ui-btn-active">${TabGenres}</a>
                 <a href="musicvideos.html">${TabMusicVideos}</a>
             </div>
@@ -89,10 +89,10 @@
         <div id="artistTabs" class="itemTabs" style="display: none;">
             <div class="libraryViewNav scopedLibraryViewNav">
                 <a href="musicrecommended.html">${TabSuggestions}</a>
-                <a href="songs.html" class="musicSongsTab">${TabSongs}</a>
                 <a href="musicalbums.html">${TabAlbums}</a>
                 <a href="musicalbumartists.html">${TabAlbumArtists}</a>
                 <a href="musicartists.html" class="ui-btn-active musicArtistsTab">${TabArtists}</a>
+                <a href="songs.html" class="musicSongsTab">${TabSongs}</a>
                 <a href="musicgenres.html">${TabGenres}</a>
                 <a href="musicvideos.html">${TabMusicVideos}</a>
             </div>
diff --git a/dashboard-ui/itemdetails.html b/dashboard-ui/itemdetails.html
index a1ece03db1..5cc4331097 100644
--- a/dashboard-ui/itemdetails.html
+++ b/dashboard-ui/itemdetails.html
@@ -62,10 +62,10 @@
         <div id="songTabs" class="itemTabs" style="display: none;">
             <div class="libraryViewNav scopedLibraryViewNav">
                 <a href="musicrecommended.html">${TabSuggestions}</a>
-                <a href="songs.html" class="ui-btn-active musicSongsTab">${TabSongs}</a>
                 <a href="musicalbums.html">${TabAlbums}</a>
                 <a href="musicalbumartists.html">${TabAlbumArtists}</a>
                 <a href="musicartists.html" class="musicArtistsTab">${TabArtists}</a>
+                <a href="songs.html" class="ui-btn-active musicSongsTab">${TabSongs}</a>
                 <a href="musicgenres.html">${TabGenres}</a>
                 <a href="musicvideos.html">${TabMusicVideos}</a>
             </div>
@@ -73,10 +73,10 @@
         <div id="albumTabs" class="itemTabs" style="display: none;">
             <div class="libraryViewNav scopedLibraryViewNav">
                 <a href="musicrecommended.html">${TabSuggestions}</a>
-                <a href="songs.html" class="musicSongsTab">${TabSongs}</a>
                 <a href="musicalbums.html" class="ui-btn-active">${TabAlbums}</a>
                 <a href="musicalbumartists.html">${TabAlbumArtists}</a>
                 <a href="musicartists.html" class="musicArtistsTab">${TabArtists}</a>
+                <a href="songs.html" class="musicSongsTab">${TabSongs}</a>
                 <a href="musicgenres.html">${TabGenres}</a>
                 <a href="musicvideos.html">${TabMusicVideos}</a>
             </div>
@@ -84,10 +84,10 @@
         <div id="musicVideoTabs" class="itemTabs" style="display: none;">
             <div class="libraryViewNav scopedLibraryViewNav">
                 <a href="musicrecommended.html">${TabSuggestions}</a>
-                <a href="songs.html" class="musicSongsTab">${TabSongs}</a>
                 <a href="musicalbums.html">${TabAlbums}</a>
                 <a href="musicalbumartists.html">${TabAlbumArtists}</a>
                 <a href="musicartists.html" class="musicArtistsTab">${TabArtists}</a>
+                <a href="songs.html" class="musicSongsTab">${TabSongs}</a>
                 <a href="musicgenres.html">${TabGenres}</a>
                 <a href="musicvideos.html" class="ui-btn-active">${TabMusicVideos}</a>
             </div>
diff --git a/dashboard-ui/librarysettings.html b/dashboard-ui/librarysettings.html
index e85753daf9..1a93f15c00 100644
--- a/dashboard-ui/librarysettings.html
+++ b/dashboard-ui/librarysettings.html
@@ -67,8 +67,12 @@
                     <br />
                     <ul data-role="listview" class="ulForm">
                         <li>
-                            <input type="checkbox" id="chkEnableRealtimeMonitor" name="chkEnableRealtimeMonitor" />
-                            <label for="chkEnableRealtimeMonitor">${LabelEnableRealtimeMonitor}</label>
+                            <label for="selectEnableRealtimeMonitor">${LabelEnableRealtimeMonitor}</label>
+                            <select id="selectEnableRealtimeMonitor" data-mini="true">
+                                <option value="Auto">${OptionAuto}</option>
+                                <option value="Enabled">${OptionYes}</option>
+                                <option value="Disabled">${OptionNo}</option>
+                            </select>
                             <div class="fieldDescription">
                                 ${LabelEnableRealtimeMonitorHelp}
                             </div>
diff --git a/dashboard-ui/musicalbumartists.html b/dashboard-ui/musicalbumartists.html
index 86c258d951..b3725a2c6f 100644
--- a/dashboard-ui/musicalbumartists.html
+++ b/dashboard-ui/musicalbumartists.html
@@ -7,10 +7,10 @@
     <div id="musicAlbumArtistsPage" data-role="page" class="page libraryPage" data-require="scripts/musicalbumartists,scripts/queryfilters">
         <div class="libraryViewNav scopedLibraryViewNav">
             <a href="musicrecommended.html">${TabSuggestions}</a>
-            <a href="songs.html" class="musicSongsTab">${TabSongs}</a>
             <a href="musicalbums.html">${TabAlbums}</a>
             <a href="#" class="ui-btn-active">${TabAlbumArtists}</a>
             <a href="musicartists.html" class="musicArtistsTab">${TabArtists}</a>
+            <a href="songs.html" class="musicSongsTab">${TabSongs}</a>
             <a href="musicgenres.html">${TabGenres}</a>
             <a href="musicvideos.html">${TabMusicVideos}</a>
         </div>
diff --git a/dashboard-ui/musicalbums.html b/dashboard-ui/musicalbums.html
index ca445c31b4..ca9eea6fce 100644
--- a/dashboard-ui/musicalbums.html
+++ b/dashboard-ui/musicalbums.html
@@ -7,10 +7,10 @@
     <div id="musicAlbumsPage" data-role="page" class="page libraryPage" data-require="scripts/musicalbums,scripts/queryfilters">
         <div class="libraryViewNav scopedLibraryViewNav">
             <a href="musicrecommended.html">${TabSuggestions}</a>
-            <a href="songs.html" class="musicSongsTab">${TabSongs}</a>
             <a href="#" class="ui-btn-active">${TabAlbums}</a>
             <a href="musicalbumartists.html">${TabAlbumArtists}</a>
             <a href="musicartists.html" class="musicArtistsTab">${TabArtists}</a>
+            <a href="songs.html" class="musicSongsTab">${TabSongs}</a>
             <a href="musicgenres.html">${TabGenres}</a>
             <a href="musicvideos.html">${TabMusicVideos}</a>
         </div>
diff --git a/dashboard-ui/musicartists.html b/dashboard-ui/musicartists.html
index 0c3e6e05bc..9b3c37a611 100644
--- a/dashboard-ui/musicartists.html
+++ b/dashboard-ui/musicartists.html
@@ -7,10 +7,10 @@
     <div id="musicArtistsPage" data-role="page" class="page libraryPage" data-require="scripts/musicartists,scripts/queryfilters">
         <div class="libraryViewNav scopedLibraryViewNav">
             <a href="musicrecommended.html">${TabSuggestions}</a>
-            <a href="songs.html" class="musicSongsTab">${TabSongs}</a>
             <a href="musicalbums.html">${TabAlbums}</a>
             <a href="musicalbumartists.html">${TabAlbumArtists}</a>
             <a href="#" class="ui-btn-active">${TabArtists}</a>
+            <a href="songs.html" class="musicSongsTab">${TabSongs}</a>
             <a href="musicgenres.html">${TabGenres}</a>
             <a href="musicvideos.html">${TabMusicVideos}</a>
         </div>
diff --git a/dashboard-ui/musicgenres.html b/dashboard-ui/musicgenres.html
index c4e219433d..8a8d090955 100644
--- a/dashboard-ui/musicgenres.html
+++ b/dashboard-ui/musicgenres.html
@@ -7,10 +7,10 @@
     <div id="musicGenresPage" data-role="page" class="page libraryPage" data-require="scripts/musicgenres">
         <div class="libraryViewNav scopedLibraryViewNav">
             <a href="musicrecommended.html">${TabSuggestions}</a>
-            <a href="songs.html" class="musicSongsTab">${TabSongs}</a>
             <a href="musicalbums.html">${TabAlbums}</a>
             <a href="musicalbumartists.html">${TabAlbumArtists}</a>
             <a href="musicartists.html" class="musicArtistsTab">${TabArtists}</a>
+            <a href="songs.html" class="musicSongsTab">${TabSongs}</a>
             <a href="#" class="ui-btn-active">${TabGenres}</a>
             <a href="musicvideos.html">${TabMusicVideos}</a>
         </div>
diff --git a/dashboard-ui/musicrecommended.html b/dashboard-ui/musicrecommended.html
index 17ddb0d0b7..361e5ee199 100644
--- a/dashboard-ui/musicrecommended.html
+++ b/dashboard-ui/musicrecommended.html
@@ -7,10 +7,10 @@
     <div id="musicRecommendedPage" data-role="page" class="page libraryPage backdropPage" data-backdroptype="musicartist" data-require="scripts/musicrecommended">
         <div class="libraryViewNav scopedLibraryViewNav">
             <a href="#" class="ui-btn-active">${TabSuggestions}</a>
-            <a href="songs.html" class="musicSongsTab">${TabSongs}</a>
             <a href="musicalbums.html">${TabAlbums}</a>
             <a href="musicalbumartists.html">${TabAlbumArtists}</a>
             <a href="musicartists.html" class="musicArtistsTab">${TabArtists}</a>
+            <a href="songs.html" class="musicSongsTab">${TabSongs}</a>
             <a href="musicgenres.html">${TabGenres}</a>
             <a href="musicvideos.html">${TabMusicVideos}</a>
         </div>
diff --git a/dashboard-ui/musicvideos.html b/dashboard-ui/musicvideos.html
index 6f74437e5d..6d5252f379 100644
--- a/dashboard-ui/musicvideos.html
+++ b/dashboard-ui/musicvideos.html
@@ -8,10 +8,10 @@
 
         <div class="libraryViewNav scopedLibraryViewNav">
             <a href="musicrecommended.html">${TabSuggestions}</a>
-            <a href="songs.html" class="musicSongsTab">${TabSongs}</a>
             <a href="musicalbums.html">${TabAlbums}</a>
             <a href="musicalbumartists.html">${TabAlbumArtists}</a>
             <a href="musicartists.html" class="musicArtistsTab">${TabArtists}</a>
+            <a href="songs.html" class="musicSongsTab">${TabSongs}</a>
             <a href="musicgenres.html">${TabGenres}</a>
             <a href="#" class="ui-btn-active">${TabMusicVideos}</a>
         </div>
diff --git a/dashboard-ui/scripts/librarybrowser.js b/dashboard-ui/scripts/librarybrowser.js
index 2b7bb24760..602fe575fd 100644
--- a/dashboard-ui/scripts/librarybrowser.js
+++ b/dashboard-ui/scripts/librarybrowser.js
@@ -2277,7 +2277,7 @@
 
         },
 
-        getUserDataIconsHtml: function (item) {
+        getUserDataIconsHtml: function (item, includePlayed) {
 
             var html = '';
 
@@ -2286,13 +2286,15 @@
             var itemId = item.Id;
             var type = item.Type;
 
-            var tooltipPlayed = Globalize.translate('TooltipPlayed');
+            if (includePlayed !== false) {
+                var tooltipPlayed = Globalize.translate('TooltipPlayed');
 
-            if ((item.MediaType || item.IsFolder) && type != "TvChannel" && type != "MusicArtist" && item.MediaType != "Audio") {
-                if (userData.Played) {
-                    html += LibraryBrowser.getUserDataButtonHtml('markPlayed', itemId, 'btnUserItemRating btnUserItemRatingOn', 'fa-check', tooltipPlayed);
-                } else {
-                    html += LibraryBrowser.getUserDataButtonHtml('markPlayed', itemId, 'btnUserItemRating', 'fa-check', tooltipPlayed);
+                if ((item.MediaType || item.IsFolder) && type != "TvChannel" && type != "MusicArtist" && item.MediaType != "Audio") {
+                    if (userData.Played) {
+                        html += LibraryBrowser.getUserDataButtonHtml('markPlayed', itemId, 'btnUserItemRating btnUserItemRatingOn', 'fa-check', tooltipPlayed);
+                    } else {
+                        html += LibraryBrowser.getUserDataButtonHtml('markPlayed', itemId, 'btnUserItemRating', 'fa-check', tooltipPlayed);
+                    }
                 }
             }
 
diff --git a/dashboard-ui/scripts/librarysettings.js b/dashboard-ui/scripts/librarysettings.js
index 81dfcc0e48..f69355cd10 100644
--- a/dashboard-ui/scripts/librarysettings.js
+++ b/dashboard-ui/scripts/librarysettings.js
@@ -10,7 +10,7 @@
 
         $('#txtSeasonZeroName', page).val(config.SeasonZeroDisplayName);
 
-        $('#chkEnableRealtimeMonitor', page).checked(config.EnableRealtimeMonitor).checkboxradio("refresh");
+        $('#selectEnableRealtimeMonitor', page).val(config.EnableLibraryMonitor).selectmenu("refresh");
 
         $('#txtItemsByNamePath', page).val(config.ItemsByNamePath || '');
 
@@ -31,7 +31,7 @@
 
             config.SeasonZeroDisplayName = $('#txtSeasonZeroName', form).val();
 
-            config.EnableRealtimeMonitor = $('#chkEnableRealtimeMonitor', form).checked();
+            config.EnableLibraryMonitor = $('#selectEnableRealtimeMonitor', form).val();
 
             config.EnableAudioArchiveFiles = $('#chkEnableAudioArchiveFiles', form).checked();
             config.EnableVideoArchiveFiles = $('#chkEnableVideoArchiveFiles', form).checked();
diff --git a/dashboard-ui/scripts/nowplayingbar.js b/dashboard-ui/scripts/nowplayingbar.js
index 75e07eb9f6..35eb398916 100644
--- a/dashboard-ui/scripts/nowplayingbar.js
+++ b/dashboard-ui/scripts/nowplayingbar.js
@@ -382,7 +382,7 @@
 
         if (nowPlayingItem.Id) {
             ApiClient.getItem(Dashboard.getCurrentUserId(), nowPlayingItem.Id).done(function (item) {
-                nowPlayingUserData.html(LibraryBrowser.getUserDataIconsHtml(item));
+                nowPlayingUserData.html(LibraryBrowser.getUserDataIconsHtml(item, false));
             });
         }
     }
diff --git a/dashboard-ui/songs.html b/dashboard-ui/songs.html
index 284a90ad78..ac5a71f271 100644
--- a/dashboard-ui/songs.html
+++ b/dashboard-ui/songs.html
@@ -7,10 +7,10 @@
     <div id="songsPage" data-role="page" class="page libraryPage backdropPage" data-backdroptype="musicartist" data-require="scripts/songs,scripts/queryfilters">
         <div class="libraryViewNav scopedLibraryViewNav">
             <a href="musicrecommended.html">${TabSuggestions}</a>
-            <a href="#" class="ui-btn-active">${TabSongs}</a>
             <a href="musicalbums.html">${TabAlbums}</a>
             <a href="musicalbumartists.html">${TabAlbumArtists}</a>
             <a href="musicartists.html" class="musicArtistsTab">${TabArtists}</a>
+            <a href="#" class="ui-btn-active">${TabSongs}</a>
             <a href="musicgenres.html">${TabGenres}</a>
             <a href="musicvideos.html">${TabMusicVideos}</a>
         </div>