=== modified file 'dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/dataEntryForm.vm'
--- dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/dataEntryForm.vm	2013-08-12 06:23:01 +0000
+++ dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/dataEntryForm.vm	2013-09-02 19:05:50 +0000
@@ -33,17 +33,7 @@
 			</th>
 		</tr>
 		#end
-
-		<tr id='entryPostComment'>
-			<th class='coordinates1'><label for="postComment">$i18n.getString('post_comment'):</label></th>
-			<th colspan='3'>
-				<input type="text" class="{validate:{maxlength:160}} criteria" id="commentInput" name='commentInput'
-                        style="width:380px;#if($programStage.captureCoordinates=='false') margin-left:11px; padding-left: 2px;  #end "
-                       onkeypress="keypressOnComment( event, this );">
-				<input id="commentButton" name='commentButton' type="button" style='width:40px' value="$i18n.getString('add')" onclick='addComment( byId("commentInput"), $programStageInstance.id )'>
-			</th>
-		</tr>
-
+		
 		#if( $programStage.getDataEntryType()=='section' )
 		<tr id="filterDataSetSectionTr" class='coordinates1'>
 			<th class='coordinates1'><label for="filterDataSetSection">$i18n.getString( "filter_on_section" )</label></th>
@@ -85,7 +75,20 @@
 	#end
 </div>
 
-<div id='inputCriteriaDiv' class="page inputCriteria hidden" style="width:490px; height:29px;">
+<table id='entryPostComment' class='listTable hidden' style="width:600px;">
+<tr>
+	<th class='coordinates1'><label for="postComment">$i18n.getString('post_comment'):</label></th>
+	<th>
+		<input type="text" class="{validate:{maxlength:160}} criteria" id="commentInput" name='commentInput'
+				style="width:380px;#if($programStage.captureCoordinates=='false') margin-left:11px; padding-left: 2px;  #end "
+			   onkeypress="keypressOnComment( event, this );">
+		<input id="commentButton" name='commentButton' type="button" style='width:40px' value="$i18n.getString('add')" onclick='addComment( byId("commentInput"), $programStageInstance.id )'>
+	</th>
+</tr>
+</table>
+
+
+<div id='inputCriteriaDiv' class="page inputCriteria hidden" style="width:580px; height:29px;">
 	<input type="button" id="completeBtn" class="button" value="$i18n.getString('complete')" onClick="doComplete()">
 	<input type="button" id="uncompleteBtn" value="$i18n.getString('incomplete')" onclick="doUnComplete()">
 	<input type="button" id="validateBtn" class='button' id="validationBtn" value="$i18n.getString('run_validation')" onClick="javascript: runValidation();">

=== modified file 'dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/javascript/entry.js'
--- dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/javascript/entry.js	2013-08-29 09:34:09 +0000
+++ dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/javascript/entry.js	2013-09-02 19:05:50 +0000
@@ -440,6 +440,7 @@
 				showById('entryFormContainer');
 				showById('dataEntryFormDiv');
 				showById('entryForm');
+				showById('entryPostComment');
 			}
         }
         else
@@ -481,8 +482,10 @@
 {
     if( show ){
         jQuery("#entryForm").show();
+		showById('entryPostComment');
     }else {
         jQuery("#entryForm").hide();
+		hideById('entryPostComment');
     }
 }