diff --git a/site/controllers/units_controller.php b/site/controllers/units_controller.php
index 9d25f1e..92db2ef 100644
--- a/site/controllers/units_controller.php
+++ b/site/controllers/units_controller.php
@@ -269,7 +269,7 @@ class UnitsController extends AppController {
     $this->data = $this->Unit->find
       ('first',
        array('contain' => array('Lock' => array('id')),
-	     'fields' => array('id'),
+	     'fields' => array('id', 'name'),
 	     'conditions' => array('Unit.id' => $id)
 	     ));
 
diff --git a/site/views/units/lock.ctp b/site/views/units/lock.ctp
index 1b85205..37c92ad 100644
--- a/site/views/units/lock.ctp
+++ b/site/views/units/lock.ctp
@@ -25,11 +25,8 @@ function lockDiv($obj) {
 	   'field_prefix' => 'Lock.%{id}',
 	   'fields' => array
 	   (
-	    'id' => array('name' => 'Lock',
-			  'label_attributes' => array('class' => 'required'),
-			  'opts' => array('options' => $obj->varstore['locks']),
-			  'after' => "Select the lock."),
-
+	    'id' => array('name' => 'Select Lock',
+			  'opts' => array('options' => $obj->varstore['locks'])),
 	    ))) . "\n" .
     
     // END lock-n-div
@@ -117,14 +114,12 @@ echo $form->hidden('id') . "\n";
 ?>
 
 <div CLASS="dynamic-set">
-<fieldset CLASS="lock superset">
- <legend>Locks</legend>
+ <h3>Set Locks on Unit <?php echo $this->data['Unit']['name']; ?></h3>
  <input type="hidden" id="lock-entry-id" value="0">
  <div id="locks"></div>
   <fieldset> <legend>
    <a href="#" onClick="addLock(true); return false;">Add a Lock</a>
   </legend> </fieldset>
-</fieldset>
 </div>
 
 <?php