diff --git a/root/tt/ncos.tt b/root/tt/ncos.tt
index e93323c..be1fdf1 100644
--- a/root/tt/ncos.tt
+++ b/root/tt/ncos.tt
@@ -4,7 +4,7 @@
           [% IF messages.elvlerr %]<div class="error">[% messages.elvlerr %]</div>[% END %]
           [% IF messages.clvlmsg %]<div class="success">[% messages.clvlmsg %]</div>[% END %]
           [% IF messages.clvlerr %]<div class="error">[% messages.clvlerr %]</div>[% END %]
-          [% IF crefill && prov_error %]<div class="error">[% prov_error %]</div>[% END %]
+	  [% IF messages.elvl %]<div class="error">[% messages.elvl %]</div>[% END %]
 
 	  <div class="hspace-20"></div>
 	  <ul class="cleanlist">
@@ -15,11 +15,6 @@
 	    </li>
           [% IF levels %]
             [% FOREACH level = levels %]
-              [% IF messages.elvl %]
-	      <li class="ui-state-default">
-                <div class="error">[% messages.elvl %]</div>
-              </li>
-              [% END %]
 	      <li class="ui-state-default">
               [% IF level.level == edit_level %]
 	        <form action="/ncos/do_update_level" method="post">
@@ -100,3 +95,4 @@
           [% END %]
 
 	</ul>
+        [% IF crefill && prov_error %]<div class="error">[% prov_error %]</div>[% END %]
diff --git a/root/tt/ncos_lists.tt b/root/tt/ncos_lists.tt
index 05b549d..4cc7616 100644
--- a/root/tt/ncos_lists.tt
+++ b/root/tt/ncos_lists.tt
@@ -1,120 +1,120 @@
         <h2>NCOS Level <a href="/ncos/lists?level=[% level.level %]">[% level.level %]</a></h2>
 
-        <div class="actions ui-corner-all">
-          <a href="/ncos" class="aaction">back</a>
-        </div>
-        <br />
+        <a href="/ncos"><span class="button-back">Back</span></a>
 
-        <div class="p1">
-        <table>
-          <tr><td class="tdkey">Mode:</td><td>[% level.mode %]</td></tr>
-          <tr><td class="tdkey">Description:</td><td>[% level.description %]</td></tr>
-        </table>
-        </div>
+	<h3>Details</h3>
+
+	<ul class="cleanlist">
+	  <li class="ui-state-default">
+	    <div class="span-3">Mode:</div>
+	    <div class="span-3 last">[% level.mode %]</div>
+	  </li>
+	  <li class="ui-state-default">
+	    <div class="span-3">Description:</div>
+	    <div class="span-6 last">[% level.description%]</div>
+	  </li>
+	</ul>
+	<div class="hspace-20"></div>
 
         <h3 id="pattern">Number Patterns</h3>
 
-        <div class="p1">
           [% IF messages.patmsg %]<div class="success">[% messages.patmsg %]</div>[% END %]
           [% IF messages.paterr %]<div class="error">[% messages.paterr %]</div>[% END %]
+          [% IF messages.lacmsg %]<div class="success">[% messages.lacmsg %]</div>[% END %]
 
-          <table class="ncospatterns">
-            <tr class="table_header">
-              <td style="width:120px;">Pattern</td>
-              <td style="width:310px;">Description</td>
-              <td style="width:40px;" />
-              <td style="width:60px;" />
-            </tr>
+	<ul class="cleanlist">
+	  <li class="ui-state-default">
+	    <div class="span-5">Pattern</div>
+	    <div class="span-6 last">Description</div>
+	  </li>
             [% id = 0 %]
             [% FOREACH pattern = patterns %]
+	    <li class="ui-state-default">
               [% id = id + 1 %]
               [% IF pattern.pattern == edit_pattern %]
-                <tr>
                   <form action="/ncos/do_update_pattern" method="post">
                     <input type="hidden" name="level" value="[% level.level %]" />
                     <input type="hidden" name="oldpattern" value="[% pattern.pattern %]" />
-                    <td>
-                      <input type="text" title="POSIX regular expression"
+                    <div class="span-5">
+                      <input type="text" size="19" title="POSIX regular expression"
                              name="newpattern" value="[% perefill.pattern %]" />
-                    </td>
-                    <td>
-                      <input type="text" class="ilong" title="free-form description string"
+                    </div>
+                    <div class="span-6">
+                      <input type="text" size="20" title="free-form description string"
                              name="description" value="[% perefill.description %]" />
-                    </td>
-                    <td>
-                      <div class="postlink ui-corner-all">
-                        <label for="patsave">save</label>
-                        <input type="image" class="hidden" src="/static/images/dot_trans.gif" alt="" id="patsave" />
-                      </div>
-                    </td>
+                    </div>
+                    <div class="span-1">
+	              <button id="patsave[% id %]" class="button-save">Save</button>
+                    </div>
+                    <div class="span-1 last">
+	              <a href="/ncos/lists?level=[% level.level %]"><span class="button-cancel">Cancel</span></a>
+                    </div>
                   </form>
-                  <td><a href="/ncos/lists?level=[% level.level %]" class="aaction">cancel</a></td>
-                </tr>
-                [% IF messages.epat %]
-                  <tr><td colspan="5"><div class="error">[% messages.epat %]</div></td></tr>
-                [% END %]
-                [% IF perefill && prov_error %]<tr><td colspan="5"><div class="error">[% prov_error %]</div></td></tr>[% END %]
-              [% ELSE %]
-                <tr>
-                  <td>[% pattern.pattern %]</td>
-                  <td>[% pattern.description %]</td>
-                  <td>
+	      [% ELSE %]
+	        <div class="span-5">[% pattern.pattern %]</div>
+	        <div class="span-6">[% pattern.description %]</div>
+	        <div class="span-1">
                   [% UNLESS Catalyst.session.admin.read_only %]
-                    <a href="/ncos/lists?level=[% level.level %]&amp;edit_pattern=[% pattern.urlenc_pattern %]" class="aaction">edit</a>
+                  <a href="/ncos/lists?level=[% level.level %]&amp;edit_pattern=[% pattern.urlenc_pattern %]"><span class="button-edit">Edit</span></a>
                   [% END %]
-                  </td>
+	        </div>
+	        <div class="span-1 last">
+                  [% UNLESS Catalyst.session.admin.read_only %]
                   <form action="/ncos/do_delete_pattern" method="post">
                     <input type="hidden" name="level" value="[% level.level %]" />
                     <input type="hidden" name="pattern" value="[% pattern.pattern %]" />
-                    <td>
-                    [% UNLESS Catalyst.session.admin.read_only %]
-                      <div class="postlink ui-corner-all">
-                        <label for="patdel[% id %]">delete</label>
-                        <input type="image" class="hidden" src="/static/images/dot_trans.gif" alt="" id="patdel[% id %]" />
-                      </div>
-                    [% END %]
-                    </td>
+	            <button class="button-delete" id="patdel[% id %]">Delete</button>
                   </form>
-                </tr>
-              [% END %]
-            [% END %]
-            <tr>
+                  [% END %]
+	        </div>
+	      [% END %]
+	    </li>
+	    [% END %]
+
+          [% UNLESS Catalyst.session.admin.read_only %]
+	  <li class="ui-state-default">
               <form action="/ncos/do_create_pattern" method="post">
                 <input type="hidden" name="level" value="[% level.level %]" />
-                <td>
-                  <input type="text" title="POSIX regular expression"
+                <div class="span-5">
+                  <input type="text" size="19" title="POSIX regular expression"
                          name="pattern" value="[% pcrefill.pattern %]" />
-                </td>
-                <td>
-                  <input type="text" class="ilong" title="free-form description string"
+                </div>
+                <div class="span-6">
+                  <input type="text" size="20" title="free-form description string"
                          name="description" value="[% pcrefill.description %]" />
-                </td>
-                <td>
-                  <div class="postlink ui-corner-all">
-                    <label for="patadd">add</label>
-                    <input type="image" class="hidden" src="/static/images/dot_trans.gif" alt="" id="patadd" />
-                  </div>
-                </td>
+                </div>
+                <div class="span-1 last">
+                  <button class="button-add" id="padd">Add</button>
+                </div>
               </form>
-              <td />
-            </tr>
-          </table>
-            [% IF messages.cpat %]<div class="error">[% messages.cpat %]</div>[% END %]
-            [% IF pcrefill && prov_error %]<div class="error">[% prov_error %]</div>[% END %]
-        </div>
-        <div class="p1">
-          [% IF messages.lacmsg %]<div class="success">[% messages.lacmsg %]</div>[% END %]
-          [% IF messages.lacerr %]<div class="error">[% messages.lacerr %]</div>[% END %]
-          <form action="/ncos/save_local_ac" method="post">
-            <input type="hidden" name="level" value="[% level.level %]" />
-            <input type="checkbox" class="checkbox" id="local_ac" name="local_ac" [% IF level.local_ac %]checked="checked"[% END %] />
-            <label for="local_ac">include local area code in list</label>
-            <span id="save_local_ac" class="postlink ui-corner-all">
-              <label for="lacsave">save</label>
-              <input type="image" class="hidden" src="/static/images/dot_trans.gif" alt="" id="lacsave" />
-            </span>
-          </form>
-        </div>
+	  </li>
+	  [% END %]
+	  <li class="ui-state-default">
+
+            <form action="/ncos/save_local_ac" method="post">
+              <input type="hidden" name="level" value="[% level.level %]" />
+	      <div class="span-1">
+                <input type="checkbox" class="checkbox" id="local_ac" name="local_ac" 
+	           [% IF level.local_ac %]checked="checked"[% END %]
+                   [% IF Catalyst.session.admin.read_only %]disabled="disabled"[% END %]
+	        />
+	      </div>
+	      <div class="span-10">
+	        include local area code in list
+	      </div>
+	      <div class="span-1 last">
+                [% UNLESS Catalyst.session.admin.read_only %]
+	        <button id="lacsave" class="button-save">Save</button>
+	        [% END %]
+	      </div>
+            </form>
+	  </li>
+
+
+	</ul>
+        [% IF messages.cpat %]<div class="error">[% messages.cpat %]</div>[% END %]
+        [% IF pcrefill && prov_error %]<div class="error">[% prov_error %]</div>[% END %]
+        [% IF messages.lacerr %]<div class="error">[% messages.lacerr %]</div>[% END %]
 
       [% IF Catalyst.config.lnp_features %]