=== modified file 'dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/resources/org/hisp/dhis/patient/i18n_module.properties'
--- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/resources/org/hisp/dhis/patient/i18n_module.properties	2012-03-05 04:22:57 +0000
+++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/resources/org/hisp/dhis/patient/i18n_module.properties	2012-03-05 12:58:32 +0000
@@ -247,6 +247,7 @@
 shown_on_reports=Shown on reports 
 hide_provided_other_facility=Hide provided other facility
 suggested_values=Suggested values
-back_to_main_menu = Back to main menu
-add_all_values = Add all values
-display_provided_other_facility_column = Display provided other facility column
\ No newline at end of file
+add_all_values=Add all values
+display_provided_other_facility_column=Display provided other facility column
+aggregation_query_builder=Aggregation Query Builder
+patient_org_unit_registration=Beneficiary Org Unit Registration
\ No newline at end of file

=== modified file 'dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/resources/struts.xml'
--- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/resources/struts.xml	2012-02-23 02:49:20 +0000
+++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/resources/struts.xml	2012-03-05 12:58:32 +0000
@@ -20,7 +20,7 @@
 			class="org.hisp.dhis.patient.action.relationship.GetRelationshipTypeListAction">
 			<result name="success" type="velocity">/main.vm</result>
 			<param name="page">/dhis-web-maintenance-patient/relationshipType.vm</param>
-			<param name="menu">/dhis-web-maintenance-patient/patientMenu.vm</param>
+			<param name="menu">/dhis-web-maintenance-patient/menu.vm</param>
 			<param name="javascripts">javascript/relationship.js</param>
 		</action>
 
@@ -85,7 +85,7 @@
 			<result name="success" type="velocity">/main.vm</result>
 			<param name="page">
 				/dhis-web-maintenance-patient/patientAttribute.vm</param>
-			<param name="menu">/dhis-web-maintenance-patient/patientMenu.vm</param>
+			<param name="menu">/dhis-web-maintenance-patient/menu.vm</param>
 			<param name="javascripts">javascript/patientAttribute.js</param>
 		</action>
 
@@ -178,7 +178,7 @@
 			class="org.hisp.dhis.patient.action.orgunitregistration.GetPatientOrgnunitRegistrationAction">
 			<result name="success" type="velocity">/main.vm</result>
 			<param name="page">/dhis-web-maintenance-patient/orgunitRegistration.vm</param>
-			<param name="menu">/dhis-web-maintenance-patient/patientMenu.vm</param>
+			<param name="menu">/dhis-web-maintenance-patient/menu.vm</param>
 			<param name="requiredAuthorities">F_PROGRAM_UPDATE</param>
 		</action>
 
@@ -194,7 +194,7 @@
 			class="org.hisp.dhis.patient.action.program.GetProgramListAction">
 			<result name="success" type="velocity">/main.vm</result>
 			<param name="page">/dhis-web-maintenance-patient/programList.vm</param>
-			<param name="menu">/dhis-web-maintenance-patient/programMenu.vm</param>
+			<param name="menu">/dhis-web-maintenance-patient/menu.vm</param>
 			<param name="javascripts">javascript/program.js</param>
 		</action>
 
@@ -262,7 +262,7 @@
 			class="org.hisp.dhis.patient.action.program.GetProgramAttributeListAction">
 			<result name="success" type="velocity">/main.vm</result>
 			<param name="page">/dhis-web-maintenance-patient/programAttributeList.vm</param>
-			<param name="menu">/dhis-web-maintenance-patient/programMenu.vm</param>
+			<param name="menu">/dhis-web-maintenance-patient/menu.vm</param>
 			<param name="javascripts">javascript/programAttribute.js</param>
 		</action>
 
@@ -495,7 +495,7 @@
 			class="org.hisp.dhis.patient.action.patientattributegroup.GetPatientAttributeGroupListAction">
 			<result name="success" type="velocity">/main.vm</result>
 			<param name="page">/dhis-web-maintenance-patient/patientAttributeGroup.vm</param>
-			<param name="menu">/dhis-web-maintenance-patient/patientMenu.vm</param>
+			<param name="menu">/dhis-web-maintenance-patient/menu.vm</param>
 			<param name="javascripts">javascript/patientAttributeGroup.js</param>
 		</action>
 
@@ -606,7 +606,7 @@
 			<result name="success" type="velocity">/main.vm</result>
 			<param name="page">
 				/dhis-web-maintenance-patient/listPatientIdentifierType.vm</param>
-			<param name="menu">/dhis-web-maintenance-patient/patientMenu.vm</param>
+			<param name="menu">/dhis-web-maintenance-patient/menu.vm</param>
 			<param name="javascripts">javascript/patientIdentifierType.js</param>
 		</action>
 
@@ -647,7 +647,7 @@
 			class="org.hisp.dhis.patient.action.caseaggregation.GetAllCaseAggregationConditionAction">
 			<result name="success" type="velocity">/main.vm</result>
 			<param name="page">/dhis-web-maintenance-patient/caseAggregation.vm</param>
-			<param name="menu">/dhis-web-maintenance-patient/programMenu.vm</param>
+			<param name="menu">/dhis-web-maintenance-patient/menu.vm</param>
 			<param name="javascripts">javascript/caseaggregation.js</param>
 		</action>
 
@@ -749,7 +749,7 @@
 			class="org.hisp.dhis.patient.action.validation.GetValidationCriteriaListAction">
 			<result name="success" type="velocity">/main.vm</result>
 			<param name="page">/dhis-web-maintenance-patient/validationCriteria.vm</param>
-			<param name="menu">/dhis-web-maintenance-patient/programMenu.vm</param>
+			<param name="menu">/dhis-web-maintenance-patient/menu.vm</param>
 			<param name="javascripts">javascript/validationcriteria.js</param>
 		</action>
 

=== modified file 'dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/webapp/dhis-web-maintenance-patient/menu.vm'
--- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/webapp/dhis-web-maintenance-patient/menu.vm	2012-02-23 02:49:20 +0000
+++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/webapp/dhis-web-maintenance-patient/menu.vm	2012-03-05 12:58:32 +0000
@@ -4,13 +4,13 @@
 	<li><a href="patientAttributeGroup.action">$i18n.getString( "patient_attribute_group" )</a></li>
 	<li><a href="patientIdentifierType.action">$i18n.getString( "patient_identifier_type" )</a></li>
 	<li><a href="relationshipType.action">$i18n.getString( "relationship_type" )</a></li>
-	<li><a href="defineOrgunitRegistrationForm.action">$i18n.getString( "patient_organisation_unit_registration" )</a></li>
+	<li><a href="defineOrgunitRegistrationForm.action">$i18n.getString( "patient_org_unit_registration" )</a></li>
 </ul>
 
 <h2>$i18n.getString( "programs" )</h2>
 <ul>
 	<li><a href="program.action">$i18n.getString( "program" )</a></li>
 	<li><a href="programAttribute.action">$i18n.getString( "program_attribute" )</a></li>
-	<li><a href="caseAggregation.action">$i18n.getString( "beneficiary_aggregation_query_builder" )</a></li>
+	<li><a href="caseAggregation.action">$i18n.getString( "aggregation_query_builder" )</a></li>
 	<li><a href="validationCriteria.action">$i18n.getString( "validation_criteria" )</a></li>
 </ul>

=== removed file 'dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/webapp/dhis-web-maintenance-patient/patientAndProgramMenu.vm'
--- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/webapp/dhis-web-maintenance-patient/patientAndProgramMenu.vm	2012-01-13 07:32:03 +0000
+++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/webapp/dhis-web-maintenance-patient/patientAndProgramMenu.vm	1970-01-01 00:00:00 +0000
@@ -1,14 +0,0 @@
-<a href="index.action"><h2>$i18n.getString( "paitents_and_programs" )</h2></a>
-<ul>
-	<li><a href="patientAttribute.action">$i18n.getString( "patient_attribute" )</a></li>
-	<li><a href="patientAttributeGroup.action">$i18n.getString( "patient_attribute_group" )</a></li>
-	<li><a href="patientIdentifierType.action">$i18n.getString( "patient_identifier_type" )</a></li>
-	<li><a href="relationshipType.action">$i18n.getString( "relationship_type" )</a></li>
-	<li><a href="defineOrgunitRegistrationForm.action">$i18n.getString( "patient_organisation_unit_registration" )</a></li>
-	<li><a href="program.action">$i18n.getString( "program" )</a></li>
-	<li><a href="programAttribute.action">$i18n.getString( "program_attribute" )</a></li>
-	<li><a href="caseAggregation.action">$i18n.getString( "beneficiary_aggregation_query_builder" )</a></li>
-	<li><a href="validationCriteria.action">$i18n.getString( "validation_criteria" )</a></li>
-</ul>
-
-

=== removed file 'dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/webapp/dhis-web-maintenance-patient/patientMenu.vm'
--- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/webapp/dhis-web-maintenance-patient/patientMenu.vm	2012-03-05 12:03:06 +0000
+++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/webapp/dhis-web-maintenance-patient/patientMenu.vm	1970-01-01 00:00:00 +0000
@@ -1,9 +0,0 @@
-
-<a href="index.action"><h2>$i18n.getString( "patients" )</h2></a>
-<ul>
-	<li><a href="patientAttribute.action">$i18n.getString( "patient_attribute" )</a></li>
-	<li><a href="patientAttributeGroup.action">$i18n.getString( "patient_attribute_group" )</a></li>
-	<li><a href="patientIdentifierType.action">$i18n.getString( "patient_identifier_type" )</a></li>
-	<li><a href="relationshipType.action">$i18n.getString( "relationship_type" )</a></li>
-	<li><a href="defineOrgunitRegistrationForm.action">$i18n.getString( "patient_organisation_unit_registration" )</a></li>
-</ul>

=== removed file 'dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/webapp/dhis-web-maintenance-patient/programMenu.vm'
--- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/webapp/dhis-web-maintenance-patient/programMenu.vm	2012-03-05 12:03:06 +0000
+++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/webapp/dhis-web-maintenance-patient/programMenu.vm	1970-01-01 00:00:00 +0000
@@ -1,8 +0,0 @@
-
-<a href="index.action"><h2>$i18n.getString( "programs" )</h2></a>
-<ul>
-	<li><a href="program.action">$i18n.getString( "program" )</a></li>
-	<li><a href="programAttribute.action">$i18n.getString( "program_attribute" )</a></li>
-	<li><a href="caseAggregation.action">$i18n.getString( "beneficiary_aggregation_query_builder" )</a></li>
-	<li><a href="validationCriteria.action">$i18n.getString( "validation_criteria" )</a></li>
-</ul>