=== 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	2013-05-21 08:30:35 +0000
+++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/resources/org/hisp/dhis/patient/i18n_module.properties	2013-05-21 10:43:35 +0000
@@ -396,9 +396,9 @@
 display_on_all_orgunits = Display on all organisation units
 other_program_stages = Other program stages
 minus = Minus
-minus_with_dateOfIncident = DATE-DIFF ( xxx, INCIDENT DATE )
-minus_with_enrollmentDate = DATE-DIFF ( xxx, ENROLLMENT DATE )
-minus_with_executionDate = DATE-DIFF ( xxx, REPORT DATE )
+minus_with_dateOfIncident = DateDiff ( xxx, Incident date )
+minus_with_enrollmentDate = DateDiff ( xxx, Enrollment date )
+minus_with_executionDate = DateDiff ( xxx, Report date )
 and_operator = AND
 or_operator = OR
 combine_operator = COMBINE

=== modified file 'dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/webapp/dhis-web-maintenance-patient/caseAggregationForm.vm'
--- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/webapp/dhis-web-maintenance-patient/caseAggregationForm.vm	2013-05-20 08:41:33 +0000
+++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/webapp/dhis-web-maintenance-patient/caseAggregationForm.vm	2013-05-21 10:43:35 +0000
@@ -131,21 +131,24 @@
 			<input type='button' class="small-button" onclick='insertOperator( ">=" );' value=">=" />
 			<input type='button' class="small-button" onclick='insertOperator( "=" );' value="=" />
 			<input type='button' class="small-button" onclick='insertOperator( "!=" );' value="!=" />
-			&nbsp;&nbsp;&nbsp;
-			<input type='button' class="nornal-button" onclick='insertBoolValue( "true" );' value="$i18n.getString( 'yes' )" />
-			<input type='button' class="nornal-button" onclick='insertBoolValue( "false" );' value="$i18n.getString( 'no' )" />
-			<input type='button' class="nornal-button" onclick='insertOperator( "is null" );' value="==NULL" />
-			<input type='button' class="nornal-button" onclick='insertOperator( "is not null" );' value="!=NULL" />
-			&nbsp;&nbsp;&nbsp;
-			<input type='button' style="width:54px;" onclick='insertOperator( "AND" );' value="$i18n.getString( 'and_operator' )" />
-			<input type='button' style="width:54px;" onclick='insertOperator( "OR" );' value="$i18n.getString( 'or_operator' )" />
+			<span style='padding-left:10px'>
+				<input type='button' class="nornal-button" onclick='insertBoolValue( "true" );' value="$i18n.getString( 'yes' )" />
+				<input type='button' class="nornal-button" onclick='insertBoolValue( "false" );' value="$i18n.getString( 'no' )" />
+				<input type='button' class="nornal-button" onclick='insertOperator( "is null" );' value="==NULL" />
+				<input type='button' class="nornal-button" onclick='insertOperator( "is not null" );' value="!=NULL" />
+			</span>
+			<span style='padding-left:10px'>
+				<input type='button' style="width:54px;" onclick='insertOperator( "AND" );' value="$i18n.getString( 'and_operator' )" />
+				<input type='button' style="width:54px;" onclick='insertOperator( "OR" );' value="$i18n.getString( 'or_operator' )" />
+				<input type='button' style="width:80px;" onclick='insertOperator( "COMBINE" );' value="$i18n.getString( 'combine_operator' )" />
+			</span>
 			<br><br>
-			<input type='button' style="width:92px;" onclick='insertOperator( "COMBINE" );' value="$i18n.getString( 'combine_operator' )" />
-			<input type='button' style="width:150px;" onclick='insertOperator( "DATEDIFF( , dateOfIncident) " );' value="$i18n.getString('minus_with_dateOfIncident')" />
-			<input type='button' style="width:150px;" onclick='insertOperator( "DATEDIFF( , enrollmentDate) " );' value="$i18n.getString('minus_with_enrollmentDate')" />
-			<input type='button' style="width:150px;" onclick='insertOperator( "DATEDIFF( , executionDate) " );' value="$i18n.getString('minus_with_executionDate')" />
-			&nbsp;&nbsp;&nbsp;
-			<input type='button' style="width:45px;" align="right" alt="$i18n.getString( 'clear' )" onclick="byId('aggregationCondition').value='';" value="$i18n.getString('clear')" />
+			<input type='button' style="width:175px;" onclick='insertOperator( "DATEDIFF( , dateOfIncident) " );' value="$i18n.getString('minus_with_dateOfIncident')" />
+			<input type='button' style="width:175px;" onclick='insertOperator( "DATEDIFF( , enrollmentDate) " );' value="$i18n.getString('minus_with_enrollmentDate')" />
+			<input type='button' style="width:175px;" onclick='insertOperator( "DATEDIFF( , executionDate) " );' value="$i18n.getString('minus_with_executionDate')" />
+			<span style='padding-left:110px'>
+				<input type='button' style="width:45px;" align="right" alt="$i18n.getString( 'clear' )" onclick="byId('aggregationCondition').value='';" value="$i18n.getString('clear')" />
+			</span>
 		</td>
 	</tr>
     </tbody>