diff --git a/public/templates/test/account/notifications/default.tpl b/public/templates/test/account/notifications/default.tpl
index 52140466..002394aa 100644
--- a/public/templates/test/account/notifications/default.tpl
+++ b/public/templates/test/account/notifications/default.tpl
@@ -1,84 +1,85 @@
-{include file="global/block_header.tpl" ALIGN="left" BLOCK_HEADER="Notification Settings"}
 <form action="{$smarty.server.PHP_SELF}" method="POST">
-<input type="hidden" name="page" value="{$smarty.request.page}">
-<input type="hidden" name="action" value="{$smarty.request.action}">
-<input type="hidden" name="do" value="save">
-<table width="100%">
-  <tr>
-    <th class="left">Type</th>
-    <th class="center">Active</th>
-  </tr>
-  <tr>
-    <td class="left">IDLE Worker</td>
-    <td class="center">
-      <input type="hidden" name="data[idle_worker]" value="0" />
-      <input type="checkbox" name="data[idle_worker]" id="data[idle_worker]" value="1"{nocache}{if $SETTINGS['idle_worker']}checked{/if}{/nocache} />
-      <label for="data[idle_worker]"></label>
-    </td>
-  </tr>
-  <tr>
-    <td class="left">New Blocks</td>
-    <td class="center">
-      <input type="hidden" name="data[new_block]" value="0" />
-      <input type="checkbox" name="data[new_block]" id="data[new_block]" value="1"{nocache}{if $SETTINGS['new_block']}checked{/if}{/nocache} />
-      <label for="data[new_block]"></label>
-    </td>
-  </tr>
-  <tr>
-    <td class="left">Auto Payout</td>
-    <td class="center">
-      <input type="hidden" name="data[auto_payout]" value="0" />
-      <input type="checkbox" name="data[auto_payout]" id="data[auto_payout]" value="1"{nocache}{if $SETTINGS['auto_payout']}checked{/if}{/nocache} />
-      <label for="data[auto_payout]"></label>
-    </td>
-  </tr>
-  <tr>
-    <td class="left">Manual Payout</td>
-    <td class="center">
-      <input type="hidden" name="data[manual_payout]" value="0" />
-      <input type="checkbox" name="data[manual_payout]" id="data[manual_payout]" value="1"{nocache}{if $SETTINGS['manual_payout']}checked{/if}{/nocache} />
-      <label for="data[manual_payout]"></label>
-    </td>
-  </tr>
-  <tr>
-    <td colspan="2" class="center">
-      <input type="submit" class="submit small" value="Update">
-    </td>
-  </tr>
-</table>
-</form>
-{include file="global/block_footer.tpl"}
-
-{include file="global/block_header.tpl" ALIGN="right" BLOCK_HEADER="Notification History"}
-  <center>
-    {include file="global/pagination.tpl"}
-    <table width="100%" class="pagesort">
-      <thead style="font-size:13px;">
-        <tr>
-          <th class="center" style="cursor: pointer;">ID</th>
-          <th class="center" style="cursor: pointer;">Time</th>
-          <th class="center" style="cursor: pointer;">Type</th>
-          <th class="center" style="cursor: pointer;">Active</th>
-        </tr>
-      </thead>
-      <tbody style="font-size:12px;">
-{section notification $NOTIFICATIONS}
-        <tr class="{cycle values="odd,even"}">
-          <td class="center">{$NOTIFICATIONS[notification].id}</td>
-          <td class="center">{$NOTIFICATIONS[notification].time}</td>
-          <td class="center">
-            {if $NOTIFICATIONS[notification].type == new_block}New Block
-            {else if $NOTIFICATIONS[notification].type == auto_payout}Auto Payout
-            {else if $NOTIFICATIONS[notification].type == idle_worker}IDLE Worker
-            {else if $NOTIFICATIONS[notification].type == manual_payout}Manual Payout
-            {/if}
-          </td>
-          <td class="center">
-            <img src="{$PATH}/images/{if $NOTIFICATIONS[notification].active}success{else}error{/if}.gif" />
-          </td>
-        </tr>
-{/section}
-      </tbody>
+  <input type="hidden" name="page" value="{$smarty.request.page}">
+  <input type="hidden" name="action" value="{$smarty.request.action}">
+  <input type="hidden" name="do" value="save">
+  <article class="module width_quarter">
+    <header><h3>Notification Settings</h3></header>
+    <div class="module_content">
+    <table width="100%">
+      <tr>
+        <th align="left">Type</th>
+        <th align="center">Active</th>
+      </tr>
+      <tr>
+        <td align="left">IDLE Worker</td>
+        <td align="center">
+          <input type="hidden" name="data[idle_worker]" value="0" />
+          <input type="checkbox" name="data[idle_worker]" id="data[idle_worker]" value="1"{nocache}{if $SETTINGS['idle_worker']}checked{/if}{/nocache} />
+          <label for="data[idle_worker]"></label>
+        </td>
+      </tr>
+      <tr>
+        <td align="left">New Blocks</td>
+        <td align="center">
+          <input type="hidden" name="data[new_block]" value="0" />
+          <input type="checkbox" name="data[new_block]" id="data[new_block]" value="1"{nocache}{if $SETTINGS['new_block']}checked{/if}{/nocache} />
+          <label for="data[new_block]"></label>
+        </td>
+      </tr>
+      <tr>
+        <td align="left">Auto Payout</td>
+        <td align="center">
+          <input type="hidden" name="data[auto_payout]" value="0" />
+          <input type="checkbox" name="data[auto_payout]" id="data[auto_payout]" value="1"{nocache}{if $SETTINGS['auto_payout']}checked{/if}{/nocache} />
+          <label for="data[auto_payout]"></label>
+        </td>
+      </tr>
+      <tr>
+        <td align="left">Manual Payout</td>
+        <td align="center">
+          <input type="hidden" name="data[manual_payout]" value="0" />
+          <input type="checkbox" name="data[manual_payout]" id="data[manual_payout]" value="1"{nocache}{if $SETTINGS['manual_payout']}checked{/if}{/nocache} />
+          <label for="data[manual_payout]"></label>
+        </td>
+      </tr>
     </table>
-  </center>
-{include file="global/block_footer.tpl"}
+    </div>
+    <footer>
+      <div class="submit_link">
+        <input type="submit" value="Update" class="alt_btn">
+      </div>
+    </footer>
+  </article>
+</form>
+
+<article class="module width_3_quarter">
+  <header><h3>Notification History</h3></header>
+  <table width="100%" class="tablesorter" cellspacing="0">
+    <thead style="font-size:13px;">
+      <tr>
+        <th align="center" style="cursor: pointer;">ID</th>
+        <th align="center" style="cursor: pointer;">Time</th>
+        <th align="center" style="cursor: pointer;">Type</th>
+        <th align="center" style="cursor: pointer;">Active</th>
+      </tr>
+    </thead>
+    <tbody style="font-size:12px;">
+{section notification $NOTIFICATIONS}
+      <tr class="{cycle values="odd,even"}">
+        <td align="center">{$NOTIFICATIONS[notification].id}</td>
+        <td align="center">{$NOTIFICATIONS[notification].time}</td>
+        <td align="center">
+{if $NOTIFICATIONS[notification].type == new_block}New Block
+{else if $NOTIFICATIONS[notification].type == auto_payout}Auto Payout
+{else if $NOTIFICATIONS[notification].type == idle_worker}IDLE Worker
+{else if $NOTIFICATIONS[notification].type == manual_payout}Manual Payout
+{/if}
+        </td>
+        <td align="center">
+          <img src="{$PATH}/images/icn_alert_{if $NOTIFICATIONS[notification].active}success{else}error{/if}.png" />
+        </td>
+      </tr>
+{/section}
+    </tbody>
+  </table>
+</article>