diff --git a/public/site_assets/test/css/layout.css b/public/site_assets/test/css/layout.css
index 0005a06a..c9c88fbd 100644
--- a/public/site_assets/test/css/layout.css
+++ b/public/site_assets/test/css/layout.css
@@ -661,7 +661,7 @@ margin: -5px 0 5px 0;
 text-transform: uppercase;
 }
 
-fieldset input[type=password] {
+fieldset input[type=text], fieldset input[type=password] {
 -webkit-border-radius: 5px;
 -moz-border-radius: 5px;
 border-radius: 5px;
@@ -680,34 +680,7 @@ width: 92%;
 margin: 0 10px;
 }
 
-fieldset input[type=password]:focus {
-outline: none;
-border: 1px solid #77BACE;
--webkit-box-shadow: inset 0 2px 2px #ccc, 0 0 10px #ADDCE6;
--moz-box-shadow: inset 0 2px 2px #ccc, 0 0 10px #ADDCE6;
-box-shadow: inset 0 2px 2px #ccc, 0 0 10px #ADDCE6;
-}
-
-fieldset input[type=text] {
--webkit-border-radius: 5px;
--moz-border-radius: 5px;
-border-radius: 5px;
-border: 1px solid #BBBBBB;
-height: 20px;
-color: #666666;
--webkit-box-shadow: inset 0 2px 2px #ccc, 0 1px 0 #fff;
--moz-box-shadow: inset 0 2px 2px #ccc, 0 1px 0 #fff;
-box-shadow: inset 0 2px 2px #ccc, 0 1px 0 #fff;
-padding-left: 10px;
-background-position: 10px 6px;
-margin: 0;
-display: block;
-float: left;
-width: 92%;
-margin: 0 10px;
-}
-
-fieldset input[type=text]:focus {
+fieldset input[type=text]:focus, fieldset input[type=password]:focus, fieldset input[type=checkbox] {
 outline: none;
 border: 1px solid #77BACE;
 -webkit-box-shadow: inset 0 2px 2px #ccc, 0 0 10px #ADDCE6;
diff --git a/public/templates/test/account/edit/default.tpl b/public/templates/test/account/edit/default.tpl
index 0a3e523d..f3936724 100644
--- a/public/templates/test/account/edit/default.tpl
+++ b/public/templates/test/account/edit/default.tpl
@@ -1,53 +1,127 @@
-{include file="global/block_header.tpl" BLOCK_HEADER="Account Details"}
-    <form action="{$smarty.server.PHP_SELF}" method="post">
-      <input type="hidden" name="page" value="{$smarty.request.page|escape}">
-      <input type="hidden" name="action" value="{$smarty.request.action|escape}">
-      <input type="hidden" name="do" value="updateAccount">
-      <table>
-        <tbody><tr><td>Username: </td><td>{$GLOBAL.userdata.username|escape}</td></tr>
-        <tr><td>User Id: </td><td>{$GLOBAL.userdata.id}</td></tr>
-        {if !$GLOBAL.config.website.api.disabled}<tr><td>API Key: </td><td><a href="{$smarty.server.PHP_SELF}?page=api&action=getuserstatus&api_key={$GLOBAL.userdata.api_key}&id={$GLOBAL.userdata.id}">{$GLOBAL.userdata.api_key}</a></td></tr>{/if}
-        <tr><td>E-Mail: </td><td><input type="text" name="email" value="{nocache}{$GLOBAL.userdata.email|escape}{/nocache}" size="20"></td></tr>
-        <tr><td>Payment Address: </td><td><input type="text" name="paymentAddress" value="{nocache}{$smarty.request.paymentAddress|default:$GLOBAL.userdata.coin_address|escape}{nocache}" size="40"></td></tr>
-        <tr><td>Donation %: </td><td><input type="text" name="donatePercent" value="{nocache}{$smarty.request.donatePercent|default:$GLOBAL.userdata.donate_percent|escape}{nocache}" size="4"><font size="1"> [donation amount in percent (example: 0.5)]</font></td></tr>
-        <tr><td>Automatic Payout Threshold: </td><td valign="top"><input type="text" name="payoutThreshold" value="{$smarty.request.payoutThreshold|default:$GLOBAL.userdata.ap_threshold|escape}" size="5" maxlength="5"> <font size="1">[{$GLOBAL.config.ap_threshold.min}-{$GLOBAL.config.ap_threshold.max} {$GLOBAL.config.currency}. Set to '0' for no auto payout]</font></td></tr>
-        <tr><td>Anonymous Account <span id='tt'><img src='{$PATH}/images/questionmark.png' height='15px' width='15px' title='Will hide your username on the website for others. Only admins can still get your user information.'></span>:</td><td>
-          <input type="hidden" name="is_anonymous" value="0" />
-          <input type="checkbox" name="is_anonymous" value="1" id="is_anonymous" {if $GLOBAL.userdata.is_anonymous}checked{/if} />
-          <label for="is_anonymous"></label>
-        </td></tr>
-        <tr><td>4 digit PIN: </td><td><input type="password" name="authPin" size="4" maxlength="4"><font size="1"> [The 4 digit PIN you chose when registering]</font></td></tr>
-      </tbody></table>
-      <input type="submit" class="submit long" value="Update Settings"></form>
-{include file="global/block_footer.tpl"}
+<form action="{$smarty.server.PHP_SELF}" method="post">
+  <input type="hidden" name="page" value="{$smarty.request.page|escape}">
+  <input type="hidden" name="action" value="{$smarty.request.action|escape}">
+  <input type="hidden" name="do" value="updateAccount">
+  <article class="module width_half">
+    <header><h3>Account Details</h3></header>
+    <div class="module_content">
+      <fieldset>
+        <label>Username</label>
+        <input type="text" value="{$GLOBAL.userdata.username|escape}" readonly />
+      </fieldset>
+      <fieldset>
+        <label>User Id</label>
+        <input type="text" value="{$GLOBAL.userdata.id}" readonly />
+      </fieldset>
+      {if !$GLOBAL.website.api.disabled}
+      <fieldset>
+        <label>API Key</label>
+        <a href="{$smarty.server.PHP_SELF}?page=api&action=getuserstatus&api_key={$GLOBAL.userdata.api_key}&id={$GLOBAL.userdata.id}">{$GLOBAL.userdata.api_key}</a>
+      </fieldset>
+      {/if}
+      <fieldset>
+        <label>E-Mail</label>
+        <input type="text" name="email" value="{nocache}{$GLOBAL.userdata.email|escape}{/nocache}" size="20" />
+      </fieldset>
+      <fieldset>
+        <label>Payment Address</label>
+        <input type="text" name="paymentAddress" value="{nocache}{$smarty.request.paymentAddress|default:$GLOBAL.userdata.coin_address|escape}{nocache}" size="40" />
+      </fieldset>
+      <fieldset>
+        <label>Donation Percentage</label>
+        <font size="1"> Donation amount in percent (example: 0.5)</font>
+        <input type="text" name="donatePercent" value="{nocache}{$smarty.request.donatePercent|default:$GLOBAL.userdata.donate_percent|escape}{nocache}" size="4" />
+      </fieldset>
+      <fieldset>
+        <label>Automatic Payout Threshold</label>
+        <font size="1">{$GLOBAL.config.ap_threshold.min}-{$GLOBAL.config.ap_threshold.max} {$GLOBAL.config.currency}. Set to '0' for no auto payout.</font>
+        <input type="text" name="payoutThreshold" value="{$smarty.request.payoutThreshold|default:$GLOBAL.userdata.ap_threshold|escape}" size="5" maxlength="5" />
+      </fieldset>
+      <fieldset>
+        <label>Anonymous Account</label>
+        Will hide your username on the website for others. Only admins can still get your user information.
+        <input type="hidden" name="is_anonymous" value="0" />
+        <input type="checkbox" name="is_anonymous" value="1" id="is_anonymous" {if $GLOBAL.userdata.is_anonymous}checked{/if} />
+        <label class="checkbox" for="is_anonymous"></label>
+      </fieldset>
+      <fieldset>
+        <label>4 digit PIN</label>
+        <font size="1">The 4 digit PIN you chose when registering</font>
+        <input type="password" name="authPin" size="4" maxlength="4">
+      </fieldset>
+    </div>
+    <footer>
+      <div class="submit_link">
+        <input type="submit" value="Update Account" class="alt_btn">
+      </div>
+    </footer>
+  </article>
+</form>
 
 {if !$GLOBAL.disable_mp}
-{include file="global/block_header.tpl" BLOCK_HEADER="Cash Out"}
-    <ul><li><font color="">Please note: a {$GLOBAL.config.txfee} {$GLOBAL.config.currency} transaction will apply when processing "On-Demand" manual payments</font></li></ul>
-    <form action="{$smarty.server.PHP_SELF}" method="post">
-      <input type="hidden" name="page" value="{$smarty.request.page|escape}">
-      <input type="hidden" name="action" value="{$smarty.request.action|escape}">
-      <input type="hidden" name="do" value="cashOut">
-      <table>
-        <tbody><tr><td>Account Balance: &nbsp;&nbsp;&nbsp;</td><td>{nocache}{$GLOBAL.userdata.balance.confirmed|escape}{/nocache} {$GLOBAL.config.currency}</td></tr>
-        <tr><td>Payout to: </td><td><h6>{nocache}{$GLOBAL.userdata.coin_address|escape}{/nocache}</h6></td></tr>
-        <tr><td>4 digit PIN: </td><td><input type="password" name="authPin" size="4" maxlength="4"></td></tr>
-      </tbody></table>
-      <input type="submit" class="submit mid" value="Cash Out"></form>
-{include file="global/block_footer.tpl"}
+<form action="{$smarty.server.PHP_SELF}" method="post">
+  <input type="hidden" name="page" value="{$smarty.request.page|escape}">
+  <input type="hidden" name="action" value="{$smarty.request.action|escape}">
+  <input type="hidden" name="do" value="cashOut">
+  <article class="module width_half">
+    <header>
+      <h3>Cash Out</h3>
+    </header>
+    <div class="module_content">
+      <font color="">Please note: a {$GLOBAL.config.txfee} {$GLOBAL.config.currency} transaction will apply when processing "On-Demand" manual payments</font>
+      <fieldset>
+        <label>Account Balance</label>
+        <input type="text" value="{nocache}{$GLOBAL.userdata.balance.confirmed|escape}{/nocache}" {$GLOBAL.config.currency} readonly/>
+      </fieldset>
+      <fieldset>
+        <label>Payout to</label>
+        <input type="text" value="{nocache}{$GLOBAL.userdata.coin_address|escape}{/nocache}" readonly/>
+      </fieldset>
+      <fieldset>
+        <label>4 digit PIN</label>
+        <input type="password" name="authPin" size="4" maxlength="4" />
+      </fieldset>
+    </div>
+    <footer>
+      <div class="submit_link">
+        <input type="submit" value="Cash Out" class="alt_btn">
+      </div>
+    </footer>
+  </article>
+</form>
 {/if}
 
-{include file="global/block_header.tpl" BLOCK_HEADER="Change Password"}
-    <ul><li><font color="">Note: You will be redirected to login on successful completion of a password change</font></li></ul>
-    <form action="{$smarty.server.PHP_SELF}" method="post"><input type="hidden" name="act" value="updatePassword">
-      <input type="hidden" name="page" value="{$smarty.request.page|escape}">
-      <input type="hidden" name="action" value="{$smarty.request.action|escape}">
-      <input type="hidden" name="do" value="updatePassword">
-      <table>
-        <tbody><tr><td>Current Password: </td><td><input type="password" name="currentPassword"></td></tr>
-        <tr><td>New Password: </td><td><input type="password" name="newPassword"></td></tr>
-        <tr><td>New Password Repeat: </td><td><input type="password" name="newPassword2"></td></tr>
-        <tr><td>4 digit PIN: </td><td><input type="password" name="authPin" size="4" maxlength="4"></td></tr>
-      </tbody></table>
-      <input type="submit" class="submit long" value="Change Password"></form>
-{include file="global/block_footer.tpl"}
+<form action="{$smarty.server.PHP_SELF}" method="post"><input type="hidden" name="act" value="updatePassword">
+  <input type="hidden" name="page" value="{$smarty.request.page|escape}">
+  <input type="hidden" name="action" value="{$smarty.request.action|escape}">
+  <input type="hidden" name="do" value="updatePassword">
+  <article class="module width_half">
+    <header>
+      <h3>Change Password</h3>
+    </header>
+    <div class="module_content">
+      Note: You will be redirected to login on successful completion of a password change
+      <fieldset>
+        <label>Current Password</label>
+        <input type="password" name="currentPassword" />
+      </fieldset>
+      <fieldset>
+        <label>New Password</label>
+        <input type="password" name="newPassword" />
+      </fieldset>
+      <fieldset>
+        <label>New Password Repeat</label>
+        <input type="password" name="newPassword2" />
+      </fieldset>
+      <fieldset>
+        <label>4 digit PIN</label>
+        <input type="password" name="authPin" size="4" maxlength="4" />
+      </fieldset>
+    </div>
+    <footer>
+      <div class="submit_link">
+        <input type="submit" value="Change Password" class="alt_btn">
+      </div>
+    </footer>
+  </article>
+</form>