diff --git a/public/templates/bootstrap/account/workers/default.tpl b/public/templates/bootstrap/account/workers/default.tpl
index 75e56914..9444a94d 100755
--- a/public/templates/bootstrap/account/workers/default.tpl
+++ b/public/templates/bootstrap/account/workers/default.tpl
@@ -56,7 +56,7 @@
                <tr>
                  <td>
                   <div class="input-group">
-                    <span{if $WORKERS[worker].hashrate > 0} style="color: orange"{/if} class="input-group-addon">{$username.0|escape}.</span>
+                    <span {if $WORKERS[worker].hashrate > 0}style="color: orange"{/if} class="input-group-addon">{$username.0|escape}.</span>
                     <input type="text" name="data[{$WORKERS[worker].id}][username]" value="{$username.1|escape}" size="10" required class="form-control" />
                   </div>
                  </td>
@@ -66,9 +66,7 @@
                  <td>
                    <input type="hidden" name="data[{$WORKERS[worker].id}][monitor]" value="0" />
                    <input type="checkbox" data-size="small"  name="data[{$WORKERS[worker].id}][monitor]" id="data[{$WORKERS[worker].id}][monitor]" value="1" {if $WORKERS[worker].monitor}checked{/if}/>
-                   <script>
-                   $("[id='data[{$WORKERS[worker].id}][monitor]']").bootstrapSwitch();
-                   </script>
+                   
                  </td>
                  {/if}
                  <td class="text-right">{$WORKERS[worker].hashrate|number_format}</td>
@@ -78,8 +76,17 @@
                {/section}
                {/nocache}
              </tbody>
-          </table>
+            </table>
           </div>
           <div class="panel-footer">
             <input type="submit" class="btn btn-success" value="Update Workers">
-          </div>
\ No newline at end of file
+          </div>
+        </div>
+      </form>
+    </div>
+  </div>
+</div>
+
+<script>
+  $("[id='data[{$WORKERS[worker].id}][monitor]']").bootstrapSwitch();
+</script>
\ No newline at end of file
diff --git a/public/templates/bootstrap/master.tpl b/public/templates/bootstrap/master.tpl
old mode 100644
new mode 100755
index b285f826..e872d97c
--- a/public/templates/bootstrap/master.tpl
+++ b/public/templates/bootstrap/master.tpl
@@ -5,12 +5,10 @@
   <meta name="viewport" content="width=device-width, initial-scale=1.0">
   <title>{$GLOBAL.website.title} I {$smarty.request.page|escape|default:"home"|capitalize}</title>
 	
-<<<<<<< Updated upstream
   <!--[if lt IE 9]>
   <link rel="stylesheet" href="{$PATH}/css/ie.css" type="text/css" media="screen" />
   <script src="http://html5shim.googlecode.com/svn/trunk/html5.js"></script>
   <![endif]-->
-=======
 	<!--[if lt IE 9]>
 	<link rel="stylesheet" href="{$PATH}/css/ie.css" type="text/css" media="screen" />
 	<script src="http://html5shim.googlecode.com/svn/trunk/html5.js"></script>
@@ -38,7 +36,6 @@
     <link href="{$PATH}/css/plugins/morris/morris-0.4.3.min.css" rel="stylesheet">
     <link href="{$PATH}/css/plugins/timeline/timeline.css" rel="stylesheet">
     <link href="{$PATH}/css/mpos.css" rel="stylesheet">
->>>>>>> Stashed changes
 
   <!--[if IE]><script type="text/javascript" src="{$PATH}/js/excanvas.js"></script><![endif]-->
   {if $GLOBAL.statistics.analytics.enabled}
@@ -94,25 +91,16 @@
       </div>
     </div>
 
-<<<<<<< Updated upstream
     <div id="footer">
       {include file="global/footer.tpl"}
     </div>
-=======
+
     <script src="{$PATH}/js/jquery-1.10.2.js"></script>
     <script src="{$PATH}/js/bootstrap.min.js"></script>
     <script src="{$PATH}/js/plugins/metisMenu/jquery.metisMenu.js"></script>
-    
-    <!-- Page-Level Plugin Scripts - Morris -->
     <script src="{$PATH}/js/plugins/morris/raphael-2.1.0.min.js"></script>
     <script src="{$PATH}/js/plugins/morris/morris.js"></script>
-    
     <script src="{$PATH}/js/mpos.js"></script>
     <script type="text/javascript" src="{$PATH}/js/justgage.1.0.1.min.js"></script>
-
-    <!-- Page-Level Plugin Scripts - Flot -->
-    <!--[if lte IE 8]><script src="{$PATH}/js/excanvas.min.js"></script><![endif]-->
->>>>>>> Stashed changes
-
   </body>
 </html>