diff --git a/UI/Series/Edit/EditSeriesTemplate.html b/UI/Series/Edit/EditSeriesTemplate.html
index 2b224b8fb..8b4c4858b 100644
--- a/UI/Series/Edit/EditSeriesTemplate.html
+++ b/UI/Series/Edit/EditSeriesTemplate.html
@@ -9,9 +9,16 @@
             <label class="control-label">Monitored</label>
 
             <div class="controls">
-                <div class="switch">
+                <label class="checkbox toggle well">
                     <input type="checkbox" name="monitored"/>
-                </div>
+                    <p>
+                        <span>Yes</span>
+                        <span>No</span>
+                    </p>
+
+                    <div class="btn btn-primary slide-button"></div>
+                </label>
+
                 <span class="help-inline-checkbox">
                     <i class="icon-question-sign" title="Should NzbDrone download episodes for this series?"></i>
                 </span>
@@ -22,9 +29,16 @@
             <label class="control-label">Use Season Folder</label>
 
             <div class="controls">
-                <div class="switch">
+                <label class="checkbox toggle well">
                     <input type="checkbox" name="seasonFolder"/>
-                </div>
+                    <p>
+                        <span>Yes</span>
+                        <span>No</span>
+                    </p>
+
+                    <div class="btn btn-primary slide-button"></div>
+                </label>
+
                 <span class="help-inline-checkbox">
                     <i class="icon-question-sign" title="Should downloaded episodes be stored in season folders?"></i>
                 </span>
diff --git a/UI/Settings/DownloadClient/DownloadClientTemplate.html b/UI/Settings/DownloadClient/DownloadClientTemplate.html
index 80da9b50a..b034f751f 100644
--- a/UI/Settings/DownloadClient/DownloadClientTemplate.html
+++ b/UI/Settings/DownloadClient/DownloadClientTemplate.html
@@ -31,9 +31,16 @@
         <label class="control-label">Use Scene Name</label>
 
         <div class="controls">
-            <div class="switch">
+            <label class="checkbox toggle well">
                 <input type="checkbox" name="downloadClientUseSceneName"/>
-            </div>
+                <p>
+                    <span>Yes</span>
+                    <span>No</span>
+                </p>
+
+                <div class="btn btn-primary slide-button"></div>
+            </label>
+
             <span class="help-inline-checkbox">
                 <i class="icon-question-sign" title="Use Scene name when adding NZB to queue?"></i>
             </span>
diff --git a/UI/Settings/Misc/MiscTemplate.html b/UI/Settings/Misc/MiscTemplate.html
index 4cb2fa557..d96e7cac0 100644
--- a/UI/Settings/Misc/MiscTemplate.html
+++ b/UI/Settings/Misc/MiscTemplate.html
@@ -5,9 +5,16 @@
         <label class="control-label">Backlog Searching</label>
 
         <div class="controls">
-            <div class="switch">
+            <label class="checkbox toggle well">
                 <input type="checkbox" name="enableBacklogSearching"/>
-            </div>
+                <p>
+                    <span>Yes</span>
+                    <span>No</span>
+                </p>
+
+                <div class="btn btn-primary slide-button"></div>
+            </label>
+
             <span class="help-inline-checkbox">
                 <i class="icon-question-sign" title="Should NzbDrone try to download missing episodes automatically?"></i>
                 <i class="icon-exclamation-sign danger" title="Enabling backlog searching can use a lot of bandwidth and is not
@@ -20,9 +27,16 @@
         <label class="control-label">Ignore Deleted Episodes</label>
 
         <div class="controls">
-            <div class="switch">
+            <label class="checkbox toggle well">
                 <input type="checkbox" name="autoIgnorePreviouslyDownloadedEpisodes"/>
-            </div>
+                <p>
+                    <span>Yes</span>
+                    <span>No</span>
+                </p>
+
+                <div class="btn btn-primary slide-button"></div>
+            </label>
+
             <span class="help-inline-checkbox">
                 <i class="icon-question-sign" title="Episodes deleted from disk are automatically ignored in NzbDrone"></i>
             </span>
diff --git a/UI/Settings/Naming/NamingView.js b/UI/Settings/Naming/NamingView.js
index c11516506..090f2be71 100644
--- a/UI/Settings/Naming/NamingView.js
+++ b/UI/Settings/Naming/NamingView.js
@@ -17,6 +17,7 @@ define(['app', 'Settings/Naming/NamingModel'], function () {
         },
 
         onRender: function () {
+            //TODO: Move this to a mixin
             this.ui.tooltip.tooltip({ placement: 'right' });
         },
 
diff --git a/UI/Settings/SettingsLayout.js b/UI/Settings/SettingsLayout.js
index 9430dc096..fcfca04f1 100644
--- a/UI/Settings/SettingsLayout.js
+++ b/UI/Settings/SettingsLayout.js
@@ -109,13 +109,16 @@ define([
 
             initialize: function (options) {
                 this.settings = options.settings;
+                this.namingSettings = new NzbDrone.Settings.Naming.NamingModel();
+                this.namingSettings.fetch();
+
                 if (options.action) {
                     this.action = options.action.toLowerCase();
                 }
             },
 
             onRender: function () {
-                this.naming.show(new NzbDrone.Settings.Naming.NamingView({model: this.settings}));
+                this.naming.show(new NzbDrone.Settings.Naming.NamingView());
                 this.quality.show(new NzbDrone.Settings.Quality.QualityLayout({settings: this.settings}));
                 this.indexers.show(new NzbDrone.Settings.Indexers.IndexersView({model: this.settings}));
                 this.downloadClient.show(new NzbDrone.Settings.DownloadClient.DownloadClientView({model: this.settings}));