=== modified file 'dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/javascript/commons.js'
--- dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/javascript/commons.js	2012-10-05 04:50:32 +0000
+++ dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/javascript/commons.js	2012-10-05 05:02:45 +0000
@@ -874,14 +874,14 @@
 						showById('searchDiv');
 						showById('listPatientDiv');
 					}
-					var id = 'ps_' + programStageInstanceId;
-					var programInstanceId = jQuery('#' + id).attr('programInstanceId');
 					if(jQuery(".stage-object-selected").attr('id')== id)
 					{
 						hideById('entryForm');
 						hideById('executionDateTB');
 						hideById('inputCriteriaDiv');
 					}
+					var id = 'ps_' + programStageInstanceId;
+					var programInstanceId = jQuery('#' + id).attr('pi');
 					jQuery('#ps_' + programStageInstanceId).remove();
 					jQuery('#arrow_' + programStageInstanceId).remove();
 					jQuery('#org_' + programStageInstanceId).remove();
@@ -910,6 +910,7 @@
 	hideById('selectDiv');
 	hideById('searchDiv');
 	hideById('listPatientDiv');
+	hideById('entryForm');
 
 	jQuery('#loaderDiv').show();
 	jQuery('#listRelationshipDiv').load('showRelationshipList.action',

=== modified file 'dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/visitSchedule.vm'
--- dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/visitSchedule.vm	2012-10-05 03:29:50 +0000
+++ dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/visitSchedule.vm	2012-10-05 05:02:45 +0000
@@ -21,7 +21,7 @@
 <br>
 #set($programStageInstances = $programInstance.programStageInstances)
 #if( $programStageInstances.size() > 0 )
-	<table class='mainPageTable' id='progarmStageListDiv' name='progarmStageListDiv' >
+	<table class='mainPageTable listTable' id='progarmStageListDiv' name='progarmStageListDiv' >
 		<col width="10px">
 		<col width="200px">
 		<col width="200px">
@@ -38,7 +38,7 @@
 			<th>$i18n.getString( "remove" )</th>
 			#end
 		</tr>
-		
+		<tbody>
 	#set( $rowCount = 0 )
 	#set( $mark = false )
 	#foreach( $programStageInstance in $programStageInstances )
@@ -96,6 +96,7 @@
 		</tr>
 		#set( $mark = !$mark  )
 	#end
+	</tbody>
 	</table>
 #end