=== modified file 'dhis-2/dhis-web/dhis-web-caseentry/src/main/resources/org/hisp/dhis/caseentry/i18n_module.properties'
--- dhis-2/dhis-web/dhis-web-caseentry/src/main/resources/org/hisp/dhis/caseentry/i18n_module.properties	2009-11-14 14:29:33 +0000
+++ dhis-2/dhis-web/dhis-web-caseentry/src/main/resources/org/hisp/dhis/caseentry/i18n_module.properties	2009-11-20 11:53:33 +0000
@@ -82,9 +82,9 @@
 search_result_matching_the_search_criteria = Result Matching the search criteria:
 registering_unit = Registering Unit
 select = Select
-name_based_data_entry_and_reports = Name-based Data Entry and Reports
+name_based_data_entry_and_reports = Name based data entry and reports
 reports = Reports
 report_management = Report Management
-name_based_data_entry = Name-based Data Entry
+name_based_data_entry = Name based data entry
 visit_plan = Visit Plans
 data_entry = Data Entry
\ No newline at end of file

=== modified file 'dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/listPatient.vm'
--- dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/listPatient.vm	2009-11-13 16:03:20 +0000
+++ dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/listPatient.vm	2009-11-20 11:53:33 +0000
@@ -30,7 +30,7 @@
 		  	<td></td>
 		  	<td></td>  		  	
 		  	<td colspan="2" style="text-align:right">  			
-				<input type="button" value="$i18n.getString( "cancel" )" onclick="window.location.href='select.action'" style="width:10em">
+				<input type="button" value="$i18n.getString( "cancel" )" onclick="window.location.href='dataEntrySelect.action'" style="width:60px">
 			</td>
           <tr>
             <th>$i18n.getString( "first_name" )</th>
@@ -80,20 +80,18 @@
     	#end
     	</tbody>
     
-	 </table>
-   </td>
-        <td style="width:20em; padding-left:2em; vertical-align:top">
-            <div id="detailsArea" style="display:none">
-                <div style="float:right">
-                    <a href="javascript:hideDetails()" title="$i18n.getString( "hide_details" )"><img src="../images/close.png" alt="$i18n.getString( "hide_details" )"></a>
-                </div>              
-                    <p><label>$i18n.getString( "identifier" ):</label><br><span id="identifierField"></span></p>                    
-                    <p><label>$i18n.getString( "attributes" ):</label><br><span id="attributeField"></span></p>
-                    <p><label>$i18n.getString( "enrolled_in_program" ):</label><br><span id="programField"></span></p>
-                </div>
-
-        </td>
-
+	  </table>
+    </td>
+    <td style="width:20em; padding-left:2em; vertical-align:top">
+        <div id="detailsArea" style="display:none">
+            <div style="float:right">
+                <a href="javascript:hideDetails()" title="$i18n.getString( "hide_details" )"><img src="../images/close.png" alt="$i18n.getString( "hide_details" )"></a>
+            </div>              
+            <p><label>$i18n.getString( "identifier" ):</label><br><span id="identifierField"></span></p>                    
+            <p><label>$i18n.getString( "attributes" ):</label><br><span id="attributeField"></span></p>
+            <p><label>$i18n.getString( "enrolled_in_program" ):</label><br><span id="programField"></span></p>
+        </div>
+    </td>
   </tr>
 </table>