=== modified file 'dhis-2/dhis-web/dhis-web-sms/src/main/resources/org/hisp/dhis/sms/i18n_module.properties'
--- dhis-2/dhis-web/dhis-web-sms/src/main/resources/org/hisp/dhis/sms/i18n_module.properties	2013-03-14 03:32:14 +0000
+++ dhis-2/dhis-web/dhis-web-sms/src/main/resources/org/hisp/dhis/sms/i18n_module.properties	2013-03-15 18:55:26 +0000
@@ -86,7 +86,7 @@
 search_by_program=Search by program
 please_select_village=Please select village
 specify_search_criteria=Please specify search criteria
-list_all_patients=List all beneficiaries
+list_all_patients=List all Persons
 search=Search
 search_by_selected_unit=Search by selected unit
 please_select=Please Select
@@ -115,4 +115,6 @@
 dblick_to_unselect=Double-click to remove
 advance_search=Advance search
 program=Program
-message_not_sent=Message not sent
\ No newline at end of file
+message_not_sent=Message not sent
+date_of_birth=Date of birth
+age_year=Age (years)
\ No newline at end of file

=== modified file 'dhis-2/dhis-web/dhis-web-sms/src/main/resources/org/hisp/dhis/sms/i18n_module_vi_VN.properties'
--- dhis-2/dhis-web/dhis-web-sms/src/main/resources/org/hisp/dhis/sms/i18n_module_vi_VN.properties	2013-03-14 03:32:14 +0000
+++ dhis-2/dhis-web/dhis-web-sms/src/main/resources/org/hisp/dhis/sms/i18n_module_vi_VN.properties	2013-03-15 18:55:26 +0000
@@ -85,4 +85,6 @@
 dblick_to_unselect=Nh\u1ea5p \u0111\u00f4i chu\u1ed9t \u0111\u1ec3 h\u1ee7y ch\u1ecdn
 advance_search=T\u00ecm ki\u1ebfm n\u00e2ng cao
 program=Ch\u01b0\u01a1ng tr\u00ecnh
-gender=Gi\u1edbi t\u00ednh
\ No newline at end of file
+gender=Gi\u1edbi t\u00ednh
+date_of_birth=Ng\u00e0y sinh
+age_year=Tu\u1ed5i (t\u00ednh theo n\u0103m)
\ No newline at end of file

=== modified file 'dhis-2/dhis-web/dhis-web-sms/src/main/webapp/dhis-web-sms/css/patient.css'
--- dhis-2/dhis-web/dhis-web-sms/src/main/webapp/dhis-web-sms/css/patient.css	2013-03-12 05:40:42 +0000
+++ dhis-2/dhis-web/dhis-web-sms/src/main/webapp/dhis-web-sms/css/patient.css	2013-03-15 18:55:26 +0000
@@ -87,4 +87,17 @@
 	margin: 1em;
 	padding: 1em;
 	width: 500px;
+}
+
+.advanced-search 
+{
+  position: relative;
+  border: 1px solid #a4d2a3;
+  background-color: #d5efd5;
+  padding-top: 10px;
+  padding-right: 20px;
+  padding-bottom: 5px;
+  padding-left: 20px;
+  margin-bottom: 15px;
+  border-radius: 3px;
 }
\ No newline at end of file

=== modified file 'dhis-2/dhis-web/dhis-web-sms/src/main/webapp/dhis-web-sms/javascript/patient.js'
--- dhis-2/dhis-web/dhis-web-sms/src/main/webapp/dhis-web-sms/javascript/patient.js	2013-03-12 05:40:42 +0000
+++ dhis-2/dhis-web/dhis-web-sms/src/main/webapp/dhis-web-sms/javascript/patient.js	2013-03-15 18:55:26 +0000
@@ -7,7 +7,7 @@
 
 	enable('advancedSearchBtn');
 	
-	setFieldValue( "selectedOrgunitText", orgUnitNames[0] );
+	setFieldValue( "orgunitName", orgUnitNames[0] );
 }
 
 selection.setListenerFunction( organisationUnitSelected );

=== modified file 'dhis-2/dhis-web/dhis-web-sms/src/main/webapp/dhis-web-sms/searchPatientCritetia.vm'
--- dhis-2/dhis-web/dhis-web-sms/src/main/webapp/dhis-web-sms/searchPatientCritetia.vm	2013-03-12 05:40:42 +0000
+++ dhis-2/dhis-web/dhis-web-sms/src/main/webapp/dhis-web-sms/searchPatientCritetia.vm	2013-03-15 18:55:26 +0000
@@ -5,9 +5,13 @@
 		</tr>
 		<tr>
 			<td><label>$i18n.getString( "registering_unit" )</label></td>
-			<td><input type="text" id='selectedOrgunitText' readonly style="min-width:16em"></td>
-			<td><input type="button" id='listPatientBtn' value="$i18n.getString( 'list_all_patients' )" onclick='listAllPatient();'/>
-			<input type="button" class='large-button' id='advancedSearchBtn' value='$i18n.getString( "advance_search" )' onclick="jQuery('#advanced-search').toggle();" disabled="true" /></td>
+			<td>
+				<input type="text" id='orgunitName' readonly="readonly" #if( $organisationUnit ) value="$encoder.htmlEncode( $organisationUnit.displayName )" #else value="[$i18n.getString( 'please_select_village' )]" #end >
+			</td>
+			<td rowspan='2' valign='bottom'>
+				<input type="button" id='listPatientBtn' value="$i18n.getString( 'list_all_patients' )" onclick='listAllPatient();'/>
+				<input type="button" class='large-button' id='advancedSearchBtn' value='$i18n.getString( "advance_search" )' onclick="jQuery('#advanced-search').toggle();" disabled="true" />
+			</td>
 			<td><span id='warnmessage' style='color:red'></span></td>
 		</tr>
 		<tr id='programAddPatientTR'>
@@ -24,7 +28,7 @@
 	</tbody>
 </table>
 
-<div id="advanced-search" class='hidden'>
+<div id="advanced-search" class='hidden advanced-search'>
 	<table>
 		<tr id='programStageAddPatientTR' class='hidden'>
 			<td>$i18n.getString('status')</td>