diff --git a/dashboard-ui/css/site.css b/dashboard-ui/css/site.css
index fb76daa206..61084ca2e9 100644
--- a/dashboard-ui/css/site.css
+++ b/dashboard-ui/css/site.css
@@ -775,7 +775,7 @@ paper-input + .fieldDescription {
 }
 
 .withTabs .content-primary {
-    padding-top: 110px;
+    padding-top: 115px;
 }
 
 .mainDrawerPanel:not([narrow]) .content-primary {
diff --git a/dashboard-ui/dashboardhosting.html b/dashboard-ui/dashboardhosting.html
index 731692fd95..0cc32dd957 100644
--- a/dashboard-ui/dashboardhosting.html
+++ b/dashboard-ui/dashboardhosting.html
@@ -1,4 +1,4 @@
-<div id="dashboardHostingPage" data-role="page" class="page type-interior advancedConfigurationPage" data-helpurl="https://github.com/MediaBrowser/Wiki/wiki/Hosting%20Settings" data-require="scripts/dashboardhosting,paper-checkbox,paper-input">
+<div id="dashboardHostingPage" data-role="page" class="page type-interior advancedConfigurationPage withTabs" data-helpurl="https://github.com/MediaBrowser/Wiki/wiki/Hosting%20Settings" data-require="scripts/dashboardhosting,paper-checkbox,paper-input">
 
     <div data-role="content">
         <div class="content-primary">
diff --git a/dashboard-ui/device.html b/dashboard-ui/device.html
index d5d60b9d38..f9cfdb8d07 100644
--- a/dashboard-ui/device.html
+++ b/dashboard-ui/device.html
@@ -3,11 +3,6 @@
     <div data-role="content">
         <div class="content-primary">
 
-            <div data-role="controlgroup" data-type="horizontal" class="localnav" data-mini="true">
-                <a href="devices.html" data-role="button" class="ui-btn-active">${TabDevices}</a>
-                <a href="devicesupload.html" data-role="button">${TabCameraUpload}</a>
-            </div>
-
             <div class="readOnlyContent">
 
                 <form class="deviceForm">
diff --git a/dashboard-ui/playbackconfiguration.html b/dashboard-ui/playbackconfiguration.html
index 1ecd9a706e..a9c5f7964e 100644
--- a/dashboard-ui/playbackconfiguration.html
+++ b/dashboard-ui/playbackconfiguration.html
@@ -4,7 +4,6 @@
         <div class="content-primary">
 
             <form class="playbackConfigurationForm">
-                <h2>${HeaderResumeSettings}</h2>
                 <div>
                     <ul data-role="listview" class="ulForm">
                         <li>
diff --git a/dashboard-ui/scripts/dashboardhosting.js b/dashboard-ui/scripts/dashboardhosting.js
index d5eb583454..0c444e2145 100644
--- a/dashboard-ui/scripts/dashboardhosting.js
+++ b/dashboard-ui/scripts/dashboardhosting.js
@@ -40,8 +40,21 @@
         return false;
     }
 
+    function getTabs() {
+        return [
+        {
+            href: 'dashboardhosting.html',
+            name: Globalize.translate('TabHosting')
+        },
+         {
+             href: 'serversecurity.html',
+             name: Globalize.translate('TabSecurity')
+         }];
+    }
+
     $(document).on('pageshow', "#dashboardHostingPage", function () {
 
+        LibraryMenu.setTabs('adminadvanced', 0, getTabs);
         Dashboard.showLoadingMsg();
 
         var page = this;
diff --git a/dashboard-ui/scripts/itemdetailpage.js b/dashboard-ui/scripts/itemdetailpage.js
index 8294b781b0..403397350a 100644
--- a/dashboard-ui/scripts/itemdetailpage.js
+++ b/dashboard-ui/scripts/itemdetailpage.js
@@ -715,7 +715,7 @@
         var options = {
             userId: Dashboard.getCurrentUserId(),
             limit: screenWidth > 800 && shape == "detailPagePortrait" ? 4 : 4,
-            fields: "PrimaryImageAspectRatio,UserData,SyncInfo"
+            fields: "PrimaryImageAspectRatio,UserData,SyncInfo,CanDelete"
         };
 
         if (screenWidth >= 800 && screenHeight >= 1000) {
@@ -866,7 +866,7 @@
 
         _childrenItemsFunction = null;
 
-        var fields = "ItemCounts,AudioInfo,PrimaryImageAspectRatio,SyncInfo";
+        var fields = "ItemCounts,AudioInfo,PrimaryImageAspectRatio,SyncInfo,CanDelete";
 
         var query = {
             ParentId: item.Id,
@@ -901,7 +901,8 @@
             _childrenItemsFunction = getEpisodesFunction(item.SeriesId, {
 
                 seasonId: item.Id,
-                userId: user.Id
+                userId: user.Id,
+                Fields: fields
             });
         }
         else if (item.Type == "MusicAlbum") {
@@ -945,6 +946,7 @@
                 });
             }
             else if (item.Type == "Season") {
+
                 html = LibraryBrowser.getPosterViewHtml({
                     items: result.Items,
                     shape: "detailPage169",
@@ -1318,7 +1320,7 @@
             SortOrder: "Ascending",
             IncludeItemTypes: "MusicVideo",
             Recursive: true,
-            Fields: "DateCreated,SyncInfo",
+            Fields: "DateCreated,SyncInfo,CanDelete",
             Albums: item.Name
 
         }).then(function (result) {
diff --git a/dashboard-ui/scripts/serversecurity.js b/dashboard-ui/scripts/serversecurity.js
index 44eee3fc04..0c966d6d59 100644
--- a/dashboard-ui/scripts/serversecurity.js
+++ b/dashboard-ui/scripts/serversecurity.js
@@ -123,6 +123,18 @@
         });
     }
 
+    function getTabs() {
+        return [
+        {
+            href: 'dashboardhosting.html',
+            name: Globalize.translate('TabHosting')
+        },
+         {
+             href: 'serversecurity.html',
+             name: Globalize.translate('TabSecurity')
+         }];
+    }
+
     pageIdOn('pageinit', "serverSecurityPage", function () {
 
         var page = this;
@@ -136,6 +148,7 @@
     });
     pageIdOn('pagebeforeshow', "serverSecurityPage", function () {
 
+        LibraryMenu.setTabs('adminadvanced', 1, getTabs);
         var page = this;
 
         loadData(page);
diff --git a/dashboard-ui/scripts/site.js b/dashboard-ui/scripts/site.js
index 9c9b3fba75..02506d9291 100644
--- a/dashboard-ui/scripts/site.js
+++ b/dashboard-ui/scripts/site.js
@@ -732,7 +732,7 @@ var Dashboard = {
         }, {
             name: Globalize.translate('TabDevices'),
             href: "devices.html",
-            pageIds: ['devicesPage'],
+            pageIds: ['devicesPage', 'devicePage'],
             icon: 'tablet'
         }, {
             name: Globalize.translate('TabUsers'),
diff --git a/dashboard-ui/serversecurity.html b/dashboard-ui/serversecurity.html
index 746d5f5663..d1e4dc16ba 100644
--- a/dashboard-ui/serversecurity.html
+++ b/dashboard-ui/serversecurity.html
@@ -1,4 +1,4 @@
-<div id="serverSecurityPage" data-role="page" class="page type-interior advancedConfigurationPage" data-require="jqmtable,scripts/serversecurity,detailtablecss">
+<div id="serverSecurityPage" data-role="page" class="page type-interior advancedConfigurationPage withTabs" data-require="jqmtable,scripts/serversecurity,detailtablecss">
     <div data-role="content">
         <div class="content-primary">
             <div class="detailSectionHeader">