=== 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-06-15 04:41:31 +0000
+++ dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/dataEntryForm.vm	2012-06-15 06:16:17 +0000
@@ -72,7 +72,7 @@
 					#if( $!programStageDataElement.dataElement.optionSet )
 						#set( $hasOptionSet = 'true')
 					#else
-						#set( $hasOptionSet = 'true')
+						#set( $hasOptionSet = 'false')
 					#end
 
 					#if( $programStageDataElement.dataElement.type == "bool" )

=== 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-06-15 05:37:59 +0000
+++ dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/javascript/entry.js	2012-06-15 06:16:17 +0000
@@ -846,25 +846,6 @@
 				input.val(ui.item.value);
 				saveVal( dataElementId );
 				input.autocomplete( "close" );
-			},
-			change: function( event, ui ) {
-				if ( !ui.item ) {
-					var matcher = new RegExp( "^" + $.ui.autocomplete.escapeRegex( $(this).val() ) + "$", "i" ),
-						valid = false;
-					select.children( "option" ).each(function() {
-						if ( $( this ).text().match( matcher ) ) {
-							this.selected = valid = true;
-							return false;
-						}
-					});
-					if ( !valid ) {
-						// remove invalid value, as it didn't match anything
-						$( this ).val( "" );
-						select.val( "" );
-						input.data( "autocomplete" ).term = "";
-						return false;
-					}
-				}
 			}
 		})
 		.addClass( "ui-widget" );

=== 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-06-14 03:58:46 +0000
+++ dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/style/style.css	2012-06-15 06:16:17 +0000
@@ -111,19 +111,19 @@
     white-space: normal;
 	border:2px solid; 
 	cursor:pointer;
+	opacity: 1.0;
+}
+
+input.stage-object[type="button"]:hover
+{
 	opacity: 0.75;
 }
 
-input.stage-object[type="button"]:hover
-{
-	opacity: 1.0;
-}
-
 input.stage-object-selected[type="button"]
 {
 	width: 120px;
 	height: 50px;
-    opacity: 1.0;
+    opacity: 0.75;
 }
 
 input.patient-object[type="button"]