diff --git a/dashboard-ui/bower_components/emby-apiclient/connectionmanager.js b/dashboard-ui/bower_components/emby-apiclient/connectionmanager.js
index 82ebddd015..aad6c10b67 100644
--- a/dashboard-ui/bower_components/emby-apiclient/connectionmanager.js
+++ b/dashboard-ui/bower_components/emby-apiclient/connectionmanager.js
@@ -309,6 +309,7 @@
             existingServer.DateLastAccessed = new Date().getTime();
             existingServer.LastConnectionMode = ConnectionMode.Manual;
             existingServer.ManualAddress = apiClient.serverAddress();
+            existingServer.PreferredConnectionMode = ConnectionMode.Manual;
             apiClient.serverInfo(existingServer);
 
             apiClient.onAuthenticated = function (instance, result) {
@@ -997,6 +998,9 @@
                 if (server.LastConnectionMode != null) {
                     //tests.push(server.LastConnectionMode);
                 }
+                if (server.PreferredConnectionMode != null) {
+                    tests.push(server.PreferredConnectionMode);
+                }
                 if (tests.indexOf(ConnectionMode.Manual) == -1) { tests.push(ConnectionMode.Manual); }
                 if (tests.indexOf(ConnectionMode.Local) == -1) { tests.push(ConnectionMode.Local); }
                 if (tests.indexOf(ConnectionMode.Remote) == -1) { tests.push(ConnectionMode.Remote); }
diff --git a/dashboard-ui/devicesupload.html b/dashboard-ui/devicesupload.html
index 5609d22ff8..1da43de5d3 100644
--- a/dashboard-ui/devicesupload.html
+++ b/dashboard-ui/devicesupload.html
@@ -7,16 +7,8 @@
 
                 <p>${HeaderCameraUploadHelp}</p>
 
-                <p class="noDevices" style="display:none;color:red;">${MessageNoDevicesSupportCameraUpload}</p>
+                <form class="devicesUploadForm">
 
-                <br />
-                <form class="devicesUploadForm" style="display:none;">
-
-                    <div class="devicesList">
-
-                    </div>
-
-                    <br />
                     <ul data-role="listview" class="ulForm">
                         <li>
                             <paper-input id="txtUploadPath" label="${LabelCameraUploadPath}" style="width:84%;display:inline-block;"></paper-input>
diff --git a/dashboard-ui/mypreferenceshome.html b/dashboard-ui/mypreferenceshome.html
index 2da602b1c6..85bbf9c1ec 100644
--- a/dashboard-ui/mypreferenceshome.html
+++ b/dashboard-ui/mypreferenceshome.html
@@ -95,19 +95,6 @@
                 </div>
             </div>
 
-            <div class="detailSection viewStylesSection" style="display:none;">
-                <h1>
-                    ${HeaderViewStyles}
-                </h1>
-                <div class="detailSectionContent">
-                    <p>${LabelSelectViewStyles}</p>
-                    <div class="viewStylesList">
-
-                    </div>
-                    <div class="fieldDescription paperCheckboxFieldDescription">${LabelSelectViewStylesHelp}</div>
-                </div>
-            </div>
-
             <div class="detailSection">
                 <h1>
                     ${HeaderViewOrder}
diff --git a/dashboard-ui/scripts/devicesupload.js b/dashboard-ui/scripts/devicesupload.js
index 583a0d9ada..65f6effcab 100644
--- a/dashboard-ui/scripts/devicesupload.js
+++ b/dashboard-ui/scripts/devicesupload.js
@@ -1,78 +1,18 @@
 define(['jQuery'], function ($) {
 
-    function load(page, devices, config) {
-
-        if (devices.length) {
-            $('.noDevices', page).hide();
-            $('.devicesUploadForm', page).show();
-        } else {
-            $('.noDevices', page).show();
-            $('.devicesUploadForm', page).hide();
-        }
+    function load(page, config) {
 
         $('#txtUploadPath', page).val(config.CameraUploadPath || '');
 
         $('#chkSubfolder', page).checked(config.EnableCameraUploadSubfolders);
-
-        loadDeviceList(page, devices, config);
-    }
-
-    function loadDeviceList(page, devices, config) {
-
-        var html = '';
-
-        html += '<div class="paperListLabel">';
-        html += Globalize.translate('LabelEnableCameraUploadFor');
-        html += '</div>';
-
-        html += '<div class="paperCheckboxList paperList">';
-
-        var index = 0;
-        html += devices.map(function (d) {
-
-            var deviceHtml = '';
-
-            var isChecked = config.EnabledCameraUploadDevices.indexOf(d.Id) != -1;
-            var checkedHtml = isChecked ? ' checked="checked"' : '';
-
-            var label = d.Name;
-
-            if (d.AppName) {
-                label += ' - ' + d.AppName;
-            }
-
-            deviceHtml += '<paper-checkbox class="chkDevice" data-id="' + d.Id + '"' + checkedHtml + '>' + label + '</paper-checkbox>';
-
-            index++;
-
-            return deviceHtml;
-
-        }).join('');
-
-        html += '</div>';
-
-        html += '<div class="fieldDescription">';
-        html += Globalize.translate('LabelEnableCameraUploadForHelp');
-        html += '</div>';
-
-        $('.devicesList', page).html(html).trigger('create');
     }
 
     function loadData(page) {
 
         Dashboard.showLoadingMsg();
 
-        var promise1 = ApiClient.getNamedConfiguration("devices");
-        var promise2 = ApiClient.getJSON(ApiClient.getUrl('Devices', {
-
-            SupportsContentUploading: true
-
-        }));
-
-        Promise.all([promise1, promise2]).then(function (responses) {
-
-
-            load(page, responses[1].Items, responses[0]);
+        ApiClient.getNamedConfiguration("devices").then(function (config) {
+            load(page, config);
 
             Dashboard.hideLoadingMsg();
         });
@@ -84,16 +24,6 @@
 
             config.CameraUploadPath = $('#txtUploadPath', page).val();
 
-            config.EnabledCameraUploadDevices = $('.chkDevice', page).get().filter(function (c) {
-
-                return c.checked;
-
-            }).map(function (c) {
-
-                return c.getAttribute('data-id');
-
-            });
-
             config.EnableCameraUploadSubfolders = $('#chkSubfolder', page).checked();
 
             ApiClient.updateNamedConfiguration("devices", config).then(Dashboard.processServerConfigurationUpdateResult);
diff --git a/dashboard-ui/scripts/mypreferenceshome.js b/dashboard-ui/scripts/mypreferenceshome.js
index 7d21deb8e1..f9a6127bea 100644
--- a/dashboard-ui/scripts/mypreferenceshome.js
+++ b/dashboard-ui/scripts/mypreferenceshome.js
@@ -27,37 +27,6 @@
         $('.folderGroupList', page).html(folderHtml);
     }
 
-    function renderViewStyles(page, user, result) {
-
-        var folderHtml = '';
-
-        folderHtml += '<div class="paperCheckboxList">';
-        folderHtml += result.map(function (i) {
-
-            var currentHtml = '';
-
-            var id = 'chkPlainFolder' + i.Id;
-
-            var isChecked = user.Configuration.PlainFolderViews.indexOf(i.Id) == -1;
-            var checkedHtml = isChecked ? ' checked="checked"' : '';
-
-            currentHtml += '<paper-checkbox class="chkPlainFolder" data-folderid="' + i.Id + '" id="' + id + '"' + checkedHtml + '>' + i.Name + '</paper-checkbox>';
-
-            return currentHtml;
-
-        }).join('');
-
-        folderHtml += '</div>';
-
-        $('.viewStylesList', page).html(folderHtml);
-
-        if (result.length) {
-            $('.viewStylesSection', page).show();
-        } else {
-            $('.viewStylesSection', page).hide();
-        }
-    }
-
     function renderLatestItems(page, user, result) {
 
         var folderHtml = '';
@@ -140,15 +109,13 @@
             sortBy: "SortName"
         });
         var promise2 = ApiClient.getUserViews({}, user.Id);
-        var promise3 = ApiClient.getJSON(ApiClient.getUrl("Users/" + user.Id + "/SpecialViewOptions"));
-        var promise4 = ApiClient.getJSON(ApiClient.getUrl("Users/" + user.Id + "/GroupingOptions"));
+        var promise3 = ApiClient.getJSON(ApiClient.getUrl("Users/" + user.Id + "/GroupingOptions"));
 
-        Promise.all([promise1, promise2, promise3, promise4]).then(function (responses) {
+        Promise.all([promise1, promise2, promise3]).then(function (responses) {
 
-            renderViews(page, user, responses[3]);
+            renderViews(page, user, responses[2]);
             renderLatestItems(page, user, responses[0]);
             renderViewOrder(page, user, responses[1]);
-            renderViewStyles(page, user, responses[2]);
 
             Dashboard.hideLoadingMsg();
         });
@@ -188,15 +155,6 @@
             return i.getAttribute('data-folderid');
         });
 
-        user.Configuration.PlainFolderViews = $(".chkPlainFolder", page).get().filter(function (i) {
-
-            return !i.checked;
-
-        }).map(function (i) {
-
-            return i.getAttribute('data-folderid');
-        });
-
         user.Configuration.OrderedViews = $(".viewItem", page).get().map(function (i) {
 
             return i.getAttribute('data-viewid');
diff --git a/dashboard-ui/scripts/site.js b/dashboard-ui/scripts/site.js
index 8f924b079d..0f082486b7 100644
--- a/dashboard-ui/scripts/site.js
+++ b/dashboard-ui/scripts/site.js
@@ -1588,7 +1588,7 @@ var AppInfo = {};
     }
 
     //localStorage.clear();
-    function createConnectionManager(credentialProviderFactory, capabilities) {
+    function createConnectionManager() {
 
         return getSyncProfile().then(function (deviceProfile) {