=== modified file 'dhis-2/dhis-web/dhis-web-dataentry/src/main/webapp/dhis-web-dataentry/history.vm'
--- dhis-2/dhis-web/dhis-web-dataentry/src/main/webapp/dhis-web-dataentry/history.vm	2012-07-23 12:33:49 +0000
+++ dhis-2/dhis-web/dhis-web-dataentry/src/main/webapp/dhis-web-dataentry/history.vm	2012-08-02 12:42:08 +0000
@@ -11,8 +11,8 @@
 	<tr>		
 		<!-- Comment -->
 		<td style="height:24px" valign="bottom">
-			<h4>$i18n.getString( "dataelement_comment" )
-			
+            <h4>$i18n.getString( "mark_value_for_followup" )
+
 			#if ( $dataValue && $dataValue.isFollowup() )
 		        <img id="followup" src="../images/marked.png" alt="$i18n.getString( 'mark_value_for_followup' )" onclick="markValueForFollowup()" style="cursor:pointer"/>
 			#elseif ( $dataValue )
@@ -21,6 +21,7 @@
 			    <img id="followup" src="../images/unmarked.png"/>
 			#end			
 			</h4>
+            <h4>$i18n.getString( "dataelement_comment" )</h4>
 		</td>
 		<!-- Min-max -->        
 		<td style="height:24px" valign="bottom">       
@@ -30,7 +31,7 @@
     <tr>
 		<td valign="top">
 			<textarea id="commentTextArea" style="height:130px;width:240px">$!encoder.htmlEncode( $dataValue.comment )</textarea><br>
-			<input type="button" value="$i18n.getString( 'save_comment' )" style="width:130px" onclick="saveComment()">
+			<input type="button" value="$i18n.getString( 'save_comment' )" style="width:130px" onclick="saveComment()">
 		</td>		
         <td valign="top">
             <table>
@@ -57,21 +58,21 @@
                 </tr>
                 <tr>
                 	<td colspan="3"><input type="button" value="$i18n.getString( 'save' )" onclick="saveMinMaxLimit()" style="width:100px">
-                		<input type="button" value="$i18n.getString( 'remove' )" onclick="removeMinMaxLimit()" style="width:100px"></td>
+                		<input type="button" value="$i18n.getString( 'remove' )" onclick="removeMinMaxLimit()" style="width:100px"></td>
                 </tr>
                 <tr>
-                	<td colspan="3" style="height:15px"></td>
+                	<td colspan="3" style="height:15px"></td>
                 </tr>
                 <tr>
                 	<td colspan="2" style="background-color: #e0e0e0; height:26px;">$i18n.getString( "stored_by" )</td>
-                	<td>$!encoder.htmlEncode( $storedBy )</td>
+                	<td>$!encoder.htmlEncode( $storedBy )</td>
                 </tr>
                 <tr>
                 	<td colspan="2" style="background-color: #e0e0e0; height:26px;">$i18n.getString( "stored_date" )</td>
                 	<td>$!format.formatDate( $dataValue.timestamp )</td>
                 </tr>
             </table>
-        </td>
+        </td>
 	</tr>
 	<tr>
 		<!-- History chart -->