diff --git a/dashboard-ui/dashboard.html b/dashboard-ui/dashboard.html
index e95fc79d1..8dacaf047 100644
--- a/dashboard-ui/dashboard.html
+++ b/dashboard-ui/dashboard.html
@@ -17,10 +17,10 @@
                     <div class="supporterPromotion" style="display:none;">
                         <a class="btn btnActionAccent" href="supporter.html" style="font-size:14px;">
                             <div>
-                                ${HeaderBecomeMediaBrowserSupporter}
+                                ${HeaderSupportTheTeam}
                             </div>
                             <div style="font-weight:normal;font-size:90%;margin-top:5px;">
-                                ${TextAccessPremiumFeatures}
+                                ${TextEnjoyBonusFeatures}
                             </div>
                         </a>
                     </div>
diff --git a/dashboard-ui/librarysettings.html b/dashboard-ui/librarysettings.html
index 444614915..01989434a 100644
--- a/dashboard-ui/librarysettings.html
+++ b/dashboard-ui/librarysettings.html
@@ -17,7 +17,7 @@
                 <form id="librarySettingsForm">
 
                     <ul data-role="listview" class="ulForm">
-                        <li>
+                        <li class="fldImagesByName" style="display:none;">
                             <label for="txtItemsByNamePath">${LabelImagesByNamePath}</label>
                             <div style="display: inline-block; width: 92%;">
                                 <input type="text" id="txtItemsByNamePath" name="txtItemsByNamePath" />
diff --git a/dashboard-ui/metadata.html b/dashboard-ui/metadata.html
index 5e4f55f1c..66c37fb5b 100644
--- a/dashboard-ui/metadata.html
+++ b/dashboard-ui/metadata.html
@@ -13,7 +13,7 @@
                     <a href="#" data-role="button" class="ui-btn-active">${TabBasics}</a>
                     <a href="metadataimages.html" data-role="button">${TabServices}</a>
                     <a href="metadatasubtitles.html" data-role="button">${TabSubtitles}</a>
-                    <a href="metadatakodi.html" data-role="button">${TabKodiMetadata}</a>
+                    <a href="metadatanfo.html" data-role="button">${TabNfo}</a>
                     <a href="metadataadvanced.html" data-role="button">${TabAdvanced}</a>
                 </div>
 
diff --git a/dashboard-ui/metadataadvanced.html b/dashboard-ui/metadataadvanced.html
index 2a3c28b73..6238328ce 100644
--- a/dashboard-ui/metadataadvanced.html
+++ b/dashboard-ui/metadataadvanced.html
@@ -13,7 +13,7 @@
                     <a href="metadata.html" data-role="button">${TabBasics}</a>
                     <a href="metadataimages.html" data-role="button">${TabServices}</a>
                     <a href="metadatasubtitles.html" data-role="button">${TabSubtitles}</a>
-                    <a href="metadatakodi.html" data-role="button">${TabKodiMetadata}</a>
+                    <a href="metadatanfo.html" data-role="button">${TabNfo}</a>
                     <a href="#" data-role="button" class="ui-btn-active">${TabAdvanced}</a>
                 </div>
 
diff --git a/dashboard-ui/metadataimages.html b/dashboard-ui/metadataimages.html
index 46ba0b02d..00ed16ee5 100644
--- a/dashboard-ui/metadataimages.html
+++ b/dashboard-ui/metadataimages.html
@@ -13,7 +13,7 @@
                     <a href="metadata.html" data-role="button">${TabBasics}</a>
                     <a href="#" data-role="button" class="ui-btn-active">${TabServices}</a>
                     <a href="metadatasubtitles.html" data-role="button">${TabSubtitles}</a>
-                    <a href="metadatakodi.html" data-role="button">${TabKodiMetadata}</a>
+                    <a href="metadatanfo.html" data-role="button">${TabNfo}</a>
                     <a href="metadataadvanced.html" data-role="button">${TabAdvanced}</a>
                 </div>
 
diff --git a/dashboard-ui/metadatakodi.html b/dashboard-ui/metadatanfo.html
similarity index 91%
rename from dashboard-ui/metadatakodi.html
rename to dashboard-ui/metadatanfo.html
index 7b398d40f..8aaf6c99b 100644
--- a/dashboard-ui/metadatakodi.html
+++ b/dashboard-ui/metadatanfo.html
@@ -4,7 +4,7 @@
     <title>${TitleMetadata}</title>
 </head>
 <body>
-    <div id="metadataKodiPage" data-role="page" class="page type-interior metadataConfigurationPage">
+    <div id="metadataNfoPage" data-role="page" class="page type-interior metadataConfigurationPage">
 
         <div data-role="content">
 
@@ -13,11 +13,11 @@
                     <a href="metadata.html" data-role="button">${TabBasics}</a>
                     <a href="metadataimages.html" data-role="button">${TabServices}</a>
                     <a href="metadatasubtitles.html" data-role="button">${TabSubtitles}</a>
-                    <a href="#" class="ui-btn-active" data-role="button">${TabKodiMetadata}</a>
+                    <a href="#" class="ui-btn-active" data-role="button">${TabNfo}</a>
                     <a href="metadataadvanced.html" data-role="button">${TabAdvanced}</a>
                 </div>
 
-                <form class="metadataKodiForm">
+                <form class="metadataNfoForm">
 
                     <p>${HeaderKodiMetadataHelp}</p>
                     <br />
@@ -25,8 +25,7 @@
 
                         <li>
                             <label for="selectUser">${LabelKodiMetadataUser}</label>
-                            <select name="selectUser" id="selectUser" data-mini="true">
-                            </select>
+                            <select name="selectUser" id="selectUser" data-mini="true"></select>
                             <div class="fieldDescription">${LabelKodiMetadataUserHelp}</div>
                         </li>
 
@@ -73,7 +72,7 @@
         </div>
 
         <script type="text/javascript">
-            $('.metadataKodiForm').off('submit', KodiMetadataPage.onSubmit).on('submit', KodiMetadataPage.onSubmit);
+            $('.metadataNfoForm').off('submit', NfoMetadataPage.onSubmit).on('submit', NfoMetadataPage.onSubmit);
         </script>
     </div>
 </body>
diff --git a/dashboard-ui/metadatasubtitles.html b/dashboard-ui/metadatasubtitles.html
index 8890ea120..781287ad2 100644
--- a/dashboard-ui/metadatasubtitles.html
+++ b/dashboard-ui/metadatasubtitles.html
@@ -13,7 +13,7 @@
                     <a href="metadata.html" data-role="button">${TabBasics}</a>
                     <a href="metadataimages.html" data-role="button">${TabServices}</a>
                     <a href="#" class="ui-btn-active" data-role="button">${TabSubtitles}</a>
-                    <a href="metadatakodi.html" data-role="button">${TabKodiMetadata}</a>
+                    <a href="metadatanfo.html" data-role="button">${TabNfo}</a>
                     <a href="metadataadvanced.html" data-role="button">${TabAdvanced}</a>
                 </div>
 
diff --git a/dashboard-ui/scripts/favorites.js b/dashboard-ui/scripts/favorites.js
index 0f9c8ecec..5b4724bee 100644
--- a/dashboard-ui/scripts/favorites.js
+++ b/dashboard-ui/scripts/favorites.js
@@ -62,7 +62,7 @@
                 html += '</div>';
             }
 
-            elem = $(elem).html(html).lazyChildren();
+            elem = $(elem).html(html).trigger('create').lazyChildren();
             elem.createCardMenus();
         });
     }
diff --git a/dashboard-ui/scripts/itembynamedetailpage.js b/dashboard-ui/scripts/itembynamedetailpage.js
index 849ca05e1..5d6e9b10d 100644
--- a/dashboard-ui/scripts/itembynamedetailpage.js
+++ b/dashboard-ui/scripts/itembynamedetailpage.js
@@ -433,7 +433,6 @@
                     playFromHere: true,
                     defaultAction: 'playallfromhere'
                 });
-
             }
             else if (query.IncludeItemTypes == "Movie" || query.IncludeItemTypes == "Trailer") {
 
@@ -489,7 +488,7 @@
 
             html += LibraryBrowser.getPagingHtml(query, result.TotalRecordCount);
 
-            $('#items', page).html(html).lazyChildren();
+            $('#items', page).html(html).trigger('create').lazyChildren();
 
             $('.btnNextPage', page).on('click', function () {
 
diff --git a/dashboard-ui/scripts/librarysettings.js b/dashboard-ui/scripts/librarysettings.js
index 1096109f8..9a9478d46 100644
--- a/dashboard-ui/scripts/librarysettings.js
+++ b/dashboard-ui/scripts/librarysettings.js
@@ -2,6 +2,12 @@
 
     function loadPage(page, config) {
 
+        if (config.MergeMetadataAndImagesByName) {
+            $('.fldImagesByName', page).hide();
+        } else {
+            $('.fldImagesByName', page).show();
+        }
+
         $('#txtSeasonZeroName', page).val(config.SeasonZeroDisplayName);
 
         $('#chkEnableRealtimeMonitor', page).checked(config.EnableRealtimeMonitor).checkboxradio("refresh");
diff --git a/dashboard-ui/scripts/loginpage.js b/dashboard-ui/scripts/loginpage.js
index db346ff8b..00b5c3ce5 100644
--- a/dashboard-ui/scripts/loginpage.js
+++ b/dashboard-ui/scripts/loginpage.js
@@ -15,7 +15,7 @@
 
             if (showManualForm) {
 
-                LoginPage.showManualForm(page, false);
+                LoginPage.showManualForm(page, false, false);
 
             } else {
                 LoginPage.showVisualForm(page);
@@ -36,10 +36,15 @@
         LoginPage.showVisualForm($.mobile.activePage);
     },
 
-    showManualForm: function (page, showCancel) {
+    showManualForm: function (page, showCancel, focusPassword) {
         $('.visualLoginForm', page).hide();
         $('#manualLoginForm', page).show();
-        $('#txtManualName', page).focus();
+
+        if (focusPassword) {
+            $('#txtManualPassword', page).focus();
+        } else {
+            $('#txtManualName', page).focus();
+        }
 
         if (showCancel) {
             $('.btnCancel', page).show();
@@ -175,7 +180,7 @@
             } else {
                 $('#txtManualName', page).val(name);
                 $('#txtManualPassword', '#loginPage').val('');
-                LoginPage.showManualForm(page, true);
+                LoginPage.showManualForm(page, true, true);
             }
         });
     },
diff --git a/dashboard-ui/scripts/metadatakodi.js b/dashboard-ui/scripts/metadatanfo.js
similarity index 95%
rename from dashboard-ui/scripts/metadatakodi.js
rename to dashboard-ui/scripts/metadatanfo.js
index 7af554b93..7438981e9 100644
--- a/dashboard-ui/scripts/metadatakodi.js
+++ b/dashboard-ui/scripts/metadatanfo.js
@@ -19,7 +19,7 @@
         Dashboard.hideLoadingMsg();
     }
 
-    $(document).on('pageshow', "#metadataKodiPage", function () {
+    $(document).on('pageshow', "#metadataNfoPage", function () {
 
         Dashboard.showLoadingMsg();
 
@@ -34,7 +34,7 @@
         });
     });
 
-    window.KodiMetadataPage = {
+    window.NfoMetadataPage = {
 
         onSubmit: function () {
 
diff --git a/dashboard-ui/scripts/musicrecommended.js b/dashboard-ui/scripts/musicrecommended.js
index f4275de3f..c462fe49f 100644
--- a/dashboard-ui/scripts/musicrecommended.js
+++ b/dashboard-ui/scripts/musicrecommended.js
@@ -2,7 +2,6 @@
 
     $(document).on('pagebeforeshow', "#musicRecommendedPage", function () {
 
-        var screenWidth = $(window).width();
         var userId = Dashboard.getCurrentUserId();
 
         var page = this;