diff --git a/site/views/customers/receipt.ctp b/site/views/customers/receipt.ctp
index 4901e19..ff121cd 100644
--- a/site/views/customers/receipt.ctp
+++ b/site/views/customers/receipt.ctp
@@ -111,19 +111,8 @@ function onGridLoadComplete() {
 function onRowSelect(grid_id, customer_id) {
   // Set the customer id that will be returned with the form
   $("#customer-id").val(customer_id);
-  
-  // Get the item names from the grid
-  //$("#receipt-customer-id").html($(grid_id).getCell(customer_id, 'Customer-id'));
-  // REVISIT <AP>: 20090708
-  //   This is not intended as a long term solution,
-  //   but I need a way to enter data and then view
-  //   the results.  This link will help.
-  $("#receipt-customer-id").html('<A HREF="' +
-				 "<?php echo $html->url(array('controller' => 'customers',
-		                                              'action'     => 'view')); ?>"
-				 + "/" + customer_id + '">' +
-				 '#' + customer_id +
-				 '</A>');
+
+  // Set the customer name, so the user knows who the receipt is for
   $("#receipt-customer-name").html($(grid_id).getCell(customer_id, 'Customer-name'));
 
   // Hide the "no customer" message and show the current customer
@@ -271,8 +260,7 @@ echo $this->element('customers', array
 echo ('<DIV CLASS="receipt grid-selection-text">' .
 
       '<DIV CLASS="customer-selection-valid" style="display:none">' .
-      'Customer <SPAN id="receipt-customer-id"></SPAN>' .
-      ': <SPAN id="receipt-customer-name"></SPAN>' .
+      'Customer: <SPAN id="receipt-customer-name"></SPAN>' .
 
 /*       '<DIV CLASS="supporting">' . */
 /*       '<TABLE>' . */
@@ -382,22 +370,12 @@ Configure::write('debug', '0');
                       showCurrentAtPos: 0,
                       dateFormat: 'mm/dd/yy' });
 
-      $("#receipt-customer-id").html("INTERNAL ERROR");
       $("#receipt-customer-name").html("INTERNAL ERROR");
       $("#receipt-balance").html("INTERNAL ERROR");
       $("#receipt-charges-caption").html("Outstanding Charges");
 
       <?php if (isset($customer['id'])): ?>
       $("#customer-id").val(<?php echo $customer['id']; ?>);
-      //$("#receipt-customer-id").html("<?php echo '#'.$customer['id']; ?>");
-      $("#receipt-customer-id").html('<A HREF="' +
-				     "<?php echo $html->url(array('controller' => 'customers',
-		                                                  'action'     => 'view')); ?>"
-				     + "/" +
-				     "<?php echo $customer['id']; ?>" +
-				     '">#' +
-				     "<?php echo $customer['id']; ?>" +
-				     '</A>');
       $("#receipt-customer-name").html("<?php echo $customer['name']; ?>");
       $("#receipt-balance").html(fmtCurrency("<?php echo $stats['balance']; ?>"));
       onGridState(null, 'hidden');
diff --git a/site/views/elements/leases.ctp b/site/views/elements/leases.ctp
index cdd4602..af17b33 100644
--- a/site/views/elements/leases.ctp
+++ b/site/views/elements/leases.ctp
@@ -2,7 +2,6 @@
 
 // Define the table columns
 $cols = array();
-$cols['LeaseID']   = array('index' => 'Lease.id',            'hidden' => true);
 $cols['Lease']     = array('index' => 'Lease.number',        'formatter' => 'id');
 $cols['Unit']      = array('index' => 'Unit.name',           'width' => '50',  'align' => 'center');
 $cols['Customer']  = array('index' => 'Customer.name',       'formatter' => 'longname');
@@ -29,8 +28,8 @@ if (!empty($this->params['action'])) {
 // Render the grid
 $grid
 ->columns($cols)
-->sortField('LeaseID')
-->defaultFields(array('LeaseID', 'Lease'))
+->sortField('Lease')
+->defaultFields(array('Lease'))
 ->searchFields(array('Customer', 'Unit'))
 ->render($this, isset($config) ? $config : null,
 	 array_diff(array_keys($cols), array('Signed', 'Status', 'Comment')));
diff --git a/site/views/leases/invoice.ctp b/site/views/leases/invoice.ctp
index 8f5c5f6..bc48cc8 100644
--- a/site/views/leases/invoice.ctp
+++ b/site/views/leases/invoice.ctp
@@ -99,20 +99,7 @@ function onRowSelect(grid_id, lease_id) {
   // Set the item id that will be returned with the form
   $("#lease-id").val(lease_id);
 
-  // Get the item names from the grid
-  //$("#invoice-lease").html($(grid_id).getCell(lease_id, 'Lease-number'));
-  // REVISIT <AP>: 20090708
-  //   This is not intended as a long term solution,
-  //   but I need a way to enter data and then view
-  //   the results.  This link will help.
-  $("#invoice-lease").html('<A HREF="' +
-			   "<?php echo $html->url(array('controller' => 'leases',
-		                                        'action'     => 'view')); ?>"
-			   + "/" +
-			   $(grid_id).getCell(lease_id, 'Lease-id').replace(/^#/,'') +
-			   '">' +
-			   $(grid_id).getCell(lease_id, 'Lease-number') +
-			   '</A>');
+  $("#invoice-lease").html($(grid_id).getCell(lease_id, 'Lease-number'));
   $("#invoice-unit").html($(grid_id).getCell(lease_id, 'Unit-name'));
   $("#invoice-customer").html($(grid_id).getCell(lease_id, 'Customer-name'));
   $("#invoice-rent").html($(grid_id).getCell(lease_id, 'Lease-rent'));
@@ -399,15 +386,7 @@ Configure::write('debug', '0');
 
       <?php if (isset($lease['id'])): ?>
       $("#lease-id").val(<?php echo $lease['id']; ?>);
-      //$("#invoice-lease").html("<?php echo '#'.$lease['number']; ?>");
-      $("#invoice-lease").html('<A HREF="' +
-			       "<?php echo $html->url(array('controller' => 'leases',
-		                                            'action'     => 'view')); ?>"
-			       + "/" +
-			       "<?php echo $lease['id']; ?>" +
-			       '">#' +
-			       "<?php echo $lease['number']; ?>" +
-			       '</A>');
+      $("#invoice-lease").html("<?php echo '#'.$lease['number']; ?>");
       $("#invoice-unit").html("<?php echo $unit['name']; ?>");
       $("#invoice-customer").html("<?php echo $customer['name']; ?>");
       $("#invoice-rent").html("<?php echo FormatHelper::currency($lease['rent']); ?>");