diff --git a/site/controllers/customers_controller.php b/site/controllers/customers_controller.php
index 13f3f4e..4a0bf71 100644
--- a/site/controllers/customers_controller.php
+++ b/site/controllers/customers_controller.php
@@ -2,11 +2,11 @@
 
 class CustomersController extends AppController {
   var $sidemenu_links =
-    array(array('name' => 'Tenants',       'header' => true),
+    array(array('name' => 'Customers',     'header' => true),
           array('name' => 'Current',       'url' => array('controller' => 'customers', 'action' => 'current')),
           array('name' => 'Past',          'url' => array('controller' => 'customers', 'action' => 'past')),
           array('name' => 'All',           'url' => array('controller' => 'customers', 'action' => 'all')),
-          array('name' => 'Add Tenant',    'url' => array('controller' => 'customers', 'action' => 'add')),
+          array('name' => 'Add Customer',  'url' => array('controller' => 'customers', 'action' => 'add')),
           );
 
   //var $components = array('RequestHandler');
@@ -27,13 +27,13 @@ class CustomersController extends AppController {
    **************************************************************************
    **************************************************************************
    * action: index / current / past / all
-   *  - Creates a list of tenants
+   *  - Creates a list of customers
    */
 
   function index()   { $this->current(); }
   function current() { $this->jqGridView('Current Tenants'); }
   function past()    { $this->jqGridView('Past Tenants'); }
-  function all()     { $this->jqGridView('All Tenants', 'all'); }
+  function all()     { $this->jqGridView('All Customers', 'all'); }
 
 
   /**************************************************************************
@@ -236,12 +236,6 @@ class CustomersController extends AppController {
 	    'url' => array('action' => 'edit',
 			   $id));
 
-    $this->sidemenu_links[] =
-      array('name' => 'Add Contact',
-	    'url' => array('controller' => 'contacts',
-			   'action' => 'add',
-			   $id));
-
     $this->sidemenu_links[] =
       array('name' => 'Move-In',
 	    'url' => array('action' => 'move_in',
diff --git a/site/views/contacts/edit.ctp b/site/views/contacts/edit.ctp
index 86e0592..5574fd9 100644
--- a/site/views/contacts/edit.ctp
+++ b/site/views/contacts/edit.ctp
@@ -45,7 +45,6 @@ function contactMethodDiv($obj, $type, $legend, $values = null) {
 	' CLASS="'.$type.'-method-%{id}-source" ' . "\n" .
 	' ID="'.$type.'-method-%{id}-source-'.$stype.'"' . "\n" .
 	' VALUE="'.$stype.'"' . "\n" .
-	//' CHECKED' . "\n" .
 	' />' . "\n" .
 	' <LABEL FOR="'.$type.'-method-%{id}-source-'.$stype.'">'.$sname.'</LABEL>' . "\n" .
 	' ';
@@ -70,10 +69,6 @@ function contactMethodDiv($obj, $type, $legend, $values = null) {
     // BEGIN method-div
     '<div id="'.$type.'-%{id}-method-div"' . "\n" .
 
-/*     (isset($values) */
-/*      ? '<input type="hidden" name="data[Contact'.ucfirst($type).'][%{id}][ContactsMethod][id]" value="'.$values['ContactsMethod']['id'].'"/>' . "\n" */
-/*      : '') . */
-
     $obj->element
     ('form_table',
      array('class'  => "item contact-{$type} entry",
@@ -348,7 +343,7 @@ echo $form->input('id') . "\n";
 echo($this->element
      ('form_table',
       array('class'  => 'item contact detail',
-	    'caption' => $this->data ? 'Edit Contact' : 'New Contact',
+	    'caption' => isset($this->data['Contact']) ? 'Edit Contact' : 'New Contact',
 	    'fields' => array
 	    ('first_name' => null,
 	     'last_name' => null,
@@ -361,8 +356,6 @@ echo($this->element
 	     /* 'id_local_exp' => array('name' => 'ID Expiration', */
 	     /*			        'opts' => array('empty' => true)), */
 	     'comment' => null,
-	     //'' => null,
-	     //'' => '',
 	     ))) . "\n");
 
 echo $form->submit('Update') . "\n";
diff --git a/site/views/customers/edit.ctp b/site/views/customers/edit.ctp
index 970b0f5..b9c4ec9 100644
--- a/site/views/customers/edit.ctp
+++ b/site/views/customers/edit.ctp
@@ -67,16 +67,6 @@ function customerContactDiv($obj, $values = null, $primary = false) {
     // BEGIN contact-div
     '<div id="contact-%{id}-contact-div"' . "\n" .
 
-/*     '<INPUT TYPE="radio" ' . "\n" . */
-/*     ' NAME="data[Customer][primary_contact_entry]"' . "\n" . */
-/*     ' CLASS="contact-primary" ' . "\n" . */
-/*     ' ID="contact-primary-%{id}"' . "\n" . */
-/*     ' VALUE="%{id}"' . "\n" . */
-/*     //($primary ? ' CHECKED' . "\n" : "(\$(#contact-entry-id).val() == 1 ? ' CHECKED' : '')") . */
-/*     ($primary ? ' CHECKED' . "\n" : '' ) . */
-/*     ' />' . "\n" . */
-/*     ' <LABEL FOR="contact-primary-%{id}">Primary Contact</LABEL>' . "\n" . */
-
     $obj->element
     ('form_table',
      array('class'  => "item contact entry",
@@ -148,14 +138,8 @@ function customerContactTypeDiv($obj, $stype, $values = null) {
     $class = 'detail';
     $column_class = array('field', 'value');
     $rows = array(array('First Name',  $values['first_name']),
-		  //array('Middle Name', $values['middle_name']),
 		  array('Last Name',   $values['last_name']),
 		  array('Company',     $values['company_name']),
-		  //array('SSN',         $values['id_federal']),
-/* 		  array('ID',          ($values['id_local'] */
-/* 					. ($values['id_local'] */
-/* 					   ? " - ".$values['id_local_state'] */
-/* 					   : ""))), */
 		  array('Comment',     $values['comment']));
   }
   else {
@@ -261,7 +245,7 @@ echo $form->input('id') . "\n";
 echo($this->element
      ('form_table',
       array('class'  => 'item customer detail',
-	    'caption' => $this->data ? 'Edit Customer' : 'New Customer',
+	    'caption' => isset($this->data['Customer']) ? 'Edit Customer' : 'New Customer',
 	    'fields' => array
 	    ('name' => null,
 	     'comment' => null,
diff --git a/site/views/customers/view.ctp b/site/views/customers/view.ctp
index b6d18de..28e57e5 100644
--- a/site/views/customers/view.ctp
+++ b/site/views/customers/view.ctp
@@ -14,7 +14,7 @@ $rows = array(array('Name',    $customer['Customer']['name']),
 
 echo $this->element('table',
 		    array('class'   => 'item customer detail',
-			  'caption' => 'Tenant Info',
+			  'caption' => 'Customer Info',
 			  'rows'    => $rows,
 			  'column_class' => array('field', 'value')));
 
diff --git a/site/views/units/view.ctp b/site/views/units/view.ctp
index 83e3426..79e5f01 100644
--- a/site/views/units/view.ctp
+++ b/site/views/units/view.ctp
@@ -67,7 +67,7 @@ echo $this->element('leases',
 
 
 /**********************************************************************
- * Current Tenant Lease Account History
+ * Current Customer Lease Account History
  */
 if (isset($current_lease['id'])) {
     echo $this->element('ledger_entries',
diff --git a/site/webroot/css/layout.css b/site/webroot/css/layout.css
index 3709b11..23f5fa2 100644
--- a/site/webroot/css/layout.css
+++ b/site/webroot/css/layout.css
@@ -66,7 +66,7 @@ td.center      { text-align: center; }
 /************************************************************
  ************************************************************
  * Item detail formats
- * (such as Tenant Info, Unit Info, etc)
+ * (such as Customer Info, Unit Info, etc)
  */
 
 table.detail           { width :  60%;