diff --git a/public/templates/test/admin/settings/default.tpl b/public/templates/test/admin/settings/default.tpl
index fa68b3c6..a2d1e753 100644
--- a/public/templates/test/admin/settings/default.tpl
+++ b/public/templates/test/admin/settings/default.tpl
@@ -1,4 +1,4 @@
-<article class="module width_full">
+<article class="module width_3_quarter">
   <form method="POST">
     <input type="hidden" name="page" value="{$smarty.request.page}" />
     <input type="hidden" name="action" value="{$smarty.request.action}" />
@@ -13,31 +13,20 @@
     </header>
     <div class="tab_container">
 {foreach item=TAB from=array_keys($SETTINGS)}
-      <div class="tab_content" id="{$TAB}">
-        <table class="tablesorter" cellspacing="0">
-          <thead>
-            <th align="left" width="15%">Setting</th>
-            <th align="center" width="50px">Help</th>
-            <th>Value</th>
-          </thead>
-          <tbody>
+      <div class="tab_content module_content" id="{$TAB}">
 {section name=setting loop=$SETTINGS.$TAB}
-            <tr>
-              <td align="left">{$SETTINGS.$TAB[setting].display}</td>
-              <td align="center">{if $SETTINGS.$TAB[setting].tooltip|default}<span id='tt'><img src='{$PATH}/images/questionmark.png' height='15px' width='15px' title='{$SETTINGS.$TAB[setting].tooltip}.'></span>{/if}</td>
-              <td>
+        <fieldset>
+          <label>{$SETTINGS.$TAB[setting].display}</label>
+          {if $SETTINGS.$TAB[setting].tooltip|default}<span style="font-size: 10px;">{$SETTINGS.$TAB[setting].tooltip}</span>{/if}
           {if $SETTINGS.$TAB[setting].type == 'select'}
-                {html_options name="data[{$SETTINGS.$TAB[setting].name}]" options=$SETTINGS.$TAB[setting].options selected=$SETTINGS.$TAB[setting].value|default:$SETTINGS.$TAB[setting].default}
+            {html_options name="data[{$SETTINGS.$TAB[setting].name}]" options=$SETTINGS.$TAB[setting].options selected=$SETTINGS.$TAB[setting].value|default:$SETTINGS.$TAB[setting].default}
           {else if $SETTINGS.$TAB[setting].type == 'text'}
-                <input type="text" size="{$SETTINGS.$TAB[setting].size}" name="data[{$SETTINGS.$TAB[setting].name}]" value="{$SETTINGS.$TAB[setting].value|default:$SETTINGS.$TAB[setting].default}" />
+            <input type="text" size="{$SETTINGS.$TAB[setting].size}" name="data[{$SETTINGS.$TAB[setting].name}]" value="{$SETTINGS.$TAB[setting].value|default:$SETTINGS.$TAB[setting].default}" />
           {else}
-                Unknown option type: {$SETTINGS.$TAB[setting].type}
+            Unknown option type: {$SETTINGS.$TAB[setting].type}
           {/if}
-              </td>
-            </tr>
+        </fieldset>
 {/section}
-          </tbody>
-        </table>
       </div>
 {/foreach}
     </div>