=== 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-18 05:35:21 +0000
+++ dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/javascript/commons.js	2012-10-18 08:12:18 +0000
@@ -1703,7 +1703,7 @@
 {
 	jQuery("#commentTB tr").removeClass("hidden");
 	jQuery("#commentTB tr").each( function(index, item){
-		if(isHide && index > 5){
+		if(isHide && index > 4){
 			jQuery(this).addClass("hidden");
 		}
 		else if(!isHide){		
@@ -1712,7 +1712,12 @@
 		index++;
 	});
 	
-	if( isHide ){
+	if(jQuery("#commentTB tr").length <= 5 )
+	{
+		hideById('showCommentBtn');
+		hideById('hideCommentBtn');
+	}
+	else if( isHide ){
 		showById('showCommentBtn');
 		hideById('hideCommentBtn');
 	}

=== modified file 'dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/patientDashboard.vm'
--- dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/patientDashboard.vm	2012-10-18 07:29:10 +0000
+++ dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/patientDashboard.vm	2012-10-18 08:12:18 +0000
@@ -206,12 +206,10 @@
 <div id='dataEntryFormDiv'></div>
 <div id='dashboardHistoryDiv' class="dashboard-history" style="display:none;">
 	<table width="100%">
-		<thead>
 		<tr>
 			<th>$i18n.getString("visitor")</th>
 			<th>$i18n.getString("date")</th>
 		</tr>
-		</thead>
 		#set( $mark = false )
 		#foreach( $patientAudit in $patientAudits )
 		<tr #alternate( $mark )>

=== modified file 'dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/programEnrollmentForm.vm'
--- dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/programEnrollmentForm.vm	2012-10-18 04:24:34 +0000
+++ dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/programEnrollmentForm.vm	2012-10-18 08:12:18 +0000
@@ -70,42 +70,42 @@
 					#end
 					
 				<!-- ATTRIBUTES IN GROUPS -->
-				#foreach($attribute in $patientAttributes )
-					#set( $attributeValue = $!patientAttributeValueMap.get( $attribute.id ) )
-					<tr #alternate( $mark )>
-						<td class='text-column'><label>$attribute.name #if($attribute.mandatory)<em title="$i18n.getString( "required" )" class="required">*</em> #end</label></td>
-						<td class="input-column" >
-							#if( $attribute.valueType == "YES/NO" )
-								<select id="attr$attribute.id" name="attr$attribute.id" >              
-									<option value="">[$i18n.getString( "please_select" )]</option>
-									<option value="true" #if( $attributeValue=='true') selected="selected" #end>$i18n.getString( "yes" )</option>
-									<option value="false" #if( $attributeValue=='false') selected="selected" #end>$i18n.getString( "no" )</option>
-								</select>                
-							#elseif( $attribute.valueType == "DATE" )
-								<input type="text" id="attr$attribute.id" name="attr$attribute.id" value="$!attributeValue"  objectId='$attribute.id' objectType='attr' class=' #validate( "default"  $attribute.mandatory )' >
-								<script type="text/javascript">
-									datePickerValid( 'attr$attribute.id' );
-								</script>                 
-							#elseif( $attribute.valueType == "COMBO" )
-								<select  id="attr$attribute.id" name="attr$attribute.id" class=' #validate( "default"  $attribute.mandatory )' >
-									 <option value="">[$i18n.getString( "please_select" )]</option>
-								#foreach ($option in $attribute.attributeOptions )
-									<option value="$option.id" #if($attributeValue == $option.name) selected="selected" #end>$option.name</option>
+					#foreach($attribute in $patientAttributes )
+						#set( $attributeValue = $!patientAttributeValueMap.get( $attribute.id ) )
+						<tr #alternate( $mark )>
+							<td class='text-column'><label>$attribute.name #if($attribute.mandatory)<em title="$i18n.getString( "required" )" class="required">*</em> #end</label></td>
+							<td class="input-column" >
+								#if( $attribute.valueType == "YES/NO" )
+									<select id="attr$attribute.id" name="attr$attribute.id" >              
+										<option value="">[$i18n.getString( "please_select" )]</option>
+										<option value="true" #if( $attributeValue=='true') selected="selected" #end>$i18n.getString( "yes" )</option>
+										<option value="false" #if( $attributeValue=='false') selected="selected" #end>$i18n.getString( "no" )</option>
+									</select>                
+								#elseif( $attribute.valueType == "DATE" )
+									<input type="text" id="attr$attribute.id" name="attr$attribute.id" value="$!attributeValue"  objectId='$attribute.id' objectType='attr' class=' #validate( "default"  $attribute.mandatory )' >
+									<script type="text/javascript">
+										datePickerValid( 'attr$attribute.id' );
+									</script>                 
+								#elseif( $attribute.valueType == "COMBO" )
+									<select  id="attr$attribute.id" name="attr$attribute.id" class=' #validate( "default"  $attribute.mandatory )' >
+										 <option value="">[$i18n.getString( "please_select" )]</option>
+										#foreach ($option in $attribute.attributeOptions )
+											<option value="$option.id" #if($attributeValue == $option.name) selected="selected" #end>$option.name</option>
+										#end
+									</select>
+								#else 
+									<input type="text"  id="attr$attribute.id" name="attr$attribute.id" value="$!attributeValue" class="{validate:{required:$attribute.mandatory #if($!attribute.noChars),maxlength:$attribute.noChars #end #if($attribute.valueType=='NUMBER'),number:true #end }}"  > 
 								#end
-								</select>
-							#else 
-								<input type="text"  id="attr$attribute.id" name="attr$attribute.id" value="$!attributeValue" class="{validate:{required:$attribute.mandatory #if($!attribute.noChars),maxlength:$attribute.noChars #end #if($attribute.valueType=='NUMBER'),number:true #end }}"  > 
-							#end
-						</td>		
-					</tr>
-					#set( $mark = !$mark  )
+							</td>		
+						</tr>
+						#set( $mark = !$mark  )
+					#end
 					<tr><td>&nbsp;</td></tr>
 					<tr>
 						<td></td>
 						<td><input type='submit' value='$i18n.getString("save")' class='button' /></td>
 					</tr>
 				</table>
-				#end
 			</form>
 		</div>
 	#end
@@ -130,7 +130,7 @@
 <script type="text/javascript">
 	jQuery("#patientPropertyForm").ready( function(){
 		validation( 'patientPropertyForm', function(form){
-			saveIdentifierAndAttribute( $programInstance.patient.id, $programInstance.program.id, 'programEnrollmentInforForm' );
+			saveIdentifierAndAttribute( $programInstance.patient.id, $programInstance.program.id, 'patientPropertyForm' );
 		});	
 		
 		#if( $programInstance.completed)

=== modified file 'dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/style/style.css'
--- dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/style/style.css	2012-10-18 07:29:10 +0000
+++ dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/style/style.css	2012-10-18 08:12:18 +0000
@@ -450,17 +450,13 @@
 	left:650px; 
 	top:95px; 
 	background-color:#ffffff;
-	border:4px solid #d0d0d0;
+	border:1px solid #d0d0d0;
 	padding-top:1px;
 	padding-right:1px;
 	padding-left:1px;
 	padding-bottom:1px;
 }
 
-
-
-
-
 div.event-tracking-area
 {
   border:1px solid #d0d0d0;