=== modified file 'dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-program/src/main/webapp/dhis-web-maintenance-program/javascript/viewDataEntryForm.js'
--- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-program/src/main/webapp/dhis-web-maintenance-program/javascript/viewDataEntryForm.js	2014-04-25 17:04:15 +0000
+++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-program/src/main/webapp/dhis-web-maintenance-program/javascript/viewDataEntryForm.js	2014-04-30 08:19:21 +0000
@@ -6,9 +6,9 @@
 jQuery(function(){
 	dataElementSelector = jQuery("#dataElementDiv").dialog({
 		title: i18n_dataelement,
-		height: 360,
-		width: 480,
-		position: [$("body").width()- 50, 0],
+		minWidth: 595,
+		minHeight: 263,
+		position: [($("body").width() - 555) - 50, 50],
 		autoOpen: false,
 		zIndex:99999
 	});

=== modified file 'dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-program/src/main/webapp/dhis-web-maintenance-program/javascript/viewTrackedEntityForm.js'
--- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-program/src/main/webapp/dhis-web-maintenance-program/javascript/viewTrackedEntityForm.js	2014-02-26 15:09:48 +0000
+++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-program/src/main/webapp/dhis-web-maintenance-program/javascript/viewTrackedEntityForm.js	2014-04-30 08:19:21 +0000
@@ -23,9 +23,9 @@
 	$("#insertImagesButton").click(function() {
 		$("#imageDialog").dialog({
 			overlay:{background:'#000000', opacity:0.1},
-			width:400,
-			height:300,
-			position: [$("body").width()- 50, 0],
+			minWidth: 595,
+			minHeight: 263,
+			position: [($("body").width() - 555) - 50, 50],
 		});
 	});
 	
@@ -45,9 +45,9 @@
 			closable:true,
 			modal:false,
 			overlay:{background:'#000000', opacity:0.1},
-			width:485,
-			height:400,
-			position: [$("body").width()- 50, 0],
+			minWidth: 595,
+			minHeight: 263,
+			position: [($("body").width() - 555) - 50, 50],
 			close: function(ev, ui) { 
 				$("#propertiesButton").removeClass("ui-state-active2"); 
 			}

=== modified file 'dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-program/src/main/webapp/dhis-web-maintenance-program/style/basic.css'
--- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-program/src/main/webapp/dhis-web-maintenance-program/style/basic.css	2013-10-16 14:35:52 +0000
+++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-program/src/main/webapp/dhis-web-maintenance-program/style/basic.css	2014-04-30 08:19:21 +0000
@@ -76,7 +76,7 @@
 .dataElementDiv
 {
 	overflow:auto; 
-	height:20em; 
+	height:20em;
 	border:1px solid #9DA1AA;
 }
 

=== modified file 'dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-program/src/main/webapp/dhis-web-maintenance-program/viewDataEntryForm.vm'
--- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-program/src/main/webapp/dhis-web-maintenance-program/viewDataEntryForm.vm	2014-04-30 07:11:49 +0000
+++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-program/src/main/webapp/dhis-web-maintenance-program/viewDataEntryForm.vm	2014-04-30 08:19:21 +0000
@@ -31,7 +31,7 @@
 #otherProgramStageDataElements{ 
 	z-index:999999;
 	font-size:10pt;
-	
+	width:100%;
 }
 
 .ui-dialog-titlebar
@@ -130,16 +130,16 @@
 	<table id='dataElementSelection'>
 		<tr>
 			<td>
-				$i18n.getString( "filter" )&nbsp;
-				<input type="text" id='dataElementFilter' style="width:240px;" onkeyup="filterDataElements( this.value, '#dataElementSelection', '#dataElementIds')"/>
+				<input type="text" placeholder="$i18n.getString('filter')" id='dataElementFilter' style="width:380px;;" onchange="filterDataElements( this.value, '#dataElementSelection', '#dataElementIds')"/>
 			</td>
 			<td>	
+				<input type='button' value="$i18n.getString('filter')" style="width:80px;" onclick="filterDataElements( getFieldValue('dataElementFilter'), '#dataElementSelection', '#dataElementIds')" onclick="filterDataElements( getFieldValue('deKey'), '#dataElementSelection', '#dataElementIds')">
 				<input type='button' value="$i18n.getString('clear')" style="width:80px;" onclick="setFieldValue('dataElementFilter','');filterDataElements( '', '#dataElementSelection', '#dataElementIds')">
 			</td>
 		</tr>
 		<tr>
 			<td colspan='2'>	
-				<select id="dataElementIds" name="dataElementIds" style="width:430px;"  multiple="multiple" size="10" ondblclick="insertDataElement( '#dataElementSelection', '$programStage.uid')">
+				<select id="dataElementIds" name="dataElementIds" style="height:200px; width:100%;"  multiple="multiple" size="10" ondblclick="insertDataElement( '#dataElementSelection', '$programStage.uid')">
 					#foreach( $de in $dataElements)
 					#set($deJSON = '{' + '"uid"' + ':"' + "$de.uid" + '",' + '"name"' + ':"' + "$de.name" + '",' + '"shortName"' + ':"' + "$de.shortName" + '",' + '"type"' + ':"' + "$de.getDetailedTextType()"  + '"}' )
 					<option value='$deJSON' decode="$!de.code" dename="$de.name" title="$de.name">$encoder.htmlEncode( $de.name )</option>
@@ -165,8 +165,7 @@
 								<option value='3'>$i18n.getString("code_and_name")</option>
 							</select>
 						</td>
-					</tr>
-					<tr>
+						<td style="padding-left:190px;"><td>
 						<td>$i18n.getString("sort_by")</td>
 						<td>
 							<input type='radio' name='sortBy' value='1' onchange="sortByOnChange('dataElementSelection', '1')" checked >$i18n.getString("name")
@@ -193,7 +192,7 @@
 					<tr>
 						<td>$i18n.getString( "program_stage" )</td>
 						<td>
-							<select id="programStageIds" style="width:320px" onchange="getProgramStageDataElements( this.value )" >
+							<select id="programStageIds" style="height:200px;width:100%;" onchange="getProgramStageDataElements( this.value )" >
 								<option value=''>[$i18n.getString( "please_select" )]</option>
 								#foreach( $p in $programStages)
 								<option value='$p.id' uid='$p.uid'>$encoder.htmlEncode( $p.name )</option>

=== modified file 'dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-program/src/main/webapp/dhis-web-maintenance-program/viewTrackedEntityForm.vm'
--- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-program/src/main/webapp/dhis-web-maintenance-program/viewTrackedEntityForm.vm	2014-04-30 07:11:49 +0000
+++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-program/src/main/webapp/dhis-web-maintenance-program/viewTrackedEntityForm.vm	2014-04-30 08:19:21 +0000
@@ -46,6 +46,10 @@
 #attributesSelector, #programSelector {
 	padding: 2px;
 }
+
+#attributeTab,programAttrTab {
+	width: 100%;
+}
 </style>
 
 <form id="saveDataEntryForm" name="saveDataEntryForm" action="saveTrackedEntityForm.action" method="get" class="inputForm">
@@ -114,13 +118,14 @@
     <table id="attributeTab">
    		<tr>
    			<td>
-   				<input type='text' id='attributeFilter' placeholder="$i18n.getString('filter')" style="width:365px;" onkeyup="filterList( this.value, 'attributesSelector' )">
-   				<input type='button' value="$i18n.getString('clear')" style="width:80px;" onclick="setFieldValue('attributeFilter','');filterList( '', 'attributesSelector' )">
+   				<input type='text' id='attributeFilter' placeholder="$i18n.getString('filter')" style="width:400px;" onchange="filterList( this.value, 'attributesSelector' )">
+   				<input type='button' value="$i18n.getString('filter')" style="width:80px;" onclick="filterList( getFieldValue('attributeFilter'), 'attributesSelector' )">
+				<input type='button' value="$i18n.getString('clear')" style="width:80px;" onclick="setFieldValue('attributeFilter','');filterList( '', 'attributesSelector' )">
    			</td>
    		</tr>
    		<tr>
    			<td>
-   				<select id="attributesSelector" multiple="multiple" style="width:450px;height:270px" ondblclick="insertElement( 'attr' )">
+   				<select id="attributesSelector" multiple="multiple" style="height:200px;width:100%;" ondblclick="insertElement( 'attr' )">
    				#foreach( $attribute in $attributes )
    					<option value="$attribute.uid" mandatory='false'>$encoder.htmlEncode($attribute.displayName)</option>
    				#end
@@ -136,13 +141,14 @@
 	<table id="programAttrTab" class='hidden'>
 		<tr>
 			<td>
-				<input type='text' id='programAttrKey' placeholder="$i18n.getString('filter')" style="width:365px;" onkeyup="filterList( this.value, 'programAttrSelector' )">
+				<input type='text' id='programAttrKey' placeholder="$i18n.getString('filter')" style="width:400px;" onchange="filterList( this.value, 'programAttrSelector' )">
+				<input type='button' value="$i18n.getString('filter')" style="width:80px;" onclick="filterList( getFieldValue('programAttrKey'), 'programAttrSelector' )">
 				<input type='button' value="$i18n.getString('clear')" style="width:80px;" onclick="setFieldValue('programAttrKey','');filterList( '', 'programAttrSelector' )">
 			</td>
 		</tr>
 		<tr>
 			<td>
-				<select id="programAttrSelector" multiple="multiple" style="width:450px;height:270px" ondblclick="insertElement( 'prg' )">
+				<select id="programAttrSelector" multiple="multiple" style="height:200px;width:100%;" ondblclick="insertElement( 'prg' )">
 					<option value="enrollmentDate" >$encoder.htmlEncode($program.dateOfEnrollmentDescription)</option>
 					#if($program.displayIncidentDate=='true')
 					<option value="dateOfIncident" >$encoder.htmlEncode($program.dateOfIncidentDescription)</option>
@@ -171,7 +177,7 @@
 <div id="imageDialog" title="$i18n.getString( 'insert_images' )" class='hidden'>
 	<div style="margin:4px">
 		<div>
-			<select id="imageSelector" multiple="multiple" style="height: 200px; width:100%;" ondblclick='insertImage();'>
+			<select id="imageSelector" multiple="multiple" style="height:200px;width:100%;" ondblclick='insertImage();'>
 			#foreach( $flag in $flags )
 			<option value="../dhis-web-commons/flags/${flag}.png">$i18n.getString( ${flag} )</option>
 			#end