=== modified file 'dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/programEnrollmentSelectForm.vm'
--- dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/programEnrollmentSelectForm.vm	2012-08-28 05:48:46 +0000
+++ dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/programEnrollmentSelectForm.vm	2012-08-29 07:30:55 +0000
@@ -45,7 +45,7 @@
 			<td></td>
 			<td colspan='2'>
 				<input type="button" id='enrollBtn' name='enrollBtn' class='button' value="$i18n.getString( 'enroll' )" onclick='saveEnrollment()'/>
-				<input type="button" id='unenrollBtn' name='unenrollBtn' class='button' value="$i18n.getString( 'unenroll' )" onclick='unenrollmentForm()'/>
+				<input type="button" id='cancelBtn' name='cancelBtn' class='button' value="$i18n.getString( 'cancel' )" onclick="jQuery('#enrollmentDiv').dialog('close')"/>
 			</td>
 		</tr>
 		<tr>

=== modified file 'dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/smsReminderList.vm'
--- dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/smsReminderList.vm	2012-08-21 13:51:07 +0000
+++ dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/smsReminderList.vm	2012-08-29 07:30:55 +0000
@@ -23,14 +23,10 @@
 		<td colspan='2'>
 			<div class="comment-table" style='max-height:150px;'>
 				<table id='commentTB'>
-					#if( $comments.size() > 0 )
-						#foreach( $comment in $comments )
-							<tr id="comment_$comment.id">
-								<td>$format.formatDate($comment.createdDate) - $comment.creator - $comment.commentText</td>
-							</tr>
-						#end
-					#else
-						<tr><td>$i18n.getString("no_comment")</td></tr>
+					#foreach( $comment in $comments )
+						<tr id="comment_$comment.id">
+							<td>$format.formatDate($comment.createdDate) - $comment.creator - $comment.commentText</td>
+						</tr>
 					#end
 				</table>
 			</div>