=== 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	2012-07-26 03:58:09 +0000
+++ dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/dataEntryForm.vm	2012-08-02 03:50:45 +0000
@@ -132,9 +132,9 @@
 </div>
 
 <div id='inputCriteriaDiv' class="page inputCriteria" style="display:none;width:490px;height:29px;">	
-	<input type="button" class='button' id="completeInBelowBtn" value="$i18n.getString('complete')" onClick="doComplete()" disabled="disabled">
-	<input type="button" onclick="doUnComplete()" value="$i18n.getString('incomplete')" id="uncompleteBelowBtn" disabled="disabled">
-	<input type="button" class='button' id="validationInBelowBtn" value="$i18n.getString('run_validation')" onClick="javascript: runValidation();" disabled="disabled">
+	<input type="button" class='button' id="completeBtn" value="$i18n.getString('complete')" onClick="doComplete()" disabled="disabled">
+	<input type="button" id="uncompleteBtn" value="$i18n.getString('incomplete')" onclick="doUnComplete()" disabled="disabled">
+	<input type="button" class='button' id="validationBtn" value="$i18n.getString('run_validation')" onClick="javascript: runValidation();" disabled="disabled">
 </div>
 
 </div>

=== modified file 'dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/dataRecordingSelect.vm'
--- dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/dataRecordingSelect.vm	2012-08-01 16:10:47 +0000
+++ dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/dataRecordingSelect.vm	2012-08-02 03:50:45 +0000
@@ -1,5 +1,7 @@
 <form id='dataRecordingSelectForm' name='dataRecordingSelectForm' method='post'>
-
+<div class="actions" style='margin-top:30px;'>
+	<input type="button" class='stage-object' id="newEncounterBtn" value="$i18n.getString('create_new_event')" onClick="javascript: registerIrregularEncounter( getFieldValue('executionDate') );" disabled="disabled" >
+</div>
 <table class="mainPageTable" id='patientInfoDiv'> 
 	<tr>
 		<td valign="top">
@@ -23,14 +25,6 @@
 <p>
 #parse( "/dhis-web-caseentry/colorHelp.vm" )
 </p>
-			
-<div class="actions">	
-	<input type="button" class='button' id="newEncounterBtn" value="$i18n.getString('create_new_event')" onClick="javascript: registerIrregularEncounter( getFieldValue('executionDate') );" disabled="disabled" >
-	<input type="button" class='button' id="validationBtn" value="$i18n.getString('run_validation')" onClick="javascript: runValidation();" disabled="disabled" >
-	<input type="button" class='button' id="completeBtn" value="$i18n.getString('complete')" onClick="doComplete()" disabled="disabled" >
-	<input type="button" onclick="doUnComplete()" value="$i18n.getString('incomplete')" id="uncompleteBtn" disabled="disabled" >
-	<input type="button" class='button' value="$i18n.getString( 'back_to_search' )" id='backBtnFromEntry' onclick="javascript:showSearchForm();" >
-</div>
 		
 <div id='inputCriteria' class="page inputCriteria" style="width:490px;height:29px;">	
 	<input type='hidden' id='programStageId' name='programStageId'>
@@ -56,8 +50,7 @@
 		</table>
 	</div>
 	
-	<br>
-	
+	<br>		
 	<table id='executionDateTB'>
 		<tr>
 			<th class='text-column'><label for="executionDate">$i18n.getString( "report_date" ) </label></th>
@@ -70,7 +63,6 @@
 			<th><input type="text" id="dueDate" name="dueDate" class='criteria' value="$!format.formatDate( $programStageInstance.dueDate )" readonly > </th>
 		</tr>
 	</table>
-	
 </div>
 
 </form>
@@ -81,7 +73,7 @@
 	<table>
 		<tr>
 			<td>$i18n.getString( 'due_date' )</td>
-			<td><input id='dueDateNewEncounter' name='dueDateNewEncounter' ></td>
+			<td><input id='dueDateNewEncounter' name='dueDateNewEncounter' style='width:260px;'></td>
 			<script type="text/javascript">
 			   datePicker( 'dueDateNewEncounter', false );
 			</script>

=== 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	2012-07-28 13:37:33 +0000
+++ dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/javascript/entry.js	2012-08-02 03:50:45 +0000
@@ -16,9 +16,7 @@
 	setFieldValue('dueDate','');
 	disableCompletedButton(true);
 	disable('uncompleteBtn');
-	disable('uncompleteInBelowBtn');
 	disable('validationBtn');
-	disable('validationInBelowBtn');
 	disable('newEncounterBtn');
 	hideById('inputCriteriaDiv');
 	$('#programStageIdTR').html('');
@@ -70,7 +68,6 @@
 				
 				disableCompletedButton(true);
 				disable('validationBtn');
-				disable('validationInBelowBtn');
 				showById('programStageIdTR');
 				showById('programInstanceFlowDiv');
 			}
@@ -103,10 +100,8 @@
 	setFieldValue( 'dueDate', '' );
 	setFieldValue( 'executionDate', '' );
 	disable('validationBtn');
-	disable('validationInBelowBtn');
 	disableCompletedButton(true);
 	disable('uncompleteBtn');
-	disable('uncompleteInBelowBtn');
 	disable('newEncounterBtn');
 	
 	jQuery(".stage-object-selected").removeClass('stage-object-selected');
@@ -125,11 +120,9 @@
 			var irregular = jQuery('#entryFormContainer input[id=irregular]').val();
 			showById('inputCriteriaDiv');
 			enable('validationBtn');
-			enable('validationInBelowBtn');
 			if( executionDate == '' )
 			{
 				disable('validationBtn');
-				disable('validationInBelowBtn');
 			}
 			else if( executionDate != '' && completed == 'false' )
 			{
@@ -515,7 +508,6 @@
 					jQuery(".stage-object-selected").css('background-color', COLOR_LIGHT_LIGHTRED);
 					disableCompletedButton(false);
 					enable('validationBtn');
-					enable('validationInBelowBtn');
 					disable('newEncounterBtn');
 					setFieldValue( 'programStageId', selectedProgramStageInstance.attr('psid') );
 					
@@ -639,8 +631,8 @@
 								closable: true,
 								modal:false,
 								overlay:{background:'#000000', opacity:0.1},
-								width: 300,
-								height: 100
+								width: 400,
+								height: 140
 							}).show('fast');
 							
 						var standardInterval =  jQuery('#dataRecordingSelectDiv [name=programStageId] option:selected').attr('standardInterval');
@@ -896,17 +888,13 @@
 	if(disabled){
 		disable('completeBtn');
 		disable('completeAndAddNewBtn');
-		disable('completeInBelowBtn');
 		enable('uncompleteBtn');
 		enable('uncompleteAndAddNewBtn');
-		enable('uncompleteBelowBtn');
 	}
 	else{
 		enable('completeBtn');
 		enable('completeAndAddNewBtn');
-		enable('completeInBelowBtn');
 		disable('uncompleteBtn');
 		disable('uncompleteAndAddNewBtn');
-		disable('uncompleteBelowBtn');
 	}
 }