diff --git a/dashboard-ui/css/notifications.css b/dashboard-ui/css/notifications.css
index 1e1a6b9b31..d2c5e5415a 100644
--- a/dashboard-ui/css/notifications.css
+++ b/dashboard-ui/css/notifications.css
@@ -8,23 +8,27 @@
 }
 
 .btnNotificationsInner {
-    color: #aaa;
-    font-weight: 500;
+    color: #fff;
+    font-weight: 300;
     display: none;
+    position: relative;
+    top: -6px;
+    padding: 5px 10px;
+    border-radius: 1000px;
 }
 
 .levelNormal {
-    color: #4d90fe;
+    background-color: #4d90fe;
     display: block;
 }
 
 .levelWarning {
-    color: #FF7537;
+    background-color: #FF7537;
     display: block;
 }
 
 .levelError {
-    color: #d14836;
+    background-color: #d14836;
     display: block;
 }
 
diff --git a/dashboard-ui/scripts/sync.js b/dashboard-ui/scripts/sync.js
index 3018d62af4..e6d606196e 100644
--- a/dashboard-ui/scripts/sync.js
+++ b/dashboard-ui/scripts/sync.js
@@ -99,7 +99,9 @@
 
             html += targets.map(function (t) {
 
-                return '<option value="' + t.Id + '">' + t.Name + '</option>';
+                var isSelected = t.Id == AppInfo.deviceId;
+                var selectedHtml = isSelected ? ' selected="selected"' : '';
+                return '<option' + selectedHtml + ' value="' + t.Id + '">' + t.Name + '</option>';
 
             }).join('');
             html += '</select>';
@@ -134,15 +136,6 @@
         html += '</div>';
         html += '</div>';
 
-        if (dialogOptions.Options.indexOf('SyncNewContent') != -1) {
-            html += '<br/>';
-            html += '<div>';
-            html += '<label for="chkSyncNewContent">' + Globalize.translate('OptionAutomaticallySyncNewContent') + '</label>';
-            html += '<input type="checkbox" id="chkSyncNewContent" data-mini="true" checked="checked" />';
-            html += '<div class="fieldDescription">' + Globalize.translate('OptionAutomaticallySyncNewContentHelp') + '</div>';
-            html += '</div>';
-        }
-
         if (dialogOptions.Options.indexOf('UnwatchedOnly') != -1) {
             html += '<br/>';
             html += '<div>';
@@ -152,12 +145,31 @@
             html += '</div>';
         }
 
-        if (dialogOptions.Options.indexOf('ItemLimit') != -1) {
+        if (dialogOptions.Options.indexOf('SyncNewContent') != -1 ||
+            dialogOptions.Options.indexOf('ItemLimit') != -1) {
+
             html += '<br/>';
-            html += '<div>';
-            html += '<label for="txtItemLimit">' + Globalize.translate('LabelItemLimit') + '</label>';
-            html += '<input type="number" id="txtItemLimit" step="1" min="1" />';
-            html += '<div class="fieldDescription">' + Globalize.translate('LabelItemLimitHelp') + '</div>';
+            html += '<div data-role="collapsible" data-mini="true">';
+            html += '<h2>' + Globalize.translate('HeaderAdvanced') + '</h2>';
+            html += '<div style="padding:0 0 1em;">';
+            if (dialogOptions.Options.indexOf('SyncNewContent') != -1) {
+                html += '<br/>';
+                html += '<div>';
+                html += '<label for="chkSyncNewContent">' + Globalize.translate('OptionAutomaticallySyncNewContent') + '</label>';
+                html += '<input type="checkbox" id="chkSyncNewContent" data-mini="true" checked="checked" />';
+                html += '<div class="fieldDescription">' + Globalize.translate('OptionAutomaticallySyncNewContentHelp') + '</div>';
+                html += '</div>';
+            }
+
+            if (dialogOptions.Options.indexOf('ItemLimit') != -1) {
+                html += '<br/>';
+                html += '<div>';
+                html += '<label for="txtItemLimit">' + Globalize.translate('LabelItemLimit') + '</label>';
+                html += '<input type="number" id="txtItemLimit" step="1" min="1" />';
+                html += '<div class="fieldDescription">' + Globalize.translate('LabelItemLimitHelp') + '</div>';
+                html += '</div>';
+            }
+            html += '</div>';
             html += '</div>';
         }