diff --git a/dashboard-ui/advanced.html b/dashboard-ui/advanced.html
index d5592b50e7..951979fd7a 100644
--- a/dashboard-ui/advanced.html
+++ b/dashboard-ui/advanced.html
@@ -31,6 +31,26 @@
                             <label for="txtWebSocketPortNumber">Web socket port number: </label>
                             <input type="number" id="txtWebSocketPortNumber" name="txtWebSocketPortNumber" pattern="[0-9]*" required="required" min="1" />
                         </li>
+                    </ul>
+                    <h2>Images By Name</h2>
+                    <ul data-role="listview" class="ulForm">
+                        <li>
+                            <input type="checkbox" id="chkEnableCustomIBNPath" name="chkEnableCustomIBNPath" />
+                            <label for="chkEnableCustomIBNPath">Use custom IBN path</label>
+                        </li>
+                        <li id="fieldEnterIBNPath" style="display: none;">
+                            <label for="txtItemsByNamePath">Images by name path: </label>
+                            <div style="display: inline-block; width: 92%;">
+                                <input type="text" id="txtItemsByNamePath" name="txtItemsByNamePath" />
+                            </div>
+                            <button id="btnSelectIBNPath" type="button" data-icon="folder-close" data-iconpos="notext" data-inline="true">Select Directory</button>
+                            <div class="fieldDescription">
+                                Supply a custom path for images by name. MB server must have write access to this folder.
+                            </div>
+                        </li>
+                    </ul>
+                    <h2>Miscellaneous</h2>
+                    <ul data-role="listview" class="ulForm">
                         <li>
                             <input type="checkbox" id="chkEnableDeveloperTools" name="chkEnableDeveloperTools" />
                             <label for="chkEnableDeveloperTools">Enable developer tools</label>
diff --git a/dashboard-ui/itembynamedetails.html b/dashboard-ui/itembynamedetails.html
index 1760e59ced..f3da301391 100644
--- a/dashboard-ui/itembynamedetails.html
+++ b/dashboard-ui/itembynamedetails.html
@@ -82,38 +82,40 @@
                     <a href="musicgenres.html" data-role="button" class="ui-btn-active">Genres</a>
                 </div>
             </div>
-            <div class="detailPagePrimaryInfo">
-                <div class="itemImageBlock">
-                    <div id="itemMedia" style="position: relative;">
-                        <div id="itemImage"></div>
+            <div class="detailPageContent">
+                <div class="detailPagePrimaryInfo">
+                    <div class="itemImageBlock">
+                        <div id="itemMedia" style="position: relative;">
+                            <div id="itemImage"></div>
+                        </div>
+                    </div>
+
+                    <div class="itemDetailBlock">
+                        <h1 id="itemName" class="detailPageName"></h1>
+
+                        <p id="itemMiscInfo" class="itemMiscInfo"></p>
+                        <p id="itemOverview"></p>
+                        <p id="itemRatings"></p>
+                        <p id="itemBirthday"></p>
+                        <p id="itemBirthLocation"></p>
+                        <p id="itemDeathDate"></p>
+
+                        <p id="itemLinks"></p>
+
                     </div>
                 </div>
+            </div>
 
-                <div class="itemDetailBlock">
-                    <h1 id="itemName" class="detailPageName"></h1>
-
-                    <p id="itemMiscInfo" class="itemMiscInfo"></p>
-                    <p id="itemOverview"></p>
-                    <p id="itemRatings"></p>
-                    <p id="itemBirthday"></p>
-                    <p id="itemBirthLocation"></p>
-                    <p id="itemDeathDate"></p>
-
-                    <p id="itemLinks"></p>
+            <div id="itemTabs" style="margin-top: 20px; text-align: center;"></div>
 
+            <div class="viewSettings">
+                <div class="viewControls">
                 </div>
-
-                <div id="itemTabs" style="margin-top: 20px;"></div>
-
-                <div class="viewSettings">
-                    <div class="viewControls">
-                    </div>
-                    <div class="listTopPaging">
-                    </div>
-                </div>
-                <div id="items">
+                <div class="listTopPaging">
                 </div>
             </div>
+            <div id="items">
+            </div>
         </div>
     </div>
 </body>
diff --git a/dashboard-ui/scripts/advancedconfigurationpage.js b/dashboard-ui/scripts/advancedconfigurationpage.js
index f8c0d0a7d3..f6ba1ea093 100644
--- a/dashboard-ui/scripts/advancedconfigurationpage.js
+++ b/dashboard-ui/scripts/advancedconfigurationpage.js
@@ -1,23 +1,7 @@
-var AdvancedConfigurationPage = {
+(function ($, document, window) {
 
-    onPageShow: function () {
-        Dashboard.showLoadingMsg();
+    function loadPage(page, config, systemInfo) {
 
-        var promise1 = ApiClient.getServerConfiguration();
-
-        var promise2 = ApiClient.getSystemInfo();
-
-        $.when(promise1, promise2).done(function (response1, response2) {
-
-            AdvancedConfigurationPage.loadPage(response1[0], response2[0]);
-
-        });
-    },
-    
-    loadPage: function (config, systemInfo) {
-        
-        var page = $.mobile.activePage;
-        
         if (systemInfo.SupportsNativeWebSocket) {
 
             $('#fldWebSocketPortNumber', page).hide();
@@ -28,6 +12,19 @@
         $('#selectAutomaticUpdateLevel', page).val(config.SystemUpdateLevel).selectmenu('refresh');
         $('#txtWebSocketPortNumber', page).val(config.LegacyWebSocketPortNumber);
 
+        $('#txtItemsByNamePath', page).val(config.ItemsByNamePath);
+
+        var customIbn = config.ItemsByNamePath ? true : false;
+        $('#chkEnableCustomIBNPath', page).checked(customIbn).checkboxradio("refresh");
+
+        if (customIbn) {
+            $('#fieldEnterIBNPath', page).show();
+            $('#txtItemsByNamePath', page).attr("required", "required");
+        } else {
+            $('#fieldEnterIBNPath', page).hide();
+            $('#txtItemsByNamePath', page).removeAttr("required");
+        }
+
         $('#txtPortNumber', page).val(config.HttpServerPortNumber);
         $('#chkDebugLog', page).checked(config.EnableDebugLevelLogging).checkboxradio("refresh");
 
@@ -35,31 +32,98 @@
         $('#chkRunAtStartup', page).checked(config.RunAtStartup).checkboxradio("refresh");
 
         Dashboard.hideLoadingMsg();
-    },
+    }
 
-    onSubmit: function () {
+    $(document).on('pageshow', "#advancedConfigurationPage", function () {
 
         Dashboard.showLoadingMsg();
 
-        var form = this;
+        var page = this;
 
-        ApiClient.getServerConfiguration().done(function (config) {
+        var promise1 = ApiClient.getServerConfiguration();
 
-            config.LegacyWebSocketPortNumber = $('#txtWebSocketPortNumber', form).val();
+        var promise2 = ApiClient.getSystemInfo();
 
-            config.HttpServerPortNumber = $('#txtPortNumber', form).val();
-            config.EnableDebugLevelLogging = $('#chkDebugLog', form).checked();
+        $('#btnSelectIBNPath', page).on("click.selectDirectory", function () {
 
-            config.EnableDeveloperTools = $('#chkEnableDeveloperTools', form).checked();
-            config.RunAtStartup = $('#chkRunAtStartup', form).checked();
-            config.SystemUpdateLevel = $('#selectAutomaticUpdateLevel', form).val();
+            Dashboard.selectDirectory({
 
-            ApiClient.updateServerConfiguration(config).done(Dashboard.processServerConfigurationUpdateResult);
+                callback: function (path) {
+
+                    if (path) {
+                        $('#txtItemsByNamePath', page).val(path);
+                    }
+                    $('#popupDirectoryPicker', page).popup("close");
+                },
+
+                header: "Select Items By Name Path",
+
+                instruction: "Browse or enter the path to your items by name folder. The folder must be writeable."
+            });
         });
 
-        // Disable default form submission
-        return false;
-    }
-};
+        $('#chkEnableCustomIBNPath', page).on("change.showIBNText", function() {
+            
+            if (this.checked) {
+                $('#fieldEnterIBNPath', page).show();
+                $('#txtItemsByNamePath', page).attr("required", "required");
+            } else {
+                $('#fieldEnterIBNPath', page).hide();
+                $('#txtItemsByNamePath', page).removeAttr("required");
+            }
 
-$(document).on('pageshow', "#advancedConfigurationPage", AdvancedConfigurationPage.onPageShow);
+        });
+
+        $.when(promise1, promise2).done(function (response1, response2) {
+
+            loadPage(page, response1[0], response2[0]);
+
+        });
+
+    }).on('pagehide', "#advancedConfigurationPage", function () {
+
+        Dashboard.showLoadingMsg();
+
+        var page = this;
+
+        $('#chkEnableCustomIBNPath', page).off("change.showIBNText");
+        $('#btnSelectIBNPath', page).off("click.selectDirectory");
+    });
+
+    function advancedConfigurationPage() {
+
+        var self = this;
+
+        self.onSubmit = function () {
+            Dashboard.showLoadingMsg();
+
+            var form = this;
+
+            ApiClient.getServerConfiguration().done(function (config) {
+
+                config.LegacyWebSocketPortNumber = $('#txtWebSocketPortNumber', form).val();
+
+                config.HttpServerPortNumber = $('#txtPortNumber', form).val();
+                config.EnableDebugLevelLogging = $('#chkDebugLog', form).checked();
+
+                config.EnableDeveloperTools = $('#chkEnableDeveloperTools', form).checked();
+                config.RunAtStartup = $('#chkRunAtStartup', form).checked();
+                config.SystemUpdateLevel = $('#selectAutomaticUpdateLevel', form).val();
+                
+                if ($('#chkEnableCustomIBNPath', form).checked()) {
+                    config.ItemsByNamePath = $('#txtItemsByNamePath', form).val();
+                } else {
+                    config.ItemsByNamePath = '';
+                }
+
+                ApiClient.updateServerConfiguration(config).done(Dashboard.processServerConfigurationUpdateResult);
+            });
+
+            // Disable default form submission
+            return false;
+        };
+    }
+
+    window.AdvancedConfigurationPage = new advancedConfigurationPage();
+
+})(jQuery, document, window);
diff --git a/dashboard-ui/scripts/site.js b/dashboard-ui/scripts/site.js
index 8d68b216e8..5c8fb4c44a 100644
--- a/dashboard-ui/scripts/site.js
+++ b/dashboard-ui/scripts/site.js
@@ -470,8 +470,9 @@ var Dashboard = {
         options = options || {};
 
         options.header = options.header || "Select Media Path";
+        options.instruction = options.instruction || "Browse to or enter the folder containing the media. Network paths (UNC) are recommended for optimal playback performance.";
 
-        var html = '<div data-role="popup" id="popupDirectoryPicker" class="ui-corner-all popup">';
+        var html = '<div data-role="popup" id="popupDirectoryPicker" class="ui-corner-all popup" style="min-width:60%;">';
 
         html += '<div class="ui-corner-top ui-bar-a" style="text-align: center; padding: 0 20px;">';
         html += '<h3>' + options.header + '</h3>';
@@ -479,7 +480,7 @@ var Dashboard = {
 
         html += '<div data-role="content" class="ui-corner-bottom ui-content">';
         html += '<form>';
-        html += '<p>Browse to or enter the folder containing the media. Network paths (UNC) are recommended for optimal playback performance.</p>';
+        html += '<p>' + options.instruction + '</p>';
 
         html += '<div data-role="fieldcontain" style="margin:0;">';
         html += '<label for="txtDirectoryPickerPath">Current Folder:</label>';
@@ -656,7 +657,7 @@ var Dashboard = {
         var isLibraryPage = page.hasClass('libraryPage');
 
         var header = $('.header', page);
-        
+
         if (!header.length) {
             headerHtml += '<div class="header">';
 
diff --git a/dashboard-ui/scripts/wizardfinishpage.js b/dashboard-ui/scripts/wizardfinishpage.js
index 1633bf140e..66a11c54b0 100644
--- a/dashboard-ui/scripts/wizardfinishpage.js
+++ b/dashboard-ui/scripts/wizardfinishpage.js
@@ -1,13 +1,26 @@
 var WizardFinishPage = {
-  
-    onFinish: function() {
-        
+
+    onFinish: function () {
+
         ApiClient.getServerConfiguration().done(function (config) {
 
             config.IsStartupWizardCompleted = true;
 
-            ApiClient.updateServerConfiguration(config).done(function() {
-                Dashboard.navigate('dashboard.html');
+            ApiClient.updateServerConfiguration(config).done(function () {
+
+                ApiClient.getUsers().done(function (users) {
+
+                    for (var i = 0, length = users.length; i < length; i++) {
+
+                        if (users[i].Configuration.IsAdministrator) {
+                            Dashboard.setCurrentUser(users[i].Id);
+                            break;
+                        }
+
+                    }
+                    
+                    Dashboard.navigate('dashboard.html');
+                });
             });
         });