=== 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	2012-06-12 03:38:24 +0000
+++ dhis-2/dhis-web/dhis-web-caseentry/src/main/resources/org/hisp/dhis/caseentry/i18n_module.properties	2012-06-14 03:58:46 +0000
@@ -291,7 +291,7 @@
 create = Create
 migration_patient = Migration person
 patient_info = Person information
-program_enrolled_for = Program enrolled for
+enroll_for = enroll for
 identifier_and_attribute = Identifier/Attribute
 unenrollment = Un-enrollment
 modify_due_date_or_visit_date = Modify due/Visit dates

=== modified file 'dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/dataRecordingSelect.vm'
--- dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/dataRecordingSelect.vm	2012-06-13 09:50:22 +0000
+++ dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/dataRecordingSelect.vm	2012-06-14 03:58:46 +0000
@@ -1,7 +1,7 @@
 <script type="text/javascript" src="javascript/jquery.mousewheel.js"></script>
 
 <script>
- $(document).ready(function () {        
+	$(document).ready(function () {        
         $('#programInstanceFlowDiv').mousedown(function (event) {
             $(this)
                 .data('down', true)

=== modified file 'dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/patientForm.vm'
--- dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/patientForm.vm	2012-06-07 09:55:49 +0000
+++ dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/patientForm.vm	2012-06-14 03:58:46 +0000
@@ -48,15 +48,8 @@
 			<option value="D" >$i18n.getString( "declared" )</option>
 			<option value="V" >$i18n.getString( "verified" )</option>
 		</select>
-		<input type="text" id="age" name="age" class="{validate:{required:true, number:true}}" style="width:145px" />
+		<input type="text" id="age" name="age" class="{validate:{number:true}}" style="width:145px" />
 		<input type="text" id="birthDate" name="birthDate" style='width:145px;display:none;' />
-	</td>
-</tr>
-
-<tr>
-	<td></td>
-	<td class="input-column">
-		<span id='validateBirthdate' class="hidden" style='color:red'><i>$i18n.getString('please_fill_out_only_one_of_these_fields')</i></span>
 		<input id="memberValidator" class="hidden {validate:{required:true}}"/>
 	</td>
 </tr>

=== modified file 'dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/programEnrollmentForm.vm'
--- dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/programEnrollmentForm.vm	2012-06-07 09:55:49 +0000
+++ dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/programEnrollmentForm.vm	2012-06-14 03:58:46 +0000
@@ -7,8 +7,6 @@
 		<li><a href="#tab-3">$i18n.getString("data_entry_screen")</a></li>
 	</ul>
 	
-	
-	
 	<!-- Enroll program TAB -->
 	<div id="tab-1">
 		<form id='programEnrollmentInforForm' name='programEnrollmentInforForm' action='#' method="POST" >
@@ -17,8 +15,6 @@
 				<input type='hidden' id='patientId' name='patientId' value='$programInstance.patient.id'>
 				<!-- IDENTIFIERS -->
 				<table id='enrollmentInforDiv' name='enrollmentInforDiv' style='width:100%' >
-					<col>    
-					<col>    
 					#if( $identifierTypes.size() > 0 )
 					<tr>
 						<th colspan='2'>$i18n.getString( "identifier" )</th> 

=== modified file 'dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/programEnrollmentSelectForm.vm'
--- dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/programEnrollmentSelectForm.vm	2012-06-07 10:33:27 +0000
+++ dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/programEnrollmentSelectForm.vm	2012-06-14 03:58:46 +0000
@@ -37,7 +37,7 @@
 	<p></p>
 	
 	<fieldset>
-		<legend>$i18n.getString( "program_enrolled_for" )</legend>
+		<legend>$i18n.getString( "enroll_for" )</legend>
 		<form id='programEnrollmentSelectDiv' name='programEnrollmentSelectDiv' method='POST'>
 			<input type="hidden" id="patientId" name="patientId" value="$patient.id">    
 

=== modified file 'dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/selectPatient.vm'
--- dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/selectPatient.vm	2012-06-07 09:55:49 +0000
+++ dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/selectPatient.vm	2012-06-14 03:58:46 +0000
@@ -128,7 +128,6 @@
 	
 	var i18n_violate_validation = '$encoder.jsEscape( $i18n.getString( "violate_validation" ) , "'")';
 	var i18n_show_all_items = '$encoder.jsEscape( $i18n.getString( "show_all_items" ) , "'")';
-	var i18n_please_fill_out_only_one_of_these_fields = '$encoder.jsEscape( $i18n.getString( "please_fill_out_only_one_of_these_fields" ) , "'")';
 	var checkedDuplicate = false;
 	// -1: no search anything
 	//  0: show list all patient

=== modified file 'dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/style/style.css'
--- dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/style/style.css	2012-06-07 10:33:27 +0000
+++ dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/style/style.css	2012-06-14 03:58:46 +0000
@@ -146,6 +146,11 @@
 	font-size: .8em !important;
 }
 
+.ui-autocomplete {
+	max-height: 100px;
+	overflow-y: auto;
+	overflow-x: hidden;
+}
 
 .hidden {
     display: none;

=== modified file 'dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/updatePatientForm.vm'
--- dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/updatePatientForm.vm	2012-06-07 09:55:49 +0000
+++ dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/updatePatientForm.vm	2012-06-14 03:58:46 +0000
@@ -102,14 +102,13 @@
 				<option value="V" #if($patient.dobType=='V') checked #end >$i18n.getString( "verified" )</option>
 			</select>
 			<input type="text" id="birthDate" name="birthDate" value='$format.formatDate($!patient.birthDate)' style='width:145px;' />
-			<input type="text" id="age" name="age" value='$!patient.getAge()' class="{validate:{required:true, number:true}}" style='width:145px' />
+			<input type="text" id="age" name="age" value='$!patient.getAge()' class="{validate:{number:true}}" style='width:145px;' />
 		</td>
 	</tr>
 
 	<tr>
 		<td></td>
 		<td class="input-column">
-			<span id='validateBirthdate' class="hidden" style='color:red'><i>$i18n.getString('please_fill_out_only_one_of_these_fields')</i></span>
 			<input id="memberValidator" class="hidden {validate:{required:true}}"/>
 		</td>
 	</tr>