diff --git a/lib/admin/Controller/account.pm b/lib/admin/Controller/account.pm
index c645e63..ab0bb88 100644
--- a/lib/admin/Controller/account.pm
+++ b/lib/admin/Controller/account.pm
@@ -126,7 +126,7 @@ sub detail : Local {
             or $#{$c->session->{voip_account}{subscribers}} == -1;
 
     $c->stash->{account} = $c->session->{voip_account};
-#    $c->stash->{account}{is_locked} = 1 if $c->session->{voip_account}{status} eq 'locked';
+    $c->stash->{account}{is_locked} = 1 if $c->session->{voip_account}{status} eq 'locked';
 
     return 1;
 }
@@ -221,6 +221,31 @@ sub lock : Local {
     $c->response->redirect("/account/detail?account_id=$account_id");
 }
 
+=head2 activate
+
+Activates an account by calling finish on it.
+
+=cut
+
+sub activate : Local {
+    my ( $self, $c ) = @_;
+
+    my %messages;
+
+    my $account_id = $c->request->params->{account_id};
+
+    if($c->model('Provisioning')->call_prov( $c, 'billing', 'activate_voip_account',
+                                             { id => $account_id },
+                                             undef))
+    {
+        $messages{topmsg} = 'Web.Account.Activated';
+    }
+
+    $c->session->{messages} = \%messages;
+    $c->response->redirect("/account/detail?account_id=$account_id");
+    return;
+}
+
 =head2 terminate
 
 Terminates an account.
@@ -249,7 +274,7 @@ sub terminate : Local {
     return;
 }
 
-=head2 update_account
+=head2 update_balance
 
 Update a VoIP account cash and free time balance.
 
diff --git a/lib/admin/Controller/customer.pm b/lib/admin/Controller/customer.pm
index cf8e38e..3534485 100644
--- a/lib/admin/Controller/customer.pm
+++ b/lib/admin/Controller/customer.pm
@@ -131,7 +131,8 @@ sub detail : Local {
     }
 
     $c->stash->{show_pass} = $c->request->params->{show_pass};
-    $c->stash->{edit_customer} = $c->request->params->{edit_customer};
+# there's currently nothing to edit
+#    $c->stash->{edit_customer} = $c->request->params->{edit_customer};
     $c->stash->{edit_contact} = $c->request->params->{edit_contact};
     $c->stash->{edit_commercial} = $c->request->params->{edit_commercial};
     $c->stash->{edit_technical} = $c->request->params->{edit_technical};
diff --git a/root/tt/account_detail.tt b/root/tt/account_detail.tt
index 2b2d2c8..e804e63 100644
--- a/root/tt/account_detail.tt
+++ b/root/tt/account_detail.tt
@@ -4,36 +4,43 @@
         </h3>
 
         [% IF ! account.terminate_timestamp %]
-        <div class="actions">
-        [% IF billing_features %]
-          <a href="detail?account_id=[% account.id %]&amp;edit_account=1" class="aaction">edit</a>
-        [% END %]
-        [% IF edit_account %]
-          <a href="detail?account_id=[% account.id %]" class="aaction">cancel</a>
-        [% ELSE %]
-          [% IF account.is_locked %]
-          <a href="lock?account_id=[% account.id %]&amp;lock=none" class="aaction">unlock</a>
+          <div class="actions">
+          [% IF billing_features %]
+            <a href="detail?account_id=[% account.id %]&amp;edit_account=1" class="aaction">edit</a>
+          [% END %]
+          [% IF edit_account %]
+            <a href="detail?account_id=[% account.id %]" class="aaction">cancel</a>
           [% ELSE %]
-          <a href="lock?account_id=[% account.id %]&amp;lock=global" class="aaction">lock</a>
+            [% IF account.status == "pending" %]
+              <a href="activate?account_id=[% account.id %]" class="aaction">activate</a>
+            [% ELSE %]
+              [% IF account.is_locked %]
+              <a href="lock?account_id=[% account.id %]&amp;lock=none" class="aaction">unlock</a>
+              [% ELSE %]
+              <a href="lock?account_id=[% account.id %]&amp;lock=global" class="aaction">lock</a>
+              [% END %]
+              <a href="terminate?account_id=[% account.id %]" class="aaction">terminate</a>
+            [% END %]
           [% END %]
-          <a href="terminate?account_id=[% account.id %]" class="aaction">terminate</a>
-        [% END %]
-        </div>
+          </div>
         [% END %]
         <div class="p1">
         [% IF account.is_locked %]
-          <div class="alert">Account is LOCKED!</div>
+          <div class="alert">Account is locked!</div>
+        [% END %]
+        [% IF account.status == "pending" %]
+          <div class="alert">Account is in pending state!</div>
         [% END %]
           [% IF messages.accmsg %]<div class="goodmsg">[% messages.accmsg %]</div>[% END %]
           [% IF messages.accerr %]<div class="errormsg">[% messages.accerr %]</div>[% END %]
           <form action="update_account" method="post">
             <input type="hidden" name="account_id" value="[% account.id %]" />
             <table>
-              <tr><td class="tdkey">ID:</td><td>[% account.id %]</td></tr>
+              <tr><td class="tdkey">ContractID:</td><td>[% account.id %]</td></tr>
 
             [% IF billing_features %]
               <tr>
-                <td class="tdkey">customer:</td>
+                <td class="tdkey">CustomerID:</td>
                 <td>
                   [% IF account.customer_id %]
                   <a href="/customer/detail?customer_id=[% account.customer_id %]">[% account.customer_id %]</a>
diff --git a/root/tt/customer_detail.tt b/root/tt/customer_detail.tt
index f750509..08dbf74 100644
--- a/root/tt/customer_detail.tt
+++ b/root/tt/customer_detail.tt
@@ -3,13 +3,14 @@
           #[% customer.id %]</a>
         </h3>
 
+<!--
         <div class="actions">
           <a href="detail?customer_id=[% customer.id %]&amp;edit_customer=1" class="aaction">edit</a>
         [% IF edit_customer %]
           <a href="detail?customer_id=[% customer.id %]" class="aaction">cancel</a>
         [% END %]
         </div>
-
+-->
         <div class="p1">
           [% IF messages.custmsg %]<div class="goodmsg">[% messages.custmsg %]</div>[% END %]
           [% IF messages.custerr %]<div class="errormsg">[% messages.custerr %]</div>[% END %]
@@ -18,14 +19,14 @@
             <table>
               <tr><td class="tdkey">CustomerID:</td><td>[% customer.id %]</td></tr>
               <tr>
-                <td class="tdkey">shopuser:</td>
+                <td class="tdkey">shop user:</td>
                 <td>
                 <input type="text" id="shopuser" [% IF ! edit_customer %]class="disabled" disabled="disabled"[% END %]
                        name="shopuser" value="[% customer.shopuser %]" />
                 </td>
               </tr>
               <tr>
-                <td class="tdkey">shoppass:</td>
+                <td class="tdkey">shop password:</td>
                 <td>
                 [% IF edit_customer %]
                   <input type="text" id="shoppass" name="shoppass" value="[% customer.edit_shoppass %]" />
@@ -341,7 +342,7 @@
                   [% contract.product %]
                 [% END %]
               </td>
-              <td>[% contract.status %]</td>
+              <td [% IF contract.status != "active" %]class="alert"[% END %]>[% contract.status %]</td>
               <td>[% contract.create_timestamp %]</td>
             </tr>
           [% END %]
diff --git a/root/tt/subscriber_detail.tt b/root/tt/subscriber_detail.tt
index 468b695..2a3ca60 100644
--- a/root/tt/subscriber_detail.tt
+++ b/root/tt/subscriber_detail.tt
@@ -40,31 +40,36 @@
             <input type="hidden" name="subscriber_id" value="[% subscriber.subscriber_id %]" />
             <input type="hidden" name="account_id" value="[% account_id %]" />
             <table class="table">
-              <tr><td class="tdkey">ID:</td><td>[% subscriber.subscriber_id %]</td></tr>
+              <tr><td class="tdkey">SubscriberID:</td><td>[% subscriber.subscriber_id %]</td></tr>
               <tr>
-                <td class="tdkey">account ID:</td>
+                <td class="tdkey">ContractID:</td>
                 <td>
                   <a href="/account/detail?account_id=[% subscriber.account_id || account_id %]">
                     [% subscriber.account_id || account_id %]</a>
                 </td>
               </tr>
-              <tr><td class="tdkey">user:</td><td>[% subscriber.webusername %]</td></tr>
-              [% IF subscriber.subscriber_id %]
-              <tr><td class="tdkey">SIP URI:</td><td>[% subscriber.username %]@[% subscriber.domain %]</td></tr>
-              [% ELSE %]
+
+              <tr><td class="tdkey">web user:</td><td>[% subscriber.webusername %]</td></tr>
               <tr>
-                <td class="tdkey">SIP URI:</td>
+                <td class="tdkey">web password:</td>
                 <td>
-                  <input type="text" name="username" value="[% subscriber.username %]" />
-                  @
-                  <select size="1" name="domain">
-                  [% FOREACH sdom = domains %]
-                    <option>[% sdom.domain %]</option>
+                [% IF edit_subscriber %]
+                  <input type="text" name="webpassword" id="edit_webpass" value="[% subscriber.edit_webpass %]" />
+                [% ELSE %]
+                  <input type="text" id="edit_webpass" class="disabled" disabled="disabled"
+                  [% IF show_webpass %]
+                    value="[% subscriber.webpassword %]" /> <a href="?subscriber_id=[% subscriber.subscriber_id %]" class="apass">Hide</a>
+                  [% ELSE %]
+                    [% IF subscriber.webpassword %]
+                      value="********" /> <a href="?subscriber_id=[% subscriber.subscriber_id %]&amp;show_webpass=1" class="apass">Show</a>
+                    [% ELSE %]
+                      value="" />
+                    [% END %]
                   [% END %]
-                  </select>
+                [% END %]
                 </td>
               </tr>
-              [% END %]
+
               <tr>
                 <td class="tdkey">E.164 number:</td>
                 <td>
@@ -86,25 +91,23 @@
               [% IF messages.number_cc %]<tr><td /><td><div class="errormsg">[% messages.number_cc %]</div></td></tr>[% END %]
               [% IF messages.number_ac %]<tr><td /><td><div class="errormsg">[% messages.number_ac %]</div></td></tr>[% END %]
               [% IF messages.number_sn %]<tr><td /><td><div class="errormsg">[% messages.number_sn %]</div></td></tr>[% END %]
+
+              [% IF subscriber.subscriber_id %]
+              <tr><td class="tdkey">SIP URI:</td><td>[% subscriber.username %]@[% subscriber.domain %]</td></tr>
+              [% ELSE %]
               <tr>
-                <td class="tdkey">web password:</td>
+                <td class="tdkey">SIP URI:</td>
                 <td>
-                [% IF edit_subscriber %]
-                  <input type="text" name="webpassword" id="edit_webpass" value="[% subscriber.edit_webpass %]" />
-                [% ELSE %]
-                  <input type="text" id="edit_webpass" class="disabled" disabled="disabled"
-                  [% IF show_webpass %]
-                    value="[% subscriber.webpassword %]" /> <a href="?subscriber_id=[% subscriber.subscriber_id %]" class="apass">Hide</a>
-                  [% ELSE %]
-                    [% IF subscriber.webpassword %]
-                      value="********" /> <a href="?subscriber_id=[% subscriber.subscriber_id %]&amp;show_webpass=1" class="apass">Show</a>
-                    [% ELSE %]
-                      value="" />
-                    [% END %]
+                  <input type="text" name="username" value="[% subscriber.username %]" />
+                  @
+                  <select size="1" name="domain">
+                  [% FOREACH sdom = domains %]
+                    <option>[% sdom.domain %]</option>
                   [% END %]
-                [% END %]
+                  </select>
                 </td>
               </tr>
+              [% END %]
               <tr>
                 <td class="tdkey">SIP password:</td>
                 <td>