diff --git a/public/templates/bootstrap/global/header.tpl b/public/templates/bootstrap/global/header.tpl
index 2e1cab0d..36d476be 100644
--- a/public/templates/bootstrap/global/header.tpl
+++ b/public/templates/bootstrap/global/header.tpl
@@ -19,7 +19,7 @@
                     <ul class="dropdown-menu dropdown-user">
                     	{if $smarty.session.AUTHENTICATED|default:"0" == 1}
                         <li><a href="{$smarty.server.SCRIPT_NAME}?page=account&action=edit"><i class="fa fa-gear fa-fw"></i> Settings</a>
-                        <li><a href="{$smarty.server.SCRIPT_NAME}?page=account&action=workers"><i class="fa fa-gear fa-fw"></i> Workers</a>
+                        <li><a href="{$smarty.server.SCRIPT_NAME}?page=account&action=workers"><i class="fa fa-desktop fa-fw"></i> Workers</a>
                         </li>
                         <li class="divider"></li>
                         <li><a href="{$smarty.server.SCRIPT_NAME}?page=logout"><i class="fa fa-sign-out fa-fw"></i> Logout</a>
diff --git a/public/templates/bootstrap/register/default.tpl b/public/templates/bootstrap/register/default.tpl
index 4a75a6d3..fcdf309c 100644
--- a/public/templates/bootstrap/register/default.tpl
+++ b/public/templates/bootstrap/register/default.tpl
@@ -33,11 +33,41 @@
           <div class="form-group">
             <label>PIN</label>
             <input type="password" class="form-control" name="pin" value="" size="4" maxlength="4"><font size="1"> (4 digit number. <b>Remember this pin!</b>)</font>
-          </fieldset>
+          </div>
           <div class="form-group">
-            <label>Terms and Conditions</label><a style="width:152px;" onclick="TINY.box.show({literal}{url:'?page=tacpop',height:500}{/literal})"><font size="1">Accept Terms and Conditions</font></a>
-            <input type="checkbox" value="1" name="tac" id="tac">
-            <label for="tac" style="margin:1px 0px 0px -20px"></label>
+
+            <div class="panel-body">
+              <!-- Button trigger modal -->
+              <div class="form-group">
+              <label>TERMS AND CONDITIONS</label>
+              <div class="checkbox">
+                <label>
+                  <input type="checkbox" value="1" name="tac" id="tac"><button type="button" class="btn btn-outline btn-link" data-toggle="modal" data-target="#TAC">Accept Terms and Conditions</button>
+                </label>
+              </div>
+              </div>
+              <!-- Modal -->
+              <div class="modal fade" id="TAC" tabindex="-1" role="dialog" aria-labelledby="TACLabel" aria-hidden="true">
+                <div class="modal-dialog modal-lg">
+                  <div class="modal-content">
+                    <div class="modal-header">
+                      <button type="button" class="close" data-dismiss="modal" aria-hidden="true">&times;</button>
+                      <h4 class="modal-title" id="TACLabel">Terms and Conditions</h4>
+                    </div>
+                    
+                    <div class="modal-body">
+                      {include file="tac/default.tpl"}
+                    </div>
+                    <div class="modal-footer">
+                      <button type="button" class="btn btn-default" data-dismiss="modal">Close</button>
+                    </div>
+                  </div>
+                <!-- /.modal-content -->
+                </div>
+              <!-- /.modal-dialog -->
+              </div>
+              <!-- /.modal -->
+            </div>
           </div>
           <center>{nocache}{$RECAPTCHA|default:"" nofilter}{/nocache}</center>
           <input type="submit" value="Register" class="btn btn-outline btn-success btn-lg btn-block">