=== modified file 'dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-dataadmin/src/main/resources/org/hisp/dhis/dataadmin/i18n_module.properties'
--- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-dataadmin/src/main/resources/org/hisp/dhis/dataadmin/i18n_module.properties	2014-07-31 15:38:39 +0000
+++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-dataadmin/src/main/resources/org/hisp/dhis/dataadmin/i18n_module.properties	2014-08-01 06:56:13 +0000
@@ -363,4 +363,5 @@
 please_select_a_dataset = Please select a dataset
 please_select_an_organisation_unit = Please select an organisation unit
 prev_year = Prev year
-next_year = Next year
\ No newline at end of file
+next_year = Next year
+update_the_data_elements_and_option_combos_in_expression = Update the data elements and option combos in expression
\ No newline at end of file

=== modified file 'dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-program/src/main/webapp/dhis-web-maintenance-program/addProgramForm.vm'
--- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-program/src/main/webapp/dhis-web-maintenance-program/addProgramForm.vm	2014-06-22 11:20:48 +0000
+++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-program/src/main/webapp/dhis-web-maintenance-program/addProgramForm.vm	2014-08-01 06:56:13 +0000
@@ -115,6 +115,7 @@
 			<td></td>
 		</tr>
 		
+		<tr name='nonAnonymous'><td>&nbsp;</td></tr>
 		<tr name='nonAnonymous'>
 			<th colspan="2">$i18n.getString( "enrollment_details" )</th>
 		</tr>
@@ -161,7 +162,8 @@
             <td></td>
         </tr>
 
-
+		<tr name='nonAnonymous'><td>&nbsp;</td></tr>
+		
 		<tr name='nonAnonymous'>
 			<th colspan="2">$i18n.getString( "dashboard_shortcut_to_add_relative" )</th>
 		</tr>
@@ -202,24 +204,18 @@
 			</td>
 		</tr>
 		
-		<tr><td>&nbsp;</td><td>&nbsp;</td></tr>
-	<tbody>
-</table>
-
-<table name='nonAnonymous'>
-    <thead>
-      <tr>
-        <th colspan="2">$i18n.getString( "scheduling_of_events" )</th>
-      </tr>
-    </thead>
-
-    <tbody>
-        <tr name='nonAnonymous'>
-  			<td><label for="ignoreOverdueEvents">$i18n.getString( "skip_to_generate_overdue_events" )</label></td>
-  			<td><input type="checkbox" id="ignoreOverdueEvents" name="ignoreOverdueEvents" value='true'></td>
-  			<td></td>
-  		</tr>
-    </tbody>
+		<tr><td>&nbsp;</td></tr>
+		
+		<tr name='nonAnonymous'>
+			<th colspan="2">$i18n.getString( "scheduling_of_events" )</th>
+		</tr>
+	  
+		<tr name='nonAnonymous'>
+			<td><label for="ignoreOverdueEvents">$i18n.getString( "skip_to_generate_overdue_events" )</label></td>
+			<td><input type="checkbox" id="ignoreOverdueEvents" name="ignoreOverdueEvents" value='true'></td>
+			<td></td>
+		</tr>
+	</tbody>
 </table>
 
 <br />

=== modified file 'dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-program/src/main/webapp/dhis-web-maintenance-program/updateProgramForm.vm'
--- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-program/src/main/webapp/dhis-web-maintenance-program/updateProgramForm.vm	2014-07-28 09:24:17 +0000
+++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-program/src/main/webapp/dhis-web-maintenance-program/updateProgramForm.vm	2014-08-01 06:56:13 +0000
@@ -122,6 +122,8 @@
 			<td></td>
 		</tr>
 		
+		<tr name='nonAnonymous'><td>&nbsp;</td></tr>
+		
 		<tr name='nonAnonymous'>
 			<th colspan="2">$i18n.getString( "enrollment_details" )</th>
 		</tr>
@@ -168,7 +170,8 @@
             <td></td>
         </tr>
 
-
+		<tr name='nonAnonymous'><td>&nbsp;</td></tr>
+		
 		<tr name='nonAnonymous'>
 			<th colspan="2">$i18n.getString( "dashboard_shortcut_to_add_relative" )</th>
 		</tr>
@@ -215,26 +218,18 @@
 			</td>
 		</tr>
 		
-		<tr><td>&nbsp;</td><td>&nbsp;</td></tr>
-			
-	<tbody>
-	</table>
-
-  <table name='nonAnonymous'>
-      <thead>
-        <tr>
+		<tr><td>&nbsp;</td></tr>
+		
+        <tr name='nonAnonymous'>
           <th colspan="2">$i18n.getString( "scheduling_of_events" )</th>
         </tr>
-      </thead>
-
-      <tbody>
         <tr name='nonAnonymous'>
             <td><label for="ignoreOverdueEvents">$i18n.getString( "skip_to_generate_overdue_events" )</label></td>
             <td><input type="checkbox" id="ignoreOverdueEvents" name="ignoreOverdueEvents" value='true' #if($program.ignoreOverdueEvents=='true') checked #end #if( $program.type!='1' ) disabled #end ></td>
             <td></td>
         </tr>
-      </tbody>
-  </table>
+    </tbody>
+</table>
 
   <br />