diff --git a/root/css/admin.css b/root/css/admin.css
index 6ec7f91..80f37e2 100644
--- a/root/css/admin.css
+++ b/root/css/admin.css
@@ -228,8 +228,9 @@ ul#topsubmenu {
 }
 */
 
-/* sigh, no border for checkboxes */
-#contentplace .checkbox {
+/* sigh, no border for checkboxes and radios */
+#contentplace .checkbox,
+#contentplace .radio {
 	border: none !important;
 }
 
@@ -427,14 +428,18 @@ ul#topsubmenu {
 	margin-top: 3px;
 }
 #contentplace .search_subscriber input {
-	margin: 3px 0;
+	margin: 4px 0;
 }
 #contentplace .search_subscriber select {
 	min-width: 50px;
 	margin: 3px 0;
 }
 #contentplace .search_subscriber .radio {
-	margin: 6px 0px 8px 0px;
+	margin: 6px 0px;
+}
+
+#contentplace .usr_preferences .radio {
+	margin: 2px 0px;
 }
 
 /* increase spacing around list explanation text */
diff --git a/root/tt/billing_fees.tt b/root/tt/billing_fees.tt
index afd4ae9..56db4be 100644
--- a/root/tt/billing_fees.tt
+++ b/root/tt/billing_fees.tt
@@ -32,7 +32,7 @@
             </div>
 -->
             [% IF messages.feefileerr %]<div class="errormsg">[% messages.feefileerr %]</div>[% END %]
-            <input type="checkbox" id="purge_existing" name="purge_existing"
+            <input type="checkbox" class="checkbox" id="purge_existing" name="purge_existing"
                    title="remove all existing fees before creating new ones"
                    [% IF purge_existing %]checked="checked"[% END %] />
             <label for="purge_existing">purge existing fees</label><br />
@@ -50,19 +50,22 @@
             <label class="search_label" for="search_by_destination">Destination:</label>
             <input type="text" id="search_by_destination" name="search_destination" title="SQL wildcards allowed"
                    value="[% search_destination %]" />
-            <input type="checkbox" id="exact_destination" name="exact_destination" [% IF exact_destination %]checked="checked"[% END %] />
+            <input type="checkbox" class="checkbox" id="exact_destination" name="exact_destination"
+                   [% IF exact_destination %]checked="checked"[% END %] />
             <label for="exact_destination">exact match</label><br />
 
             <label class="search_label" for="search_by_zone">Zone:</label>
             <input type="text" id="search_by_zone" name="search_zone" title="SQL wildcards allowed"
                    value="[% search_zone %]" />
-            <input type="checkbox" id="exact_zone" name="exact_zone" [% IF exact_zone %]checked="checked"[% END %] />
+            <input type="checkbox" class="checkbox" id="exact_zone" name="exact_zone"
+                   [% IF exact_zone %]checked="checked"[% END %] />
             <label for="exact_zone">exact match</label><br />
 
             <label class="search_label" for="search_by_detail">Zone detail:</label>
             <input type="text" id="search_by_detail" name="search_zone_detail" title="SQL wildcards allowed"
                    value="[% search_zone_detail %]" />
-            <input type="checkbox" id="exact_zone_detail" name="exact_zone_detail" [% IF exact_zone_detail %]checked="checked"[% END %] />
+            <input type="checkbox" class="checkbox" id="exact_zone_detail" name="exact_zone_detail"
+                   [% IF exact_zone_detail %]checked="checked"[% END %] />
             <label for="exact_zone_detail">exact match</label><br />
 
             <input type="submit" value="Search &#187;" class="but" />
diff --git a/root/tt/customer_detail.tt b/root/tt/customer_detail.tt
index f4b8619..c66c83d 100644
--- a/root/tt/customer_detail.tt
+++ b/root/tt/customer_detail.tt
@@ -174,7 +174,7 @@
                 <tr>
                   <td class="tdkey">newsletter:</td>
                   <td>
-                    <input type="checkbox" id="cont_newsletter" [% IF ! edit_contact %]class="disabled" disabled="disabled"[% END %]
+                    <input type="checkbox" class="checkbox" id="cont_newsletter" [% IF ! edit_contact %]disabled="disabled"[% END %]
                            name="newsletter" [% IF customer.contact.newsletter %]checked="checked"[% END %] />
                   </td>
                 </tr>
@@ -265,7 +265,7 @@
               <tr>
                 <td class="tdkey">newsletter:</td>
                 <td>
-                  <input type="checkbox" id="comm_newsletter" [% IF ! edit_commercial %]class="disabled" disabled="disabled"[% END %]
+                  <input type="checkbox" class="checkbox" id="comm_newsletter" [% IF ! edit_commercial %]disabled="disabled"[% END %]
                          name="newsletter" [% IF customer.comm_contact.newsletter %]checked="checked"[% END %] />
                 </td>
               </tr>
@@ -349,7 +349,7 @@
               <tr>
                 <td class="tdkey">newsletter:</td>
                 <td>
-                  <input type="checkbox" id="tech_newsletter" [% IF ! edit_technical %]class="disabled" disabled="disabled"[% END %]
+                  <input type="checkbox" class="checkbox" id="tech_newsletter" [% IF ! edit_technical %]disabled="disabled"[% END %]
                          name="newsletter" [% IF customer.tech_contact.newsletter %]checked="checked"[% END %] />
                 </td>
               </tr>
diff --git a/root/tt/fee_edit.tt b/root/tt/fee_edit.tt
index 656151a..0f5b5ae 100644
--- a/root/tt/fee_edit.tt
+++ b/root/tt/fee_edit.tt
@@ -142,7 +142,7 @@
               <tr>
                 <td class="tdkey">use free time:</td>
                 <td>
-                  <input type="checkbox" name="use_free_time" title="free minutes may be used when calling this destination"
+                  <input type="checkbox" class="checkbox" name="use_free_time" title="free minutes may be used when calling this destination"
                          [% IF fee.use_free_time %]checked="checked"[% END %] />
                 </td>
               </tr>
diff --git a/root/tt/lnp.tt b/root/tt/lnp.tt
index 2290595..3a5521f 100644
--- a/root/tt/lnp.tt
+++ b/root/tt/lnp.tt
@@ -127,7 +127,7 @@
             <label class="search_label" for="search_by_number">Number:</label>
             <input type="text" id="search_by_number" name="search_number" title="SQL wildcards allowed"
                    value="[% searched_numbers.number %]" />
-            <input type="checkbox" id="exact_number" name="exact_number"
+            <input type="checkbox" class="checkbox" id="exact_number" name="exact_number"
                    [% IF searched_numbers.exact_number %]checked="checked"[% END %] />
             <label for="exact_number">exact match</label><br />
 
diff --git a/root/tt/ncos_lists.tt b/root/tt/ncos_lists.tt
index 1de3889..1ffdae4 100644
--- a/root/tt/ncos_lists.tt
+++ b/root/tt/ncos_lists.tt
@@ -107,7 +107,7 @@
           [% IF messages.lacerr %]<div class="errormsg">[% messages.lacerr %]</div>[% END %]
           <form action="/ncos/save_local_ac" method="post">
             <input type="hidden" name="level" value="[% level.level %]" />
-            <input type="checkbox" id="local_ac" name="local_ac" [% IF level.local_ac %]checked="checked"[% END %] />
+            <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">
               <label for="lacsave">save</label>
diff --git a/root/tt/number.tt b/root/tt/number.tt
index b564fb4..db1f867 100644
--- a/root/tt/number.tt
+++ b/root/tt/number.tt
@@ -63,19 +63,19 @@
             <label class="search_label" for="search_by_cc">cc:</label>
             <input type="text" id="search_by_cc" name="search_cc" title="SQL wildcards allowed"
                    value="[% search_cc %]" />
-            <input type="checkbox" id="exact_cc" name="exact_cc" [% IF exact_cc %]checked="checked"[% END %] />
+            <input type="checkbox" class="checkbox" id="exact_cc" name="exact_cc" [% IF exact_cc %]checked="checked"[% END %] />
             <label for="exact_cc">exact match</label><br />
 
             <label class="search_label" for="search_by_ac">ac:</label>
             <input type="text" id="search_by_ac" name="search_ac" title="SQL wildcards allowed"
                    value="[% search_ac %]" />
-            <input type="checkbox" id="exact_ac" name="exact_ac" [% IF exact_ac %]checked="checked"[% END %] />
+            <input type="checkbox" class="checkbox" id="exact_ac" name="exact_ac" [% IF exact_ac %]checked="checked"[% END %] />
             <label for="exact_ac">exact match</label><br />
 
             <label class="search_label" for="search_by_sn_prefix">sn_prefix:</label>
             <input type="text" id="search_by_sn_prefix" name="search_sn_prefix" title="SQL wildcards allowed"
                    value="[% search_sn_prefix %]" />
-            <input type="checkbox" id="exact_sn_prefix" name="exact_sn_prefix" [% IF exact_sn_prefix %]checked="checked"[% END %] />
+            <input type="checkbox" class="checkbox" id="exact_sn_prefix" name="exact_sn_prefix" [% IF exact_sn_prefix %]checked="checked"[% END %] />
             <label for="exact_sn_prefix">exact match</label><br />
 
             <label class="search_label" for="search_by_sn_length">sn_length:</label>
diff --git a/root/tt/subscriber.tt b/root/tt/subscriber.tt
index 876a9a7..2d26e97 100644
--- a/root/tt/subscriber.tt
+++ b/root/tt/subscriber.tt
@@ -4,26 +4,26 @@
 
             <label class="search_label" for="search_by_username">Username:</label>
             <input type="text" id="search_by_username" name="search_username" value="[% search_username %]" />
-            <input type="checkbox" id="exact_username" name="exact_username" [% IF exact_username %]checked="checked"[% END %] />
+            <input type="checkbox" class="checkbox" id="exact_username" name="exact_username" [% IF exact_username %]checked="checked"[% END %] />
             <label for="exact_username">exact match</label><br />
 
             <label class="search_label" for="search_by_domain">Domain:</label>
             <input type="text" id="search_by_domain" name="search_domain" value="[% search_domain %]" />
-            <input type="checkbox" id="exact_domain" name="exact_domain" [% IF exact_domain %]checked="checked"[% END %] />
+            <input type="checkbox" class="checkbox" id="exact_domain" name="exact_domain" [% IF exact_domain %]checked="checked"[% END %] />
             <label for="exact_domain">exact match</label><br />
 
             <label class="search_label" for="search_by_number">E.164 number:</label>
             <input type="text" id="search_by_number" name="search_number" value="[% search_number %]" />
-            <input type="checkbox" id="exact_number" name="exact_number" [% IF exact_number %]checked="checked"[% END %] />
+            <input type="checkbox" class="checkbox" id="exact_number" name="exact_number" [% IF exact_number %]checked="checked"[% END %] />
             <label for="exact_number">exact match</label><br />
 
             <label class="search_label" for="search_by_uuid">UUID:</label>
             <input type="text" id="search_by_uuid" name="search_uuid" value="[% search_uuid %]" />
-            <input type="checkbox" id="exact_uuid" name="exact_uuid" [% IF exact_uuid %]checked="checked"[% END %] />
+            <input type="checkbox" class="checkbox" id="exact_uuid" name="exact_uuid" [% IF exact_uuid %]checked="checked"[% END %] />
             <label for="exact_uuid">exact match</label><br />
 
             <div class="topbottomspace">
-              <input type="checkbox" id="include_terminated" name="terminated" [% IF terminated %]checked="checked"[% END %] />
+              <input type="checkbox" class="checkbox" id="include_terminated" name="terminated" [% IF terminated %]checked="checked"[% END %] />
               <label for="include_terminated">include terminated subscribers</label><br />
             </div>
 
diff --git a/root/tt/subscriber_preferences.tt b/root/tt/subscriber_preferences.tt
index c3dea3b..8b7de19 100644
--- a/root/tt/subscriber_preferences.tt
+++ b/root/tt/subscriber_preferences.tt
@@ -28,7 +28,7 @@
           [% IF edit_preferences && prov_error %]<div class="errormsg">[% prov_error %]</div>[% END %]
             <form action="update_preferences" method="post">
               <input type="hidden" name="subscriber_id" value="[% subscriber.subscriber_id %]" />
-              <table>
+              <table class="usr_preferences">
             [% FOREACH preference = subscriber.preferences_array %]
               [% IF preference.max_occur == 1 %]
                 [% IF preference.key == "block_in_mode" || preference.key == "block_out_mode"
@@ -95,33 +95,25 @@
                   <td class="tdkey">[% preference.key %]:</td>
                   <td>
                   [% IF edit_preferences %]
-                    <label for="[% preference.key %]disable">
-                      <input type="radio" id="[% preference.key %]disable" value="disable" name="[% preference.key %]_target" class="radio"
-                        [% IF preference.value == "" && ! preference.error %]checked="checked"[% END %] />
-                      disable
-                    </label>
+                    <input type="radio" id="[% preference.key %]disable" value="disable" name="[% preference.key %]_target" class="radio"
+                           [% IF preference.value == "" && ! preference.error %]checked="checked"[% END %] />
+                    <label for="[% preference.key %]disable">disable</label>
                     <br clear="all" />
                     [% IF Catalyst.config.voicemail_features %]
-                    <label for="[% preference.key %]voicebox">
-                      <input type="radio" id="[% preference.key %]voicebox" value="voicebox" name="[% preference.key %]_target" class="radio"
-                        [% IF preference.value == "voicebox" %]checked="checked"[% END %] />
-                      Voicebox
-                    </label>
+                    <input type="radio" id="[% preference.key %]voicebox" value="voicebox" name="[% preference.key %]_target" class="radio"
+                           [% IF preference.value == "voicebox" %]checked="checked"[% END %] />
+                    <label for="[% preference.key %]voicebox">Voicebox</label>
                     <br clear="all" />
                     [% END %]
                     [% IF Catalyst.config.fax_features %]
-                    <label for="[% preference.key %]faxserver">
-                      <input type="radio" id="[% preference.key %]faxserver" value="fax2mail" name="[% preference.key %]_target" class="radio"
-                        [% IF preference.value == "fax2mail" %]checked="checked"[% END %] />
-                      Fax2Mail
-                    </label>
+                    <input type="radio" id="[% preference.key %]faxserver" value="fax2mail" name="[% preference.key %]_target" class="radio"
+                           [% IF preference.value == "fax2mail" %]checked="checked"[% END %] />
+                    <label for="[% preference.key %]faxserver">Fax2Mail</label>
                     <br clear="all" />
                     [% END %]
-                    <label for="[% preference.key %]sipuri">
-                      <input type="radio" id="[% preference.key %]sipuri" value="sipuri" name="[% preference.key %]_target" class="radio"
-                        [% IF (preference.value || preference.error) && preference.value != "voicebox" && preference.value != "fax2mail" %]checked="checked"[% END %] />
-                        number or SIP-URI:
-                    </label>
+                    <input type="radio" id="[% preference.key %]sipuri" value="sipuri" name="[% preference.key %]_target" class="radio"
+                           [% IF (preference.value || preference.error) && preference.value != "voicebox" && preference.value != "fax2mail" %]checked="checked"[% END %] />
+                    <label for="[% preference.key %]sipuri">number or SIP-URI:</label>
                     <input type="text" id="[% preference.key %]sipuritxt" name="[% preference.key %]_sipuri" size="25"
                            value="[% preference.value UNLESS preference.value == "voicebox" OR preference.value == "fax2mail" %]" />
                   [% ELSE %]