diff --git a/root/tt/admin.tt b/root/tt/admin.tt
index 47db78d..38ec3d8 100644
--- a/root/tt/admin.tt
+++ b/root/tt/admin.tt
@@ -1,71 +1,66 @@
         <h3>Administrator Accounts</h3>
-
+      
         [% IF ! Catalyst.session.admin.read_only && (Catalyst.session.admin.is_master || Catalyst.session.admin.is_superuser) %]
-        <div class="actions">
-          <a href="/admin/edit_admin" class="aaction">create new admin</a>
-        </div>
+          <a href="/admin/edit_admin"><span class="button-add">Add</span></a>
         [% END %]
-        <div class="p1">
-          [% IF messages.admmsg %]<div class="goodmsg">[% messages.admmsg %]</div>[% END %]
 
-          <table>
-            <tr class="table_header">
-              <td>login</td>
-              <td>password</td>
-              <td title="if checked, the administrator can create and edit other administrator accounts">master</td>
-              <td title="if checked, the administrator account is active and may be used">active</td>
-              <td title="if checked, the administrator may not change any data"> r/o </td>
-              <td title="if checked, the administrator may view subscriber passwords"> PW </td>
-              <td title="if checked, the administrator may view call detail records"> CDR </td>
-              <td />
-              <td />
-            </tr>
+        [% IF messages.admmsg %]<div class="success">[% messages.admmsg %]</div>[% END %]
+
+          <div class="hspace-20"></div>
+          <ul class="cleanlist">
+            <li class="ui-state-default">
+              <div class="span-3">Login</div>
+              <div class="span-3">Password</div>
+              <div class="span-2">Master</div>
+              <div class="span-2">Active</div>
+              <div class="span-2">R/O</div>
+              <div class="span-2">PWD</div>
+              <div class="span-2">CDR</div>
+              <div class="span-1"></div>
+              <div class="span-1 last"></div>
+            </li>
             [% id = 0 %]
             [% FOREACH admin = admins %]
-              <tr>
-                <td>[% admin.login %]</td>
-                <td>********</td>
-                <td class="tdcenter" title="if checked, the administrator can create and edit other administrator accounts">
-                  <input type="checkbox" class="checkbox" disabled="disabled"
+            <li class="ui-state-default">
+              <div class="span-3">[% admin.login %]</div>
+              <div class="span-3">********</div>
+              <div class="span-2">
+                <input type="checkbox" disabled="disabled"
                          [% IF admin.is_master %]checked="checked"[% END %] />
-                </td>
-                <td class="tdcenter" title="if checked, the administrator account is active and may be used">
-                  <input type="checkbox" class="checkbox" disabled="disabled"
-                         [% IF admin.is_active %] checked="checked"[% END %] />
-                </td>
-                <td class="tdcenter" title="if checked, the administrator may not change any data">
-                  <input type="checkbox" class="checkbox" disabled="disabled"
-                         [% IF admin.read_only %] checked="checked"[% END %] />
-                </td>
-                <td class="tdcenter" title="if checked, the administrator may view subscriber passwords">
-                  <input type="checkbox" class="checkbox" disabled="disabled"
-                         [% IF admin.show_passwords %] checked="checked"[% END %] />
-                </td>
-                <td class="tdcenter" title="if checked, the administrator may view call detail records">
-                  <input type="checkbox" class="checkbox" disabled="disabled"
-                         [% IF admin.call_data %] checked="checked"[% END %] />
-                </td>
-                <td>
+              </div>
+              <div class="span-2">
+                  <input type="checkbox" disabled="disabled"
+                         [% IF admin.is_active %]checked="checked"[% END %] />
+              </div>
+              <div class="span-2">
+                  <input type="checkbox" disabled="disabled"
+                         [% IF admin.read_only %]checked="checked"[% END %] />
+              </div>
+              <div class="span-2">
+                  <input type="checkbox" disabled="disabled"
+                         [% IF admin.show_passwords %]checked="checked"[% END %] />
+              </div>
+              <div class="span-2">
+                  <input type="checkbox" disabled="disabled"
+                         [% IF admin.call_data %]checked="checked"[% END %] />
+              </div>
+
+              <div class="span-1">
                   [% UNLESS Catalyst.session.admin.read_only && admin.login != Catalyst.session.admin.login %]
-                    <a href="/admin/edit_admin?edit_admin=[% admin.login %]" class="aaction">edit</a>
+                    <a href="/admin/edit_admin?edit_admin=[% admin.login %]"><span class="button-edit">Edit</span></a>
                   [% END %]
-                </td>
+              </div>
+              <div class="span-1 last">
                 [% IF admin.login != Catalyst.session.admin.login && ! Catalyst.session.admin.read_only %]
                   <form action="/admin/do_delete_admin" method="post">
-                    <td>
                       <input type="hidden" name="admin" value="[% admin.login %]" />
-                      <div class="postlink">
-                        <label for="admdel[% id %]">delete</label>
-                        <input type="image" class="hidden" src="/static/images/dot_trans.gif" alt="" id="admdel[% id %]" />
-                      </div>
-                    </td>
+                      <button id="admdel[% id %]" class="button-delete">Delete</button>
                   </form>
-                [% ELSE %]
-                  <td />
                 [% END %]
-              </tr>
+              </div>
+
+
+            </li>
             [% id = id + 1 %]
             [% END %]
-          </table>
-        </div>
-
+          </ul>