diff --git a/public/templates/test/account/invitations/default.tpl b/public/templates/test/account/invitations/default.tpl
index b8d6743a..6aa48857 100644
--- a/public/templates/test/account/invitations/default.tpl
+++ b/public/templates/test/account/invitations/default.tpl
@@ -1,43 +1,45 @@
-{include file="global/block_header.tpl" ALIGN="left" BLOCK_HEADER="Invitations"}
 <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="sendInvitation">
-<table>
-  <tr>
-    <td>E-Mail</td>
-    <td><input type="text" name="data[email]" value="{$smarty.request.data.email|escape|default:""}" size="30" /></td>
-  </tr>
-  <tr>
-    <td>Message</td>
-    <td><textarea name="data[message]">{$smarty.request.data.message|escape|default:"Please accept my invitation to this awesome pool."}</textarea></td>
-  </tr>
-  <tr>
-    <td colspan="2" class="center">
-      <input type="submit" class="submit small" value="Send">
-    </td>
-  </tr>
-</table>
+  <input type="hidden" name="page" value="{$smarty.request.page}">
+  <input type="hidden" name="action" value="{$smarty.request.action}">
+  <input type="hidden" name="do" value="sendInvitation">
+  <article class="module width_quarter">
+    <header><h3>Invitation</h3></header>
+    <div class="module_content">
+      <fieldset>
+        <label>E-Mail</label>
+        <input type="text" name="data[email]" value="{$smarty.request.data.email|escape|default:""}" size="30" />
+      </fieldset>
+      <fieldset>
+        <label>Message</label>
+        <textarea name="data[message]" rows="5">{$smarty.request.data.message|escape|default:"Please accept my invitation to this awesome pool."}</textarea>
+      </fieldset>
+    </div>
+    <footer>
+      <div class="submit_link">
+        <input type="submit" value="Invite" class="alt_btn">
+      </div>
+    </footer>
+  </article>
 </form>
-{include file="global/block_footer.tpl"}
 
-{include file="global/block_header.tpl" ALIGN="right" BLOCK_HEADER="Past Invitations"}
-    <table width="100%">
-      <thead style="font-size:13px;">
-        <tr>
-          <th>E-Mail</th>
-          <th class="center">Sent</th>
-          <th class="center">Activated</th>
-        </tr>
-      </thead>
-      <tbody>
+<article class="module width_3_quarter">
+  <header><h3>Past Invitations</h3></header>
+  <table class="tablesorter" cellspacing="0">
+    <thead style="font-size:13px;">
+      <tr>
+        <th>E-Mail</th>
+        <th class="center">Sent</th>
+        <th class="center">Activated</th>
+      </tr>
+    </thead>
+    <tbody>
 {section name=invite loop=$INVITATIONS}
-        <tr>
-          <td>{$INVITATIONS[invite].email}</td>
-          <td class="center">{$INVITATIONS[invite].time|date_format:"%d/%m/%Y %H:%M:%S"}</td>
-          <td class="center"><img src="{$PATH}/images/{if $INVITATIONS[invite].is_activated}success{else}error{/if}.gif" /></td>
-        </tr>
+      <tr>
+        <td>{$INVITATIONS[invite].email}</td>
+        <td class="center">{$INVITATIONS[invite].time|date_format:"%d/%m/%Y %H:%M:%S"}</td>
+        <td class="center"><img src="{$PATH}/images/{if $INVITATIONS[invite].is_activated}success{else}error{/if}.gif" /></td>
+      </tr>
 {/section}
-      <tbody>
-    </table>
-{include file="global/block_footer.tpl"}
+    <tbody>
+  </table>
+</article>