diff --git a/UI/Settings/Indexers/Layout.js b/UI/Settings/Indexers/IndexerLayout.js
similarity index 86%
rename from UI/Settings/Indexers/Layout.js
rename to UI/Settings/Indexers/IndexerLayout.js
index 6cbcd5352..a5b200ed2 100644
--- a/UI/Settings/Indexers/Layout.js
+++ b/UI/Settings/Indexers/IndexerLayout.js
@@ -4,10 +4,10 @@ define(
     [
         'marionette',
         'Settings/Indexers/CollectionView',
-        'Settings/Indexers/Options/View'
+        'Settings/Indexers/Options/IndexerOptionsView'
     ], function (Marionette, CollectionView, OptionsView) {
         return Marionette.Layout.extend({
-            template: 'Settings/Indexers/LayoutTemplate',
+            template: 'Settings/Indexers/IndexerLayoutTemplate',
 
             regions: {
                 indexersRegion : '#indexers-collection',
diff --git a/UI/Settings/Indexers/LayoutTemplate.html b/UI/Settings/Indexers/IndexerLayoutTemplate.html
similarity index 100%
rename from UI/Settings/Indexers/LayoutTemplate.html
rename to UI/Settings/Indexers/IndexerLayoutTemplate.html
diff --git a/UI/Settings/MediaManagement/FileManagement/View.js b/UI/Settings/Indexers/Options/IndexerOptionsView.js
similarity index 80%
rename from UI/Settings/MediaManagement/FileManagement/View.js
rename to UI/Settings/Indexers/Options/IndexerOptionsView.js
index 7c4a89638..2fa8f3a59 100644
--- a/UI/Settings/MediaManagement/FileManagement/View.js
+++ b/UI/Settings/Indexers/Options/IndexerOptionsView.js
@@ -6,7 +6,7 @@ define(
     ], function (Marionette, AsModelBoundView) {
 
         var view = Marionette.ItemView.extend({
-            template: 'Settings/MediaManagement/FileManagement/ViewTemplate'
+            template: 'Settings/Indexers/Options/IndexerOptionsViewTemplate'
         });
 
         return AsModelBoundView.call(view);
diff --git a/UI/Settings/Indexers/Options/ViewTemplate.html b/UI/Settings/Indexers/Options/IndexerOptionsViewTemplate.html
similarity index 92%
rename from UI/Settings/Indexers/Options/ViewTemplate.html
rename to UI/Settings/Indexers/Options/IndexerOptionsViewTemplate.html
index 1830fd4b2..616a66f76 100644
--- a/UI/Settings/Indexers/Options/ViewTemplate.html
+++ b/UI/Settings/Indexers/Options/IndexerOptionsViewTemplate.html
@@ -9,7 +9,7 @@
         </div>
     </div>
 
-    <div class="control-group">
+    <div class="control-group advanced-setting">
         <label class="control-label">RSS Sync Interval</label>
 
         <div class="controls">
@@ -21,7 +21,7 @@
         </div>
     </div>
 
-    <div class="control-group">
+    <div class="control-group advanced-setting">
         <label class="control-label">Release Restrictions</label>
 
         <div class="controls">
diff --git a/UI/Settings/Indexers/Options/View.js b/UI/Settings/MediaManagement/FileManagement/FileManagementView.js
similarity index 73%
rename from UI/Settings/Indexers/Options/View.js
rename to UI/Settings/MediaManagement/FileManagement/FileManagementView.js
index ff1b67f51..314a7b79e 100644
--- a/UI/Settings/Indexers/Options/View.js
+++ b/UI/Settings/MediaManagement/FileManagement/FileManagementView.js
@@ -6,7 +6,7 @@ define(
     ], function (Marionette, AsModelBoundView) {
 
         var view = Marionette.ItemView.extend({
-            template: 'Settings/Indexers/Options/ViewTemplate'
+            template: 'Settings/MediaManagement/FileManagement/FileManagementViewTemplate'
         });
 
         return AsModelBoundView.call(view);
diff --git a/UI/Settings/MediaManagement/FileManagement/ViewTemplate.html b/UI/Settings/MediaManagement/FileManagement/FileManagementViewTemplate.html
similarity index 97%
rename from UI/Settings/MediaManagement/FileManagement/ViewTemplate.html
rename to UI/Settings/MediaManagement/FileManagement/FileManagementViewTemplate.html
index 5f5b5c052..95b53a1a2 100644
--- a/UI/Settings/MediaManagement/FileManagement/ViewTemplate.html
+++ b/UI/Settings/MediaManagement/FileManagement/FileManagementViewTemplate.html
@@ -1,4 +1,4 @@
-<fieldset>
+<fieldset class="advanced-setting">
     <legend>File Management</legend>
 
     <div class="control-group">
diff --git a/UI/Settings/MediaManagement/Layout.js b/UI/Settings/MediaManagement/MediaManagementLayout.js
similarity index 86%
rename from UI/Settings/MediaManagement/Layout.js
rename to UI/Settings/MediaManagement/MediaManagementLayout.js
index 7b7a4e42c..47d670a40 100644
--- a/UI/Settings/MediaManagement/Layout.js
+++ b/UI/Settings/MediaManagement/MediaManagementLayout.js
@@ -5,10 +5,10 @@ define(
         'marionette',
         'Settings/MediaManagement/Naming/View',
         'Settings/MediaManagement/Sorting/View',
-        'Settings/MediaManagement/FileManagement/View'
+        'Settings/MediaManagement/FileManagement/FileManagementView'
     ], function (Marionette, NamingView, SortingView, FileManagementView) {
         return Marionette.Layout.extend({
-            template: 'Settings/MediaManagement/LayoutTemplate',
+            template: 'Settings/MediaManagement/MediaManagementLayoutTemplate',
 
             regions: {
                 episodeNaming  : '#episode-naming',
diff --git a/UI/Settings/MediaManagement/LayoutTemplate.html b/UI/Settings/MediaManagement/MediaManagementLayoutTemplate.html
similarity index 100%
rename from UI/Settings/MediaManagement/LayoutTemplate.html
rename to UI/Settings/MediaManagement/MediaManagementLayoutTemplate.html
diff --git a/UI/Settings/SettingsLayout.js b/UI/Settings/SettingsLayout.js
index dd90b9a38..cad4cfaa9 100644
--- a/UI/Settings/SettingsLayout.js
+++ b/UI/Settings/SettingsLayout.js
@@ -6,9 +6,9 @@ define(
         'Settings/SettingsModel',
         'Settings/General/GeneralSettingsModel',
         'Settings/MediaManagement/Naming/Model',
-        'Settings/MediaManagement/Layout',
+        'Settings/MediaManagement/MediaManagementLayout',
         'Settings/Quality/QualityLayout',
-        'Settings/Indexers/Layout',
+        'Settings/Indexers/IndexerLayout',
         'Settings/Indexers/Collection',
         'Settings/DownloadClient/Layout',
         'Settings/Notifications/CollectionView',