diff --git a/views/leases/move_in.ctp b/views/leases/move_in.ctp
index e8dcd2b..76be016 100644
--- a/views/leases/move_in.ctp
+++ b/views/leases/move_in.ctp
@@ -139,8 +139,15 @@ echo $form->input("Lease.unit_id",
 			'type' => 'hidden',
 			'value' => 0));
 
-echo 'Date: <input id="datepicker" name="data[Lease][movein_date]" type="text" /><BR>' . "\n";
-echo 'Comment: <input id="comment" name="data[Lease][comment]" type="text" SIZE=80 /><BR>' . "\n";
+echo $this->element('form_table',
+		    array('class'  => "item move-in entry",
+			  'field_prefix' => 'Lease',
+			  'fields' => array
+			  ("movein_date" => array('opts' => array('type' => 'text',
+								  'id' => 'datepicker')),
+			   "comment" => array('opts' => array('size' => 50)),
+			   )));
+		  
 echo $form->end('Move In Customer');
 
 ?>
diff --git a/views/leases/move_out.ctp b/views/leases/move_out.ctp
index db4a657..bf976ac 100644
--- a/views/leases/move_out.ctp
+++ b/views/leases/move_out.ctp
@@ -39,6 +39,17 @@ echo('<P>Be sure that you really want to move this customer out, ' .
      'and press the "Perform Move Out" button.' . "\n");
 echo '<P><BR>' . "\n";
 
+?>
+
+<script type="text/javascript"><!--
+
+// Reset the form
+function resetForm() {
+}
+--></script>
+
+<?php
+
 echo $form->create(null, array('id' => 'move-out-form',
 			       'url' => array('controller' => 'leases',
 					      'action' => 'move_out')));
@@ -46,7 +57,6 @@ echo $form->create(null, array('id' => 'move-out-form',
 // REVISIT <AP>: 20090702
 //  Ask how to handle the security deposit
 //  (apply to rent, damages, cleaning, etc).
-//  Possibly provide a move-out date.
 //  Let user select the next unit status
 //  (DAMAGED, COMPANY, UNAVAILABLE, RESERVED, DIRTY, VACANT)
 
@@ -65,6 +75,14 @@ else {
 			  ));
 }
 
+echo $this->element('form_table',
+		    array('class'  => "item move-out entry",
+			  'field_prefix' => 'Lease',
+			  'fields' => array
+			  ("moveout_date" => array('opts' => array('type' => 'text',
+								   'id' => 'datepicker')),
+			   )));
+
 // Set up a redirect page.  I use lower case 'redirect' here
 // to avoid the model convention, which starts with upper-case.
 foreach ($redirect AS $name => $value) {
@@ -75,6 +93,18 @@ foreach ($redirect AS $name => $value) {
 }
 
 echo $form->end('Perform Move Out');
+?>
 
-// End page div
-echo '</div>' . "\n";
+<script type="text/javascript"><!--
+  $(document).ready(function(){
+      $("#datepicker").datepicker({ constrainInput: true,
+	                            numberOfMonths: [1, 1],
+                                    showCurrentAtPos: 0,
+                                    dateFormat: 'mm/dd/yy' })
+	.datepicker('setDate', '+0');
+
+      resetForm();
+  });
+--></script>
+
+</div>