diff --git a/UI/Calendar/CalendarLayoutTemplate.html b/UI/Calendar/CalendarLayoutTemplate.html
index cf5e9a475..df1db87d6 100644
--- a/UI/Calendar/CalendarLayoutTemplate.html
+++ b/UI/Calendar/CalendarLayoutTemplate.html
@@ -1,9 +1,9 @@
 <div class="row">
     <div class="span3">
         <h4>Upcoming</h4>
-        <div id="x-upcoming"></div>
+        <div id="x-upcoming"/>
     </div>
     <div class=span9>
-        <div id="x-calendar" class="calendar"></div>
+        <div id="x-calendar" class="calendar"/>
     </div>
-</div>
\ No newline at end of file
+</div>
diff --git a/UI/Form/CheckboxTemplate.html b/UI/Form/CheckboxTemplate.html
index 90fccacc5..477f1e0d4 100644
--- a/UI/Form/CheckboxTemplate.html
+++ b/UI/Form/CheckboxTemplate.html
@@ -9,7 +9,7 @@
                 <span>No</span>
             </p>
 
-            <div class="btn btn-primary slide-button"></div>
+            <div class="btn btn-primary slide-button"/>
         </label>
 
         {{#if helpext}}
diff --git a/UI/History/HistoryLayoutTemplate.html b/UI/History/HistoryLayoutTemplate.html
index edf286c9a..ae43e6692 100644
--- a/UI/History/HistoryLayoutTemplate.html
+++ b/UI/History/HistoryLayoutTemplate.html
@@ -1,11 +1,11 @@
-<div id="x-toolbar"></div>
+<div id="x-toolbar"/>
 <div class="row">
     <div class="span12">
-        <div id="x-history"></div>
+        <div id="x-history"/>
     </div>
 </div>
 <div class="row">
     <div class="span12">
-        <div id="x-pager"></div>
+        <div id="x-pager"/>
     </div>
-</div>
\ No newline at end of file
+</div>
diff --git a/UI/Logs/LayoutTemplate.html b/UI/Logs/LayoutTemplate.html
index d8a74911a..43529ab0f 100644
--- a/UI/Logs/LayoutTemplate.html
+++ b/UI/Logs/LayoutTemplate.html
@@ -1,11 +1,11 @@
-<div id="x-toolbar"></div>
+<div id="x-toolbar"/>
 <div class="row">
     <div class="span12">
-        <div id="x-grid"></div>
+        <div id="x-grid"/>
     </div>
 </div>
 <div class="row">
     <div class="span12">
-        <div id="x-pager"></div>
+        <div id="x-pager"/>
     </div>
 </div>
diff --git a/UI/Missing/MissingLayoutTemplate.html b/UI/Missing/MissingLayoutTemplate.html
index 88040b869..958d5aa5e 100644
--- a/UI/Missing/MissingLayoutTemplate.html
+++ b/UI/Missing/MissingLayoutTemplate.html
@@ -1,11 +1,11 @@
-<div id="x-toolbar"></div>
+<div id="x-toolbar"/>
 <div class="row">
     <div class="span12">
-        <div id="x-missing"></div>
+        <div id="x-missing"/>
     </div>
 </div>
 <div class="row">
     <div class="span12">
-        <div id="x-pager"></div>
+        <div id="x-pager"/>
     </div>
-</div>
\ No newline at end of file
+</div>
diff --git a/UI/Release/LayoutTemplate.html b/UI/Release/LayoutTemplate.html
index 3420ec2ad..4da95b683 100644
--- a/UI/Release/LayoutTemplate.html
+++ b/UI/Release/LayoutTemplate.html
@@ -1,7 +1,7 @@
-<div id="x-toolbar"></div>
+<div id="x-toolbar"/>
 <div class="row">
     <div class="span12">
-        <div id="x-grid"></div>
+        <div id="x-grid"/>
     </div>
 </div>
 
diff --git a/UI/Series/Details/SeriesDetailsTemplate.html b/UI/Series/Details/SeriesDetailsTemplate.html
index 08079fdc8..dd933f674 100644
--- a/UI/Series/Details/SeriesDetailsTemplate.html
+++ b/UI/Series/Details/SeriesDetailsTemplate.html
@@ -20,4 +20,4 @@
         </div>
     </div>
 </div>
-<div id="seasons"></div>
+<div id="seasons"/>
diff --git a/UI/Series/Edit/EditSeriesTemplate.html b/UI/Series/Edit/EditSeriesTemplate.html
index 5903dd35e..84781c02e 100644
--- a/UI/Series/Edit/EditSeriesTemplate.html
+++ b/UI/Series/Edit/EditSeriesTemplate.html
@@ -16,7 +16,7 @@
                         <span>No</span>
                     </p>
 
-                    <div class="btn btn-primary slide-button"></div>
+                    <div class="btn btn-primary slide-button"/>
                 </label>
 
                 <span class="help-inline-checkbox">
@@ -36,7 +36,7 @@
                         <span>No</span>
                     </p>
 
-                    <div class="btn btn-primary slide-button"></div>
+                    <div class="btn btn-primary slide-button"/>
                 </label>
 
                 <span class="help-inline-checkbox">
diff --git a/UI/Series/Index/List/CollectionTemplate.html b/UI/Series/Index/List/CollectionTemplate.html
index 5ede6dd49..3c7a8f8d1 100644
--- a/UI/Series/Index/List/CollectionTemplate.html
+++ b/UI/Series/Index/List/CollectionTemplate.html
@@ -1,5 +1,5 @@
 <div class="row">
     <div class="span12">
-        <div id="x-series-list"></div>
+        <div id="x-series-list"/>
     </div>
-</div>
\ No newline at end of file
+</div>
diff --git a/UI/Settings/General/GeneralTemplate.html b/UI/Settings/General/GeneralTemplate.html
index ea5285ad5..315e458f7 100644
--- a/UI/Settings/General/GeneralTemplate.html
+++ b/UI/Settings/General/GeneralTemplate.html
@@ -26,7 +26,7 @@
                         <span>No</span>
                     </p>
 
-                    <div class="btn btn-primary slide-button"></div>
+                    <div class="btn btn-primary slide-button"/>
                 </label>
 
             <span class="help-inline-checkbox">
diff --git a/UI/Settings/Indexers/EditTemplate.html b/UI/Settings/Indexers/EditTemplate.html
index 2930bf730..e14d1b63d 100644
--- a/UI/Settings/Indexers/EditTemplate.html
+++ b/UI/Settings/Indexers/EditTemplate.html
@@ -27,7 +27,7 @@
                         <span>No</span>
                     </p>
 
-                    <div class="btn btn-primary slide-button"></div>
+                    <div class="btn btn-primary slide-button"/>
                 </label>
             </div>
         </div>
@@ -41,4 +41,4 @@
     {{/if}}
     <button class="btn" data-dismiss="modal">cancel</button>
     <button class="btn btn-primary x-save">save</button>
-</div>
\ No newline at end of file
+</div>
diff --git a/UI/Settings/Indexers/ItemTemplate.html b/UI/Settings/Indexers/ItemTemplate.html
index 1dd58a51c..bfd26351b 100644
--- a/UI/Settings/Indexers/ItemTemplate.html
+++ b/UI/Settings/Indexers/ItemTemplate.html
@@ -12,10 +12,10 @@
                     <span>No</span>
                 </p>
 
-                <div class="btn btn-primary slide-button"></div>
+                <div class="btn btn-primary slide-button"/>
             </label>
         </div>
     </div>
 
     {{formBuilder}}
-</div>
\ No newline at end of file
+</div>
diff --git a/UI/Settings/Misc/MiscTemplate.html b/UI/Settings/Misc/MiscTemplate.html
index 7de970152..7f071b3f3 100644
--- a/UI/Settings/Misc/MiscTemplate.html
+++ b/UI/Settings/Misc/MiscTemplate.html
@@ -12,7 +12,7 @@
                     <span>No</span>
                 </p>
 
-                <div class="btn btn-primary slide-button"></div>
+                <div class="btn btn-primary slide-button"/>
             </label>
 
             <span class="help-inline-checkbox">
@@ -34,7 +34,7 @@
                     <span>No</span>
                 </p>
 
-                <div class="btn btn-primary slide-button"></div>
+                <div class="btn btn-primary slide-button"/>
             </label>
 
             <span class="help-inline-checkbox">
diff --git a/UI/Settings/Naming/NamingTemplate.html b/UI/Settings/Naming/NamingTemplate.html
index 5fdc366f6..f00632a67 100644
--- a/UI/Settings/Naming/NamingTemplate.html
+++ b/UI/Settings/Naming/NamingTemplate.html
@@ -14,7 +14,7 @@
                         <span>No</span>
                     </p>
 
-                    <div class="btn btn-primary slide-button"></div>
+                    <div class="btn btn-primary slide-button"/>
                 </label>
 
             <span class="help-inline-checkbox">
@@ -35,7 +35,7 @@
                         <span>No</span>
                     </p>
 
-                    <div class="btn btn-primary slide-button"></div>
+                    <div class="btn btn-primary slide-button"/>
                 </label>
 
             <span class="help-inline-checkbox">
@@ -56,7 +56,7 @@
                         <span>No</span>
                     </p>
 
-                    <div class="btn btn-primary slide-button"></div>
+                    <div class="btn btn-primary slide-button"/>
                 </label>
 
             <span class="help-inline-checkbox">
@@ -77,7 +77,7 @@
                         <span>No</span>
                     </p>
 
-                    <div class="btn btn-primary slide-button"></div>
+                    <div class="btn btn-primary slide-button"/>
                 </label>
 
             <span class="help-inline-checkbox">
@@ -98,7 +98,7 @@
                         <span>No</span>
                     </p>
 
-                    <div class="btn btn-primary slide-button"></div>
+                    <div class="btn btn-primary slide-button"/>
                 </label>
 
             <span class="help-inline-checkbox">
diff --git a/UI/Settings/Notifications/EditTemplate.html b/UI/Settings/Notifications/EditTemplate.html
index f8992d075..859d4825f 100644
--- a/UI/Settings/Notifications/EditTemplate.html
+++ b/UI/Settings/Notifications/EditTemplate.html
@@ -27,7 +27,7 @@
                         <span>No</span>
                     </p>
 
-                    <div class="btn btn-primary slide-button"></div>
+                    <div class="btn btn-primary slide-button"/>
                 </label>
 
             <span class="help-inline-checkbox">
@@ -47,7 +47,7 @@
                         <span>No</span>
                     </p>
 
-                    <div class="btn btn-primary slide-button"></div>
+                    <div class="btn btn-primary slide-button"/>
                 </label>
 
             <span class="help-inline-checkbox">
diff --git a/UI/Settings/Quality/QualityLayoutTemplate.html b/UI/Settings/Quality/QualityLayoutTemplate.html
index 2c7e04bf8..20ba05036 100644
--- a/UI/Settings/Quality/QualityLayoutTemplate.html
+++ b/UI/Settings/Quality/QualityLayoutTemplate.html
@@ -1,9 +1,9 @@
 <div class="row">
-    <div class="span12" id="quality-standard"></div>
+    <div class="span12" id="quality-standard"/>
 </div>
 <div class="row">
-    <div class="span12" id="quality-profile"></div>
+    <div class="span12" id="quality-profile"/>
 </div>
 <div class="row">
-    <div class="span12" id="quality-size"></div>
-</div>
\ No newline at end of file
+    <div class="span12" id="quality-size"/>
+</div>
diff --git a/UI/Settings/Quality/Size/QualitySizeCollectionTemplate.html b/UI/Settings/Quality/Size/QualitySizeCollectionTemplate.html
index 5475511db..02cc27c9a 100644
--- a/UI/Settings/Quality/Size/QualitySizeCollectionTemplate.html
+++ b/UI/Settings/Quality/Size/QualitySizeCollectionTemplate.html
@@ -1,4 +1,4 @@
 <fieldset>
     <legend>Quality Size Limits</legend>
-    <div id="quality-sizes-container"></div>
-</fieldset>
\ No newline at end of file
+    <div id="quality-sizes-container"/>
+</fieldset>