=== modified file 'dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/webapp/dhis-web-maintenance-patient/addMultiProgramValidationForm.vm'
--- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/webapp/dhis-web-maintenance-patient/addMultiProgramValidationForm.vm	2012-01-13 02:14:28 +0000
+++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/webapp/dhis-web-maintenance-patient/addMultiProgramValidationForm.vm	2012-03-15 09:28:38 +0000
@@ -14,22 +14,25 @@
     <tbody>
 	
 	<tr>
-		<td width="20em" colspan='2'>
+		<td>
 			<label>$i18n.getString('description')</label>
 		</td>
 	</tr>
 	<tr>
 		<td colspan='2'>			
-			<input type="text" id='description' name='description' style="width:100%" class="{validate:{required:true,minlength:4}}">
+			<input type="text" id='description' name='description' style='width:640px' class="{validate:{required:true,minlength:4}}">
 		</td>
 	</tr>
 	<tr>
+		<td>&nbsp;</td>
+	</tr>
+	<tr>
 		<th colspan='2'>
 			<label>$i18n.getString('validation')</label>
 		</th>
 	</tr>
 	<tr>
-		<td width="20em">
+		<td>
 			<label>$i18n.getString('left_side')</label>
 		</td>
 		<td>
@@ -38,7 +41,7 @@
 	</tr>
 	<tr>
 		<td>
-			<select style="width:30.2em" id='leftStage' name='leftStage' onchange="getLeftPrgramStageDataElements();">
+			<select id='leftStage' name='leftStage' onchange="getLeftPrgramStageDataElements();">
 				<option value=''>[$i18n.getString( "please_select" )]</option>
 				#foreach($stage in $program.programStages)
 				<option value='$stage.id'>$stage.name</option>
@@ -46,7 +49,7 @@
 			</select>
 		</td>
 		<td>
-			<select style="width:30.2em" id='rightStage' name='rightStage' onchange="getRightPrgramStageDataElements();">
+			<select id='rightStage' name='rightStage' onchange="getRightPrgramStageDataElements();">
 				<option value=''>[$i18n.getString( "please_select" )]</option>
 				#foreach($stage in $program.programStages)
 				<option value='$stage.id'>$stage.name</option>
@@ -56,66 +59,69 @@
 	</tr>
 	<tr>
 		<td>
-			<select style="width:30.2em" id='leftSideDE' name='leftSideDE' size='7' ondblclick="insertDataElement(this, 'leftSide', 'leftStageDescription');" >
+			<select id='leftSideDE' name='leftSideDE' size='7' ondblclick="insertDataElement(this, 'leftSide', 'leftStageDescription');" >
 			</select>
 		</td>
 		<td>
-			<select style="width:30.2em" id='rightSideDE' name='rightSideDE' size='7' ondblclick="insertDataElement(this, 'rightSide', 'rightStageDescription' );">
+			<select id='rightSideDE' name='rightSideDE' size='7' ondblclick="insertDataElement(this, 'rightSide', 'rightStageDescription' );">
 			</select>
 		</td>
 	</tr>
 	<tr>
 		<td>
-			<img src="../images/plus.png" alt="$i18n.getString( 'plus' )" onclick='insertOperator( "leftStageDescription", "leftSide", "+" );' style="cursor:pointer;"/>
-			&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
-			<img src="../images/less.png" alt="$i18n.getString( 'less' )" onclick='insertOperator( "leftStageDescription", "leftSide", "<" );' style="cursor:pointer;">
-			<img src="../images/less_or_equal.png" alt="$i18n.getString( 'less_or_equal' )" onclick='insertOperator( "leftStageDescription", "leftSide", "<=" );' style="cursor:pointer;">
-			<img src="../images/greater.png" alt="$i18n.getString( 'greater' )" onclick='insertOperator( "leftStageDescription", "leftSide", ">" );' style="cursor:pointer;">
-			<img src="../images/greater_or_equal.png" alt="$i18n.getString( 'greater_or_equal' )" onclick='insertOperator( "leftStageDescription", "leftSide", ">=" );' style="cursor:pointer;">
-			<img src="../images/equal.png" alt="$i18n.getString( 'equal' )" onclick='insertOperator( "leftStageDescription", "leftSide", "==" );' style="cursor:pointer;"/>
-			<img src="../images/diff.png" alt="$i18n.getString( 'diff' )" onclick='insertOperator( "leftStageDescription", "leftSide", "!=" );' style="cursor:pointer;"/>
-			&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
-			<img src="../images/clear.png" align="right" alt="$i18n.getString( 'clear' )" onclick="clearValidation( 'leftSide', 'leftStageDescription' )" style="cursor:pointer;margin-right:0.5em"/>
+			<img src="../images/plus.png" alt="$i18n.getString( 'plus' )" onclick='insertOperator( "leftStageDescription", "leftSide", "+" );' class="imgButton"/>
+			&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
+			<img src="../images/less.png" alt="$i18n.getString( 'less' )" onclick='insertOperator( "leftStageDescription", "leftSide", "<" );' class="imgButton" />
+			<img src="../images/less_or_equal.png" alt="$i18n.getString( 'less_or_equal' )" onclick='insertOperator( "leftStageDescription", "leftSide", "<=" );' class="imgButton" />
+			<img src="../images/greater.png" alt="$i18n.getString( 'greater' )" onclick='insertOperator( "leftStageDescription", "leftSide", ">" );' class="imgButton" />
+			<img src="../images/greater_or_equal.png" alt="$i18n.getString( 'greater_or_equal' )" onclick='insertOperator( "leftStageDescription", "leftSide", ">=" );' class="imgButton" />
+			<img src="../images/equal.png" alt="$i18n.getString( 'equal' )" onclick='insertOperator( "leftStageDescription", "leftSide", "==" );' class="imgButton"/>
+			<img src="../images/diff.png" alt="$i18n.getString( 'diff' )" onclick='insertOperator( "leftStageDescription", "leftSide", "!=" );' class="imgButton"/>
+			&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
+			<img src="../images/clear.png" align="right" alt="$i18n.getString( 'clear' )" onclick="clearValidation( 'leftSide', 'leftStageDescription' )" class="imgButton"/>
 		</td>
 		<td>
-			<img src="../images/plus.png" alt="$i18n.getString( 'plus' )" onclick='insertOperator( "rightStageDescription", "rightSide", "+" );' style="cursor:pointer;"/>
+			<img src="../images/plus.png" alt="$i18n.getString( 'plus' )" onclick='insertOperator( "rightStageDescription", "rightSide", "+" );' class="imgButton" />
 			&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
-			<img src="../images/less.png" alt="$i18n.getString( 'less' )" onclick='insertOperator( "rightStageDescription", "rightSide", "<" );' style="cursor:pointer;">
-			<img src="../images/less_or_equal.png" alt="$i18n.getString( 'less_or_equal' )" onclick='insertOperator( "rightStageDescription", "rightSide", "<=" );' style="cursor:pointer;">
-			<img src="../images/greater.png" alt="$i18n.getString( 'greater' )" onclick='insertOperator( "rightStageDescription", "rightSide", ">" );' style="cursor:pointer;">
-			<img src="../images/greater_or_equal.png" alt="$i18n.getString( 'greater_or_equal' )" onclick='insertOperator( "rightStageDescription", "rightSide", ">=" );' style="cursor:pointer;">
-			<img src="../images/equal.png" alt="$i18n.getString( 'equal' )" onclick='insertOperator( "rightStageDescription", "rightSide", "==" );' style="cursor:pointer;"/>
-			<img src="../images/diff.png" alt="$i18n.getString( 'diff' )" onclick='insertOperator( "rightStageDescription", "rightSide", "!=" );' style="cursor:pointer;"/>
+			<img src="../images/less.png" alt="$i18n.getString( 'less' )" onclick='insertOperator( "rightStageDescription", "rightSide", "<" );' class="imgButton" />
+			<img src="../images/less_or_equal.png" alt="$i18n.getString( 'less_or_equal' )" onclick='insertOperator( "rightStageDescription", "rightSide", "<=" );' class="imgButton" />
+			<img src="../images/greater.png" alt="$i18n.getString( 'greater' )" onclick='insertOperator( "rightStageDescription", "rightSide", ">" );' class="imgButton" >
+			<img src="../images/greater_or_equal.png" alt="$i18n.getString( 'greater_or_equal' )" onclick='insertOperator( "rightStageDescription", "rightSide", ">=" );' class="imgButton" >
+			<img src="../images/equal.png" alt="$i18n.getString( 'equal' )" onclick='insertOperator( "rightStageDescription", "rightSide", "==" );' class="imgButton" />
+			<img src="../images/diff.png" alt="$i18n.getString( 'diff' )" onclick='insertOperator( "rightStageDescription", "rightSide", "!=" );' class="imgButton" />
 			
-			<img src="../images/clear.png" align='right' alt="$i18n.getString( 'clear' )" onclick="clearValidation( 'rightSide', 'rightStageDescription' )" style="cursor:pointer;margin-right:0.5em"/>
-		</td>
-	</tr>
-	<tr>	
-		<td>
-			<textarea rows='5' style="width:30em" id='leftSide' name='leftSide' class="{validate:{required:true,minlength:4}}" onkeyup="getValidationDescription('leftStageDescription', 'leftSide')"></textarea>
-		</td>
-		<td>
-			<textarea rows='5' style="width:30em" id='rightSide' name='rightSide' class="{validate:{required:true,minlength:4}}" onkeyup="getValidationDescription('rightStageDescription', 'rightSide')"></textarea>
-		</td>
-	</tr>
-	<tr>	
-		<td>
-			<fieldset style="border: 1px solid #3f5d8e; ">
-				<legend>$i18n.getString( "description" )</legend>
-				<div id='leftStageDescription' style="width:29em"></div>
-			</fieldset>
-		</td>
-		<td>
-			<fieldset style="border: 1px solid #3f5d8e; ">
-				<legend>$i18n.getString( "description" )</legend>
-				<div id='rightStageDescription' style="width:29em;"></div>
-			</fieldset>
-		</td>
-	</tr>
-	<tr>
-		<td>
-			<input type='submit' value="$i18n.getString( "add" )" style="width:10em">
-			<input type='button' value="$i18n.getString( "cancel" )" style="width:10em" onclick="window.location.href='programValidation.action?programId=$program.id'">
+			<img src="../images/clear.png" align='right' alt="$i18n.getString( 'clear' )" onclick="clearValidation( 'rightSide', 'rightStageDescription' )" class="imgButton" />
+		</td>
+	</tr>
+	<tr>	
+		<td>
+			<textarea rows='5' id='leftSide' name='leftSide' class="{validate:{required:true,minlength:4}}" onkeyup="getValidationDescription('leftStageDescription', 'leftSide')"></textarea>
+		</td>
+		<td>
+			<textarea rows='5' id='rightSide' name='rightSide' class="{validate:{required:true,minlength:4}}" onkeyup="getValidationDescription('rightStageDescription', 'rightSide')"></textarea>
+		</td>
+	</tr>
+	<tr>	
+		<td>
+			<fieldset>
+				<legend>$i18n.getString( "description" )</legend>
+				<div id='leftStageDescription'></div>
+			</fieldset>
+		</td>
+		<td>
+			<fieldset>
+				<legend>$i18n.getString( "description" )</legend>
+				<div id='rightStageDescription'></div>
+			</fieldset>
+		</td>
+	</tr>
+	<tr>
+		<td>&nbsp;</td>
+	</tr>
+	<tr>
+		<td>
+			<input type='submit' value="$i18n.getString( 'add' )" >
+			<input type='button' value="$i18n.getString( 'cancel' )" onclick="window.location.href='programValidation.action?programId=$program.id'">
 		</td>
 		<td></td>
 	</tr>

=== modified file 'dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/webapp/dhis-web-maintenance-patient/addPatientAttributeForm.vm'
--- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/webapp/dhis-web-maintenance-patient/addPatientAttributeForm.vm	2011-09-29 04:17:34 +0000
+++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/webapp/dhis-web-maintenance-patient/addPatientAttributeForm.vm	2012-03-15 09:28:38 +0000
@@ -38,20 +38,20 @@
     <tbody>
     <tr>
         <td><label>$i18n.getString( "name" ) <em title="$i18n.getString( 'required' )" class="required">*</em></label></td>
-        <td><input type="text" id="name" name="name" style="width:30em" class="{validate:{required:true,rangelength:[2,160]}}"/></td>
+        <td><input type="text" id="name" name="name" class="{validate:{required:true,rangelength:[2,160]}}"/></td>
         <td></td>
     </tr>   
     
     <tr>
         <td><label>$i18n.getString( "description" ) <em title="$i18n.getString( 'required' )" class="required">*</em></label></td>
-        <td><input type="text" id="description" name="description" style="width:30em" class="{validate:{required:true,minlength:2}}"/></td>
+        <td><input type="text" id="description" name="description" class="{validate:{required:true,minlength:2}}"/></td>
         <td></td>
     </tr>
     
     <tr>
 		<td><label for="mandatory">$i18n.getString( "mandatory" )<em title="$i18n.getString( 'required' )" class="required">*</em></label></td>
 		<td>
-			<select id="mandatory" name="mandatory" style="min-width:30.5em">
+			<select id="mandatory" name="mandatory">
 				<option value="true" >$i18n.getString( "yes" )</option>
 				<option value="false" selected="selected">$i18n.getString( "no" )</option>
 			</select>
@@ -62,7 +62,7 @@
     <tr>
     	<td><label for="inheritable">$i18n.getString( "inheritable" )<em title="$i18n.getString( 'required' )" class="required">*</em></label></td>
 		<td>
-			<select id="inheritable" name="inheritable" style="min-width:30.5em">
+			<select id="inheritable" name="inheritable">
 				<option value="true" >$i18n.getString( "yes" )</option>
 				<option value="false" selected="selected">$i18n.getString( "no" )</option>
 			</select>
@@ -72,14 +72,14 @@
     <tr>
 		<td><label for="noChar">$i18n.getString( "no_of_char" )</label></td>
 		<td>
-			<input type="text" name="noChars" id="noChars" class="{validate:{required:false, number:true}}" style="min-width:30em" />
+			<input type="text" name="noChars" id="noChars" class="{validate:{required:false, number:true}}" />
 		</td>		
 		<td></td>				
 	</tr>
     <tr>
         <td><label for="valueType">$i18n.getString( "value_type" ) <em title="$i18n.getString( 'required' )" class="required">*</em></label></td>
         <td>
-            <select id="valueType" name="valueType" style="min-width:30.5em" onchange="ATTRIBUTE_OPTION.selectValueType(this);">
+            <select id="valueType" name="valueType" onchange="ATTRIBUTE_OPTION.selectValueType(this);">
                 <option value="NUMBER" selected="selected">$i18n.getString( "number" )</option>
                 <option value="TEXT">$i18n.getString( "text" )</option>
                 <option value="YES/NO">$i18n.getString( "yes_no" )</option>
@@ -99,12 +99,15 @@
     	<td><label for="groupBy">$i18n.getString( "groupBy" )</td>
     	<td><input type="checkbox" name="groupBy" value="true"/></td>
     </tr>
-     </tbody>
+    </tbody>
+	<tr>
+		<td></td>
+		<td>
+			<input type="submit" value="$i18n.getString( 'add' )" />
+    <input type="button" value="$i18n.getString( 'cancel' )" onclick="window.location.href='patientAttribute.action'" />
+		</td>
+	</tr>
 </table>
 <span id='message'></span>
-<p>
-    <input type="submit" value="$i18n.getString( 'add' )" style="width:10em"/>
-    <input type="button" value="$i18n.getString( 'cancel' )" onclick="window.location.href='patientAttribute.action'" style="width:10em"/>
-</p>
 
 </form>   

=== modified file 'dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/webapp/dhis-web-maintenance-patient/addPatientAttributeGroupForm.vm'
--- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/webapp/dhis-web-maintenance-patient/addPatientAttributeGroupForm.vm	2011-11-02 07:37:12 +0000
+++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/webapp/dhis-web-maintenance-patient/addPatientAttributeGroupForm.vm	2012-03-15 09:28:38 +0000
@@ -1,22 +1,10 @@
 <script>
 	var i18n_remove_option = '$encoder.jsEscape( $i18n.getString( "remove_option" ) , "'") ';
-
+	
 	jQuery(document).ready(	function(){
 		
 		jQuery('name').focus();
 		
-		validation2( 'addPatientAttributeGroupForm', function(form){
-			form.submit();
-		}, {
-			'beforeValidateHandler' : function()
-			{
-				listValidator( 'memberValidator', 'selectedAttributes' );
-			},
-			'rules' : getValidationRules( 'patientAttributeGroup' )
-		} ); 
-		
-		checkValueIsExist( "name", "validatePatientAttributeGroup.action" );
-		
 		jQuery("#availableAttributes").dhisAjaxSelect({
 			source: 'getProgramAttributeWithoutGroup.action',
 			iterator: 'patientAttributes',
@@ -29,6 +17,21 @@
 				return option;
 			}
 		});
+		
+		
+		validation2( 'addPatientAttributeGroupForm', function(form){
+			form.submit();
+		}, {
+			'beforeValidateHandler' : function()
+			{
+				listValidator( 'memberValidator', 'selectedAttributes' );
+			},
+			'rules' : getValidationRules( 'patientAttributeGroup' )
+		} ); 
+		
+		checkValueIsExist( "name", "validatePatientAttributeGroup.action" );
+		
+		
 	});		
 </script>
 	
@@ -42,51 +45,49 @@
 	</tr>
 	<tr>
 		<td>$i18n.getString( "name" ) <em title="$i18n.getString( 'required' )" class="required">*</em></td>
-		<td><input type="text" id="name" name="name" style="width:20em"/></td>
-	</tr>   
+		<td><input type="text" id="name" name="name"/></td>
+	</tr> 	
 	<tr>
 		<td>$i18n.getString( "description" ) <em title="$i18n.getString( 'required' )" class="required">*</em></td>
-		<td><input type="text" id="description" name="description" style="width:20em"/></td>
+		<td><input type="text" id="description" name="description"/></td>
 	</tr>
 	<tr>
-		<td colspan="2" height="15px"></td>
+		<td colspan="2">&nbsp;</td>
 	</tr>
 </table>
 
 <table>
-	<col style="width: 450px"/>
-	<col/>
-	<col style="width: 450px"/>
 	
 	<tr>
 		<th>$i18n.getString( "availableAttribute" )</th>
 		<th>$i18n.getString( "filter" )</th>
 		<th>$i18n.getString( "selectedAttribute" )
-			<select id="memberValidator" multiple="multiple" style="display:none" class="{validate:{required:true}}"/>
+			<select id="memberValidator" multiple="multiple" class="{validate:{required:true}} hidden"/>
 		</th>
 	</tr>
 	
 	<tr>
 		<td>
-			<select multiple id="availableAttributes" name="availableAttributes" size="15" style="width:100%"></select>
-		</td>
-		<td style="text-align:center">
-			<input type="button" value="&gt;" title="$i18n.getString('move_selected')" onclick="dhisAjaxSelect_moveAllSelected( 'availableAttributes', 'selectedAttributes' )"/><br/>
-			<input type="button" value="&lt;" title="$i18n.getString('remove_selected')" onclick="dhisAjaxSelect_moveAllSelected( 'selectedAttributes', 'availableAttributes' )"/>
-		</td>
-		<td>
-			<select multiple id="selectedAttributes" name="selectedAttributes" size="15" style="width:100%"></select>
+			<select multiple="multiple" id="availableAttributes" name="availableAttributes" size="15" ></select>
+		</td>
+		<td>
+			<input type="button" value="&gt;" title="$i18n.getString('move_selected')" onclick="dhisAjaxSelect_moveAllSelected( 'availableAttributes', 'selectedAttributes' )" class='filterButton'/><br/>
+			<input type="button" value="&lt;" title="$i18n.getString('remove_selected')" onclick="dhisAjaxSelect_moveAllSelected( 'selectedAttributes', 'availableAttributes' )" class='filterButton'/>
+		</td>
+		<td>
+			<select multiple="multiple" id="selectedAttributes" name="selectedAttributes" size="15" ></select>
 		</td>
 		<td>
 			<a href="javascript:moveUpSelectedOption( 'selectedAttributes')" title="$i18n.getString( 'move_up' )"><img src="../images/move_up.png" alt="$i18n.getString( 'move_up' )"/></a><br/><br/>
 			<a href="javascript:moveDownSelectedOption( 'selectedAttributes' )" title="$i18n.getString( 'move_down' )"><img src="../images/move_down.png" alt="$i18n.getString( 'move_up' )"/></a>
 		</td>
-	</tr>        
+	</tr>  
+	<tr>
+		<td>
+			<input type="submit" value="$i18n.getString( 'add' )" />
+			<input type="button" value="$i18n.getString( 'cancel' )" onclick="window.location.href='patientAttributeGroup.action'"/>
+		</td>
+	</tr>
 </table>
 
-<p>
-    <input type="submit" value="$i18n.getString( 'add' )" style="width:10em"/>
-    <input type="button" value="$i18n.getString( 'cancel' )" onclick="window.location.href='patientAttributeGroup.action'" style="width:10em"/>
-</p>
-
 </form>
\ No newline at end of file

=== modified file 'dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/webapp/dhis-web-maintenance-patient/addPatientChartForm.vm'
--- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/webapp/dhis-web-maintenance-patient/addPatientChartForm.vm	2011-10-03 09:40:38 +0000
+++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/webapp/dhis-web-maintenance-patient/addPatientChartForm.vm	2012-03-15 09:28:38 +0000
@@ -20,13 +20,13 @@
     </tr>
     <tr>
         <td><label for="title">$i18n.getString( "title" ) <em title="$i18n.getString( "required" )" class="required">*</em></label></td>
-        <td><input type="text" id="title" name="title" style="width:298px" class="{validate:{required:true,minlength:4}}"></td>
+        <td><input type="text" id="title" name="title" class="{validate:{required:true,minlength:4}}"></td>
     </tr>
 
     <tr>
     	<td><label for="type">$i18n.getString( "chart_type" ) <em title="$i18n.getString( "required" )" class="required">*</em></label></td>
     	<td>
-    		<select id="type" name="type" style="width:300px">
+    		<select id="type" name="type">
     			<option value="bar">$i18n.getString( "bar_chart" )</option>
     			<option value="bar3d">$i18n.getString( "bar3d_chart" )</option>
     			<option value="line">$i18n.getString( "line_chart" )</option>
@@ -37,7 +37,7 @@
     <tr>
         <td><label for="type">$i18n.getString( "chart_size" ) <em title="$i18n.getString( "required" )" class="required">*</em></label></td>
         <td>
-            <select id="size" name="size" style="width:300px">
+            <select id="size" name="size" >
                 <option value="normal"#if ( $!chart.size == "normal" ) selected#end>$i18n.getString( "normal" )</option>
                 <option value="wide"#if ( $!chart.size == "wide" ) selected#end>$i18n.getString( "wide" )</option>
                 <option value="tall"#if ( $!chart.size == "tall" ) selected#end>$i18n.getString( "tall" )</option>
@@ -49,7 +49,7 @@
         <td><input type="checkbox" id="regression" name="regression" value="true" ></td>
     </tr>
     <tr>
-        <td colspan="2" style="height:15px"></td>
+        <td>&nbsp;</td>
     </tr>
 	
 	<!-- dataelements -->
@@ -57,7 +57,7 @@
 	<tr>
         <td>$i18n.getString( "value_x_dataelements" ) <em title="$i18n.getString( "required" )" class="required">*</em></td>
         <td>
-            <select id="dataElementId" name="dataElementId" style="width:300px" class="{validate:{required:true}}">
+            <select id="dataElementId" name="dataElementId" class="{validate:{required:true}}">
 				<option value="">$i18n.getString('please_select')</option>
                 #foreach( $dataElement in $dataElements )
                     <option value="$dataElement.id">$dataElement.name</option>
@@ -66,19 +66,16 @@
         </td>
     </tr>
     <tr>
-        <td colspan="2" style="height:15px"></td>
+        <td>&nbsp;</td>
     </tr>
-
-</table>
-
-<table>
-    <tr>        
-        <td colspan="2">
-            <input type="submit" value="$i18n.getString( 'save' )" style="width:120px" />
-            <input type="button" value="$i18n.getString( 'back' )" onclick="javascript:window.location.href='patientChartList.action?programId=$programId'" style="width:120px" />
+	<tr>   
+		<td></td>
+        <td>
+            <input type="submit" value="$i18n.getString( 'save' )" />
+            <input type="button" value="$i18n.getString( 'back' )" onclick="javascript:window.location.href='patientChartList.action?programId=$programId'" />
         </td>
     </tr>
-    
+
 </table>
 
 </form>

=== modified file 'dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/webapp/dhis-web-maintenance-patient/addPatientIdentifierTypeForm.vm'
--- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/webapp/dhis-web-maintenance-patient/addPatientIdentifierTypeForm.vm	2011-09-29 04:17:34 +0000
+++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/webapp/dhis-web-maintenance-patient/addPatientIdentifierTypeForm.vm	2012-03-15 09:28:38 +0000
@@ -25,20 +25,20 @@
 	<tbody>
 		<tr>
 			<td><label>$i18n.getString( "name" ) <em title="$i18n.getString( 'required' )" class="required">*</em></label></td>
-			<td><input type="text" id="name" name="name"  maxlength="30" style="width:30em" class="{validate:{required:true,rangelength:[4,100]}}"/></td>
+			<td><input type="text" id="name" name="name" class="{validate:{required:true,rangelength:[4,100]}}"/></td>
 			<td></td>
 		</tr>	
 		
 		<tr>
 			<td><label>$i18n.getString( "description" ) <em title="$i18n.getString( 'required' )" class="required">*</em></label></td>
-			<td><input type="text" id="description" name="description" style="width:30em" class="{validate:{required:true,minlength:4, maxlength: 150}}"/></td>
+			<td><input type="text" id="description" name="description" class="{validate:{required:true,minlength:4, maxlength: 150}}"/></td>
 			<td></td>
 		</tr>	
 		
 		<tr>
 			<td><label for="mandatory">$i18n.getString( "mandatory" )<em title="$i18n.getString( 'required' )" class="required">*</em></label></td>
 			<td>
-				<select id="mandatory" name="mandatory" style="min-width:30.2em" class="{validate:{required:true}}">
+				<select id="mandatory" name="mandatory" class="{validate:{required:true}}">
 					<option value="true">$i18n.getString( "yes" )</option>
 					<option value="false" selected="selected">$i18n.getString( "no" )</option>
 				</select>
@@ -49,7 +49,7 @@
 		<tr>
 			<td><label for="related">$i18n.getString( "related" )<em title="$i18n.getString( 'required' )" class="required">*</em></label></td>
 			<td>
-				<select id="related" name="related" style="min-width:30.2em" class="{validate:{required:true}}">
+				<select id="related" name="related" class="{validate:{required:true}}">
 					<option value="true" >$i18n.getString( "yes" )</option>
 					<option value="false" selected="selected">$i18n.getString( "no" )</option>
 				</select>
@@ -59,7 +59,7 @@
 		<tr>
 			<td><label for="noChar">$i18n.getString( "no_of_char" )</label></td>
 			<td>
-				<input type="text" name="noChars" id="noChars" class="{validate:{required:false, number:true}}" style="min-width:30em" />
+				<input type="text" name="noChars" id="noChars" class="{validate:{required:false, number:true}}" />
 			</td>
 			<td></td>
 		</tr>
@@ -67,7 +67,7 @@
 		<tr>
 			<td><label for="type">$i18n.getString( "type" )<em title="$i18n.getString( 'required' )" class="required">*</em></label></td>
 			<td>
-				<select id="type" name="type" style="min-width:30.2em" class="{validate:{required:true}}">
+				<select id="type" name="type" class="{validate:{required:true}}">
 					<option value="text" selected="selected">$i18n.getString( "text" )</option>
 					<option value="number">$i18n.getString( "number" )</option>
 					<option value="letter">$i18n.getString( "letter" )</option>
@@ -75,11 +75,12 @@
 			</td>
 			<td></td>
 		</tr>
+		<tbody>
 		<tr>
 			<td></td>
 			<td>
-				<input type="submit" value="$i18n.getString( 'add' )" style="width:10em"/>
-				<input type="button" value="$i18n.getString( 'cancel' )" onclick="window.location.href='patientIdentifierType.action'" style="width:10em"/>
+				<input type="submit" value="$i18n.getString( 'add' )" />
+				<input type="button" value="$i18n.getString( 'cancel' )" onclick="window.location.href='patientIdentifierType.action'" />
 			</td>
 		</tr>
 	</tbody>

=== modified file 'dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/webapp/dhis-web-maintenance-patient/addProgramAttributeForm.vm'
--- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/webapp/dhis-web-maintenance-patient/addProgramAttributeForm.vm	2011-09-29 04:17:34 +0000
+++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/webapp/dhis-web-maintenance-patient/addProgramAttributeForm.vm	2012-03-15 09:28:38 +0000
@@ -38,20 +38,20 @@
     <tbody>
 		<tr>
 			<td width="20em"><label>$i18n.getString( "name" )</label></td>
-			<td><input type="text" id="name" name="name" style="width:30em"/></td>
+			<td><input type="text" id="name" name="name" /></td>
 			<td></td>
 		</tr>   
 		
 		<tr>
 			<td width="20em" ><label>$i18n.getString( "description" ) <em title="$i18n.getString( 'required' )" class="required">*</em></label></td>
-			<td><input type="text" id="description" name="description" style="width:30em" class="{validate:{required:true,minlength:2}}"/></td>
+			<td><input type="text" id="description" name="description" class="{validate:{required:true,minlength:2}}"/></td>
 			<td></td>
 		</tr>
 		
 		<tr>
 			<td width="20em"><label for="valueType">$i18n.getString( "value_type" ) <em title="$i18n.getString( 'required' )" class="required">*</em></label></td>
 			<td>
-				<select id="valueType" name="valueType" style="min-width:30.5em" onchange="ATTRIBUTE_OPTION.selectValueType(this);">
+				<select id="valueType" name="valueType" onchange="ATTRIBUTE_OPTION.selectValueType(this);">
 					<option value="NUMBER" selected="selected">$i18n.getString( "number" )</option>
 					<option value="TEXT">$i18n.getString( "text" )</option>
 					<option value="YES/NO">$i18n.getString( "yes_no" )</option>
@@ -69,11 +69,13 @@
 			<td><span id="attrMessage"  name="attrMessage" style="color:red;"></span></td>
 		</tr>
     </tbody>
+	<tr>
+		<td></td>
+		<td>
+			<input type="submit" value="$i18n.getString( 'add' )" />
+			<input type="button" value="$i18n.getString( 'cancel' )" onclick="window.location.href='programAttribute.action'" />
+		</td>
+	</tr>
 </table>
 
-<p>
-    <input type="submit" value="$i18n.getString( 'add' )" style="width:10em"/>
-    <input type="button" value="$i18n.getString( 'cancel' )" onclick="window.location.href='programAttribute.action'" style="width:10em"/>
-</p>
-
 </form>   

=== modified file 'dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/webapp/dhis-web-maintenance-patient/addProgramForm.vm'
--- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/webapp/dhis-web-maintenance-patient/addProgramForm.vm	2012-03-01 07:44:57 +0000
+++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/webapp/dhis-web-maintenance-patient/addProgramForm.vm	2012-03-15 09:28:38 +0000
@@ -23,13 +23,13 @@
 	<tbody>
 		<tr>
 			<td><label>$i18n.getString( "name" ) <em title="$i18n.getString( "required" )" class="required">*</em></label></td>
-			<td><input type="text" id="name" name="name" style="width:30em" class="{validate:{required:true,minlength:4}}"></td>
+			<td><input type="text" id="name" name="name" class="{validate:{required:true,minlength:4}}"></td>
 			<td></td>
 		</tr>	
 		
 		<tr>
 			<td><label>$i18n.getString( "description" ) <em title="$i18n.getString( "required" )" class="required">*</em></label></td>
-			<td><input type="text" id="description" name="description" style="width:30em" class="{validate:{required:true,minlength:4}}"></td>
+			<td><input type="text" id="description" name="description" class="{validate:{required:true,minlength:4}}"></td>
 			<td></td>
 		</tr>	
 		
@@ -53,31 +53,30 @@
 		
 		<tr>
 			<td><label>$i18n.getString( "date_of_enrollment_description" ) <em title="$i18n.getString( "required" )" class="required">*</em></label></td>
-			<td><input type="text" id="dateOfEnrollmentDescription" name="dateOfEnrollmentDescription" style="width:30em" class="{validate:{required:true,minlength:4}}"></td>
+			<td><input type="text" id="dateOfEnrollmentDescription" name="dateOfEnrollmentDescription" class="{validate:{required:true,minlength:4}}"></td>
 			<td></td>
 		</tr>	
 		
 		<tr>
 			<td><label>$i18n.getString( "date_of_incident_description" ) <em title="$i18n.getString( "required" )" class="required">*</em></label></td>
-			<td><input type="text" id="dateOfIncidentDescription" name="dateOfIncidentDescription" style="width:30em" class="{validate:{required:true,minlength:4}}"></td>
+			<td><input type="text" id="dateOfIncidentDescription" name="dateOfIncidentDescription" class="{validate:{required:true,minlength:4}}"></td>
 			<td></td>
 		</tr>	
 		
 		<tr>
 			<td><label>$i18n.getString( "no_max_days_allowed_input_data" ) <em title="$i18n.getString( "required" )" class="required">*</em></label></td>
-			<td><input type="text" id="maxDaysAllowedInputData" name="maxDaysAllowedInputData" style="width:30em" class="{validate:{required:true,number:true}}"></td>
+			<td><input type="text" id="maxDaysAllowedInputData" name="maxDaysAllowedInputData" class="{validate:{required:true,number:true}}"></td>
 			<td></td>
 		</tr>	
 		
 		<tr>
-			<td colspan="2" style="height:15px"></td>
+			<td></td>
+			<td>
+				<input type="submit" value="$i18n.getString( 'add' )" >
+				<input type="button" value="$i18n.getString( 'cancel' )" onclick="window.location.href='program.action'" >
+			</td>
 		</tr>
 	</tbody>
 </table>
 
-<p>
-	<input type="submit" value="$i18n.getString( "add" )" style="width:10em">
-	<input type="button" value="$i18n.getString( "cancel" )" onclick="window.location.href='program.action'" style="width:10em">
-</p>
-
 </form>
\ No newline at end of file

=== modified file 'dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/webapp/dhis-web-maintenance-patient/addProgramStageForm.vm'
--- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/webapp/dhis-web-maintenance-patient/addProgramStageForm.vm	2012-01-11 05:31:53 +0000
+++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/webapp/dhis-web-maintenance-patient/addProgramStageForm.vm	2012-03-15 09:28:38 +0000
@@ -16,43 +16,30 @@
 	});
 </script>
 
-<style>
-tr.selected{
-	background-color:#3399FF;
-	color:#FFFFFF;
-}
-#selectedList tr{
-	cursor:pointer;
-}
-</style>
-
 <h3>$i18n.getString( "create_new_program_stage" )</h3>
 																		
 <form id="addProgramStageForm" name="addProgramStageForm" action="addProgramStage.action" method="post">
-
-<div style="display:inline">
 	<input type="hidden" id="id" name="id" value="$program.id"/>
-</div>
 
 <table>
 	<tr>
 		<td><label>$i18n.getString( "name" ) <em title="$i18n.getString( 'required' )" class="required">*</em></label></td>
-		<td><input type="text" id="name" name="name" maxlength="160" style="width:30em" class="{validate:{required:true,rangelength:[4,160]}}"/></td>
+		<td><input type="text" id="name" name="name" class="{validate:{required:true,rangelength:[4,160]}}"/></td>
 	</tr>	
 	
 	<tr>
 		<td><label>$i18n.getString( "description" ) <em title="$i18n.getString( 'required' )" class="required">*</em></label></td>
-		<td><input type="text" id="description" name="description" style="width:30em" class="{validate:{required:true,minlength:4}}"/></td>
+		<td><input type="text" id="description" name="description" class="{validate:{required:true,minlength:4}}"/></td>
 	</tr>
 		
 	<tr>
         <td><label>$i18n.getString( "min_days_from_start" )</label></td>
-        <td><input type="text" id="minDaysFromStart" name="minDaysFromStart" maxlength="30" style="width:30em" class="{validate:{number:true,min:0}}"/></td>
+        <td><input type="text" id="minDaysFromStart" name="minDaysFromStart" class="{validate:{number:true,min:0}}"/></td>
     </tr>
     
     <tr>
         <td><label>$i18n.getString( "program" )</label></td>
-        <td><input type="text" id="program" name="program" maxlength="30" value="$encoder.htmlEncode( $program.name )" style="width:30em" disabled="disabled"/></td>
+        <td><input type="text" id="program" name="program" value="$encoder.htmlEncode( $program.name )" disabled="disabled"/></td>
     </tr> 
 
 	<tr>
@@ -69,8 +56,8 @@
         <th>$i18n.getString( "available_data_elements" )</th>
         <th></th>
         <th>$i18n.getString( "selected_data_elements" )							
-			<select id="selectedDataElementsValidator" name='selectedDataElementsValidator' multiple="multiple" class="{validate:{required:true}}" style="display:none"></select>
-			<select id="compulsories" name='compulsories' multiple="multiple" style="display:none"></select>     
+			<select id="selectedDataElementsValidator" name='selectedDataElementsValidator' multiple="multiple" class="{validate:{required:true}} hidden" ></select>
+			<select id="compulsories" name='compulsories' multiple="multiple" class="hidden"></select>     
 		</th>
       </tr>
     </thead>
@@ -78,24 +65,26 @@
     <tbody>
       <tr>
         <td>
-            <select size="15" id="availableList" name='availableList' multiple="multiple" style="width:30em;height:20em" ondblclick="selectDataElements()">
+            <select size="15" id="availableList" name='availableList' multiple="multiple" ondblclick="selectDataElements()">
             </select>
         </td>
-        <td valign="top" align="center">         
-            <input type="button" value="&gt;" onclick="selectDataElements()"/><br/>    
-            <input type="button" value="&lt;" onclick="unSelectDataElements()"/><br/><br/>                    
+        <td>         
+            <input type="button" value="&gt;" onclick="selectDataElements()" class='filterButton' /><br/>    
+            <input type="button" value="&lt;" onclick="unSelectDataElements()" class='filterButton' /><br/><br/>                    
         <td>
-			<div style="overflow:auto; height:20em; width:40em;border:1px solid #9DA1AA">
-				<table width="100%">
+			<div class="dataElementDiv">
+				<table>
 					<thead>
-						<tr><th>$i18n.getString( "dataelement" )</th><th width="20px">$i18n.getString( "compulsory" )</th>
+						<tr>
+							<th>$i18n.getString( "dataelement" )</th>
+							<th width="20px">$i18n.getString( "compulsory" )</th>
 					</thead>
 					<tbody id="selectedList"></tbody>
 				</table>
 			</div>
 			</td>
 			
-		<td style="width:30px; text-align:center">
+		<td>
             <a href="javascript:moveUpDataElement()"><img src="../images/move_up.png"/></a><br/><br/>
             <a href="javascript:moveDownDataElement()"><img src="../images/move_down.png"/></a><br/><br/>
         </td>  
@@ -103,8 +92,8 @@
     </tbody>
 </table>
 <p>
-	<input type="submit" value="$i18n.getString( 'add' )" style="width:10em"/>
-	<input type="button" value="$i18n.getString( 'cancel' )" onclick="window.location.href='programStage.action?id=$program.id'" style="width:10em"/>
+	<input type="submit" value="$i18n.getString( 'add' )"/>
+	<input type="button" value="$i18n.getString( 'cancel' )" onclick="window.location.href='programStage.action?id=$program.id'" />
 </p>
 
 </form> 	

=== modified file 'dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/webapp/dhis-web-maintenance-patient/addRelationshipTypeForm.vm'
--- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/webapp/dhis-web-maintenance-patient/addRelationshipTypeForm.vm	2012-02-27 01:07:19 +0000
+++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/webapp/dhis-web-maintenance-patient/addRelationshipTypeForm.vm	2012-03-15 09:28:38 +0000
@@ -23,24 +23,27 @@
 	<tbody>
 		<tr>
 			<td><label>$i18n.getString( "a_is_to_b" ) <em title="$i18n.getString( 'required' )" class="required">*</em></label></td>
-			<td><input type="text" id="aIsToB" name="aIsToB"  maxlength="30" style="width:30em" class="{validate:{required:true,rangelength:[2,160]}}"/></td>
+			<td><input type="text" id="aIsToB" name="aIsToB" class="{validate:{required:true,rangelength:[2,160]}}"/></td>
 		</tr>   
 		
 		<tr>
 			<td><label>$i18n.getString( "b_is_to_a" ) <em title="$i18n.getString( 'required' )" class="required">*</em></label></td>
-			<td><input type="text" id="bIsToA" name="bIsToA"  maxlength="30" style="width:30em" class="{validate:{required:true,rangelength:[2,160]}}"/></td>
+			<td><input type="text" id="bIsToA" name="bIsToA" class="{validate:{required:true,rangelength:[2,160]}}"/></td>
 		</tr>   
 		
 		<tr>
 			<td><label>$i18n.getString( "description" ) <em title="$i18n.getString( 'required' )" class="required">*</em></label></td>
-			<td><input type="text" id="name" name="name" style="width:30em" class="{validate:{required:true,rangelength:[2,160]}}"/></td>
+			<td><input type="text" id="name" name="name" class="{validate:{required:true,rangelength:[2,160]}}"/></td>
 		</tr>   
     </tbody>
+	
+	<tr>
+		<td></td>
+		<td>
+			<input type="submit" value="$i18n.getString( 'add' )" />
+			<input type="button" value="$i18n.getString( 'cancel' )" onclick="window.location.href='relationshipType.action'" />
+		</td>
+	</tr>
 </table>
 
-<p>
-    <input type="submit" value="$i18n.getString( 'add' )" style="width:10em"/>
-    <input type="button" value="$i18n.getString( 'cancel' )" onclick="window.location.href='relationshipType.action'" style="width:10em"/>
-</p>
-
 </form>
\ No newline at end of file

=== modified file 'dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/webapp/dhis-web-maintenance-patient/addSingleProgramValidationForm.vm'
--- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/webapp/dhis-web-maintenance-patient/addSingleProgramValidationForm.vm	2012-01-13 02:14:28 +0000
+++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/webapp/dhis-web-maintenance-patient/addSingleProgramValidationForm.vm	2012-03-15 09:28:38 +0000
@@ -20,7 +20,7 @@
 	</tr>
 	<tr>
 		<td>			
-			<input type="text" id='description' name='description' style="width:100%" class="{validate:{required:true,minlength:4}}">
+			<input type="text" id='description' name='description' class="{validate:{required:true,minlength:4}}">
 		</td>
 	</tr>
 	<tr>
@@ -30,7 +30,7 @@
 	</tr>
 	<tr>
 		<td>
-			<select style="width:30.2em" id='leftStage' name='leftStage' onchange="getLeftPrgramStageDataElements();">
+			<select id='leftStage' name='leftStage' onchange="getLeftPrgramStageDataElements();">
 				<option value=''>[$i18n.getString( "please_select" )]</option>
 				#foreach($stage in $program.programStages)
 				<option value='$stage.id'>$stage.name</option>
@@ -40,42 +40,42 @@
 	</tr>
 	<tr>
 		<td>
-			<select style="width:30.2em" id='leftSideDE' name='leftSideDE' size='7' ondblclick="insertDataElement(this, 'leftSide', 'leftStageDescription');" >
+			<select id='leftSideDE' name='leftSideDE' size='7' ondblclick="insertDataElement(this, 'leftSide', 'leftStageDescription');" >
 			</select>
 		</td>
 	</tr>
 	<tr>
 		<td>
-			<img src="../images/plus.png" alt="$i18n.getString( 'plus' )" onclick='insertOperator( "leftStageDescription", "leftSide", "+" );' style="cursor:pointer;"/>
-			&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
-			<img src="../images/less.png" alt="$i18n.getString( 'less' )" onclick='insertOperator( "leftStageDescription", "leftSide", "<" );' style="cursor:pointer;">
-			<img src="../images/less_or_equal.png" alt="$i18n.getString( 'less_or_equal' )" onclick='insertOperator( "leftStageDescription", "leftSide", "<=" );' style="cursor:pointer;">
-			<img src="../images/greater.png" alt="$i18n.getString( 'greater' )" onclick='insertOperator( "leftStageDescription", "leftSide", ">" );' style="cursor:pointer;">
-			<img src="../images/greater_or_equal.png" alt="$i18n.getString( 'greater_or_equal' )" onclick='insertOperator( "leftStageDescription", "leftSide", ">=" );' style="cursor:pointer;">
-			<img src="../images/equal.png" alt="$i18n.getString( 'equal' )" onclick='insertOperator( "leftStageDescription", "leftSide", "==" );' style="cursor:pointer;"/>
-			<img src="../images/diff.png" alt="$i18n.getString( 'diff' )" onclick='insertOperator( "leftStageDescription", "leftSide", "!=" );' style="cursor:pointer;"/>
-			&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
-			<img src="../images/clear.png" alt="$i18n.getString( 'clear' )" align='right'  onclick="clearValidation( 'leftSide', 'leftStageDescription' )" style="cursor:pointer;margin-right:0.5em"/>
+			<img src="../images/plus.png" alt="$i18n.getString( 'plus' )" onclick='insertOperator( "leftStageDescription", "leftSide", "+" );' class="imgButton" />
+			&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
+			<img src="../images/less.png" alt="$i18n.getString( 'less' )" onclick='insertOperator( "leftStageDescription", "leftSide", "<" );' class="imgButton" />
+			<img src="../images/less_or_equal.png" alt="$i18n.getString( 'less_or_equal' )" onclick='insertOperator( "leftStageDescription", "leftSide", "<=" );' class="imgButton" />
+			<img src="../images/greater.png" alt="$i18n.getString( 'greater' )" onclick='insertOperator( "leftStageDescription", "leftSide", ">" );' class="imgButton" />
+			<img src="../images/greater_or_equal.png" alt="$i18n.getString( 'greater_or_equal' )" onclick='insertOperator( "leftStageDescription", "leftSide", ">=" );' class="imgButton" />
+			<img src="../images/equal.png" alt="$i18n.getString( 'equal' )" onclick='insertOperator( "leftStageDescription", "leftSide", "==" );' class="imgButton" />
+			<img src="../images/diff.png" alt="$i18n.getString( 'diff' )" onclick='insertOperator( "leftStageDescription", "leftSide", "!=" );' class="imgButton"/>
+			&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
+			<img src="../images/clear.png" alt="$i18n.getString( 'clear' )" align='right'  onclick="clearValidation( 'leftSide', 'leftStageDescription' )" />
 		</td>
 	</tr>
 	<tr>	
 		<td>
-			<textarea rows='5' style="width:30em" id='leftSide' name='leftSide' class="{validate:{required:true,minlength:4}}" onkeyup="getValidationDescription('leftStageDescription', 'leftSide')"></textarea>
+			<textarea rows='5' id='leftSide' name='leftSide' class="{validate:{required:true,minlength:4}}" onkeyup="getValidationDescription('leftStageDescription', 'leftSide')"></textarea>
 			<input type='hidden' id='rightSide' name='rightSide' value='1==1'>
 		</td>
 	</tr>
 	<tr>	
 		<td>
-			<fieldset style="border: 1px solid #3f5d8e; ">
+			<fieldset>
 				<legend>$i18n.getString( "description" )</legend>
-				<div id='leftStageDescription' style="width:29em"></div>
+				<div id='leftStageDescription'></div>
 			</fieldset>
 		</td>
 	</tr>
 	<tr>
 		<td>
-			<input type='submit' value="$i18n.getString( "add" )" style="width:10em">
-			<input type='button' value="$i18n.getString( "cancel" )" style="width:10em" onclick="window.location.href='programValidation.action?programId=$program.id'">
+			<input type='submit' value="$i18n.getString( 'add' )" >
+			<input type='button' value="$i18n.getString( 'cancel' )" onclick="window.location.href='programValidation.action?programId=$program.id'">
 		</td>
 	</tr>
 </table>

=== modified file 'dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/webapp/dhis-web-maintenance-patient/javascript/patientAttribute.js'
--- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/webapp/dhis-web-maintenance-patient/javascript/patientAttribute.js	2012-03-13 09:47:39 +0000
+++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/webapp/dhis-web-maintenance-patient/javascript/patientAttribute.js	2012-03-15 09:28:38 +0000
@@ -93,6 +93,6 @@
 	},
 	createInput : function ()
 	{
-		return "<tr><td><input type='text' name='attrOptions' style='width:28em'/><a href='#' style='text-decoration: none; margin-left:0.5em;' title='"+i18n_remove_option+"'  onClick='ATTRIBUTE_OPTION.remove(this,null)'>[ - ]</a></td></tr>";
+		return "<tr><td><input type='text' name='attrOptions' /><a href='#' style='text-decoration: none; margin-left:0.5em;' title='"+i18n_remove_option+"'  onClick='ATTRIBUTE_OPTION.remove(this,null)'>[ - ]</a></td></tr>";
 	}
 }
\ No newline at end of file

=== modified file 'dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/webapp/dhis-web-maintenance-patient/javascript/programAttribute.js'
--- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/webapp/dhis-web-maintenance-patient/javascript/programAttribute.js	2012-03-13 09:47:39 +0000
+++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/webapp/dhis-web-maintenance-patient/javascript/programAttribute.js	2012-03-15 09:28:38 +0000
@@ -95,6 +95,6 @@
 	},
 	createInput : function ()
 	{
-		return "<tr><td><input type='text' name='attrOptions' style='width:28em'/><a href='#' style='text-decoration: none; margin-left:0.5em;' title='"+i18n_remove_option+"'  onClick='ATTRIBUTE_OPTION.remove(this,null)'>[ - ]</a></td></tr>";
+		return "<tr><td><input type='text' name='attrOptions' /><a href='#' style='text-decoration: none; margin-left:0.5em;' title='"+i18n_remove_option+"'  onClick='ATTRIBUTE_OPTION.remove(this,null)'>[ - ]</a></td></tr>";
 	}
 }
\ No newline at end of file

=== modified file 'dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/webapp/dhis-web-maintenance-patient/sortPatientAttributeGroupForm.vm'
--- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/webapp/dhis-web-maintenance-patient/sortPatientAttributeGroupForm.vm	2011-07-21 06:26:43 +0000
+++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/webapp/dhis-web-maintenance-patient/sortPatientAttributeGroupForm.vm	2012-03-15 09:28:38 +0000
@@ -5,23 +5,23 @@
 <table>
     <tr>
         <td>
-            <select size="15" id="patientAttributeGroupIds" name="patientAttributeGroupIds" multiple="multiple" style="min-width:20em;height:20em">
+            <select size="15" id="patientAttributeGroupIds" name="patientAttributeGroupIds" multiple="multiple">
                 #foreach ( $patientAttributeGroup in $patientAttributeGroups )
                     <option value="$patientAttributeGroup.id">$encoder.htmlEncode( $patientAttributeGroup.name )</option>
                 #end                
             </select>
         </td>
         
-        <td valign="top" align="center">             
-          <a href="#" onclick="moveUpSelectedOption('patientAttributeGroupIds')"><img src="../images/move_up.png" border="0" alt=""></a><br><br>
-          <a href="#" onclick="moveDownSelectedOption('patientAttributeGroupIds')"><img src="../images/move_down.png" border="0" alt=""></a>        
+        <td valign='justify'>             
+          <a href="#" onclick="moveUpSelectedOption('patientAttributeGroupIds')"><img src="../images/move_up.png"></a><br><br>
+          <a href="#" onclick="moveDownSelectedOption('patientAttributeGroupIds')"><img src="../images/move_down.png"></a>        
         </td>
     <tr>
 </table>
 
 <p>
-	<input type="submit" value="$i18n.getString( "save" )" style="width:10em">
-	<input type="button" value="$i18n.getString( "cancel" )" onclick="window.location.href='patientAttributeGroup.action'" style="width:10em">
+	<input type="submit" value="$i18n.getString( 'save' )" >
+	<input type="button" value="$i18n.getString( 'cancel' )" onclick="window.location.href='patientAttributeGroup.action'" >
 </p>
 
 </form> 	

=== modified file 'dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/webapp/dhis-web-maintenance-patient/style/basic.css'
--- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/webapp/dhis-web-maintenance-patient/style/basic.css	2011-11-02 07:37:12 +0000
+++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/webapp/dhis-web-maintenance-patient/style/basic.css	2012-03-15 09:28:38 +0000
@@ -1,4 +1,77 @@
 .heading-column { width : 30.5em;}
 td.input-column { width : 30.5em;}
 td.input-column input, td.input-column select { width: 28.5em;}
-td.error {padding-left:1em}
\ No newline at end of file
+td.error {padding-left:1em}
+
+textarea{
+	width:320px; 
+	text-align:left;
+}
+
+input[type="text"]{
+	width:320px; 
+	text-align:left;
+}
+
+select
+{
+	width:325px; 
+	text-align:left;
+}
+
+input[type="button"], input[type="submit"]
+{
+	width: 160px;
+	padding-left:5px;
+	padding-right:5px;
+}
+
+input.filterButton
+{
+	width: 30px;
+	padding-left:5px;
+	padding-right:5px;
+	text-align:center;
+}
+
+.hidden 
+{
+	display: none;
+}
+
+.visible
+{
+	display: block;
+}
+
+.imgButton
+{
+	cursor:pointer;
+}
+
+fieldset
+{
+	border: 1px solid #3f5d8e;
+}
+
+tr.selected{
+	background-color:#3399FF;
+	color:#FFFFFF;
+}
+
+#selectedList tr{
+	cursor:pointer;
+}
+
+.dataElementDiv
+{
+	overflow:auto; 
+	height:20em; 
+	width:30em;
+	border:1px solid #9DA1AA;
+}
+
+.dataElementDiv table
+{
+	width:100%;
+}
\ No newline at end of file

=== modified file 'dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/webapp/dhis-web-maintenance-patient/updateMultiProgramValidationForm.vm'
--- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/webapp/dhis-web-maintenance-patient/updateMultiProgramValidationForm.vm	2011-09-29 04:17:34 +0000
+++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/webapp/dhis-web-maintenance-patient/updateMultiProgramValidationForm.vm	2012-03-15 09:28:38 +0000
@@ -7,23 +7,31 @@
 	
 	<thead>
       <tr>
-        <th colspan="2">$i18n.getString( "program_validation_details" )</th>
+        <th colspan='2'>$i18n.getString( "program_validation_details" )</th>
       </tr>
     </thead>
     <tbody>
 	
 	<tr>
-		<td width="20em" colspan='2'>
+		<td>
 			<label>$i18n.getString('description')</label>
 		</td>
 	</tr>
 	<tr>
 		<td colspan='2'>			
-			<input type="text" id='description' name='description' style="width:100%" value='$validation.description'>
+			<input type="text" id='description' style='width:640px' name='description' value='$validation.description'>
 		</td>
 	</tr>
 	<tr>
-		<td width="20em">
+		<td>&nbsp;</td>
+	</tr>
+	<tr>
+		<th colspan='2'>
+			<label>$i18n.getString('validation')</label>
+		</th>
+	</tr>
+	<tr>
+		<td>
 			<label>$i18n.getString('left_side')</label>
 		</td>
 		<td>
@@ -32,84 +40,88 @@
 	</tr>
 	<tr>
 		<td>
-			<select style="width:30.2em" id='leftStage' name='leftStage' onchange="getLeftPrgramStageDataElements();">
-				<option value=''>[$i18n.getString( "please_select" )]</option>
-				#foreach($stage in $validation.program.programStages)
-				<option value='$stage.id'>$stage.name</option>
-				#end
-			</select>
-		</td>
-		<td>
-			<select style="width:30.2em" id='rightStage' name='rightStage' onchange="getRightPrgramStageDataElements();">
-				<option value=''>[$i18n.getString( "please_select" )]</option>
-				#foreach($stage in $validation.program.programStages)
-				<option value='$stage.id'>$stage.name</option>
-				#end
-			</select>
-		</td>
-	</tr>
-	<tr>
-		<td>
-			<select style="width:30.2em" id='leftSideDE' name='leftSideDE' size='7' ondblclick="insertDataElement(this, 'leftSide');">
-			</select>
-		</td>
-		<td>
-			<select style="width:30.2em" id='rightSideDE' name='rightSideDE' size='7' ondblclick="insertDataElement(this, 'rightSide');">
-			</select>
-		</td>
-	</tr>
-	<tr>
-		<td>
-			<img src="../images/plus.png" alt="$i18n.getString( 'plus' )" onclick='insertOperator( "leftStageDescription", "leftSide", "+" );' style="cursor:pointer;"/>
-			&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
-			<img src="../images/less.png" alt="$i18n.getString( 'less' )" onclick='insertOperator( "leftStageDescription", "leftSide", "<" );' style="cursor:pointer;">
-			<img src="../images/less_or_equal.png" alt="$i18n.getString( 'less_or_equal' )" onclick='insertOperator( "leftStageDescription", "leftSide", "<=" );' style="cursor:pointer;">
-			<img src="../images/greater.png" alt="$i18n.getString( 'greater' )" onclick='insertOperator( "leftStageDescription", "leftSide", ">" );' style="cursor:pointer;">
-			<img src="../images/greater_or_equal.png" alt="$i18n.getString( 'greater_or_equal' )" onclick='insertOperator( "leftStageDescription", "leftSide", ">=" );' style="cursor:pointer;">
-			<img src="../images/equal.png" alt="$i18n.getString( 'equal' )" onclick='insertOperator( "leftStageDescription", "leftSide", "==" );' style="cursor:pointer;"/>
-			<img src="../images/diff.png" alt="$i18n.getString( 'diff' )" onclick='insertOperator( "leftStageDescription", "leftSide", "!=" );' style="cursor:pointer;"/>
-			&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
-			<img src="../images/clear.png" align="right" alt="$i18n.getString( 'clear' )" onclick="clearValidation( 'leftSide', 'leftStageDescription' )" style="cursor:pointer;margin-right:0.5em""/>
-		</td>
-		<td>
-			<img src="../images/plus.png" alt="$i18n.getString( 'plus' )" onclick='insertOperator( "rightStageDescription", "rightSide", "+" );' style="cursor:pointer;"/>
-			&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
-			<img src="../images/less.png" alt="$i18n.getString( 'less' )" onclick='insertOperator( "rightStageDescription", "rightSide", "<" );' style="cursor:pointer;">
-			<img src="../images/less_or_equal.png" alt="$i18n.getString( 'less_or_equal' )" onclick='insertOperator( "rightStageDescription", "rightSide", "<=" );' style="cursor:pointer;">
-			<img src="../images/greater.png" alt="$i18n.getString( 'greater' )" onclick='insertOperator( "rightStageDescription", "rightSide", ">" );' style="cursor:pointer;">
-			<img src="../images/greater_or_equal.png" alt="$i18n.getString( 'greater_or_equal' )" onclick='insertOperator( "rightStageDescription", "rightSide", ">=" );' style="cursor:pointer;">
-			<img src="../images/equal.png" alt="$i18n.getString( 'equal' )" onclick='insertOperator( "rightStageDescription", "rightSide", "==" );' style="cursor:pointer;"/>
-			<img src="../images/diff.png" alt="$i18n.getString( 'diff' )" onclick='insertOperator( "rightStageDescription", "rightSide", "!=" );' style="cursor:pointer;"/>
+			<select id='leftStage' name='leftStage' onchange="getLeftPrgramStageDataElements();">
+				<option value=''>[$i18n.getString( "please_select" )]</option>
+				#foreach($stage in $validation.program.programStages)
+				<option value='$stage.id'>$stage.name</option>
+				#end
+			</select>
+		</td>
+		<td>
+			<select id='rightStage' name='rightStage' onchange="getRightPrgramStageDataElements();">
+				<option value=''>[$i18n.getString( "please_select" )]</option>
+				#foreach($stage in $validation.program.programStages)
+				<option value='$stage.id'>$stage.name</option>
+				#end
+			</select>
+		</td>
+	</tr>
+	<tr>
+		<td>
+			<select id='leftSideDE' name='leftSideDE' size='7' ondblclick="insertDataElement(this, 'leftSide');">
+			</select>
+		</td>
+		<td>
+			<select id='rightSideDE' name='rightSideDE' size='7' ondblclick="insertDataElement(this, 'rightSide');">
+			</select>
+		</td>
+	</tr>
+	<tr>
+		
+		<td>
+			<img src="../images/plus.png" alt="$i18n.getString( 'plus' )" onclick='insertOperator( "leftStageDescription", "leftSide", "+" );' class="imgButton"/>
+			&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
+			<img src="../images/less.png" alt="$i18n.getString( 'less' )" onclick='insertOperator( "leftStageDescription", "leftSide", "<" );' class="imgButton" />
+			<img src="../images/less_or_equal.png" alt="$i18n.getString( 'less_or_equal' )" onclick='insertOperator( "leftStageDescription", "leftSide", "<=" );' class="imgButton" />
+			<img src="../images/greater.png" alt="$i18n.getString( 'greater' )" onclick='insertOperator( "leftStageDescription", "leftSide", ">" );' class="imgButton" />
+			<img src="../images/greater_or_equal.png" alt="$i18n.getString( 'greater_or_equal' )" onclick='insertOperator( "leftStageDescription", "leftSide", ">=" );' class="imgButton" />
+			<img src="../images/equal.png" alt="$i18n.getString( 'equal' )" onclick='insertOperator( "leftStageDescription", "leftSide", "==" );' class="imgButton"/>
+			<img src="../images/diff.png" alt="$i18n.getString( 'diff' )" onclick='insertOperator( "leftStageDescription", "leftSide", "!=" );' class="imgButton"/>
+			&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
+			<img src="../images/clear.png" align="right" alt="$i18n.getString( 'clear' )" onclick="clearValidation( 'leftSide', 'leftStageDescription' )" class="imgButton"/>
+		</td>
+		<td>
+			<img src="../images/plus.png" alt="$i18n.getString( 'plus' )" onclick='insertOperator( "rightStageDescription", "rightSide", "+" );' class="imgButton" />
+			&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
+			<img src="../images/less.png" alt="$i18n.getString( 'less' )" onclick='insertOperator( "rightStageDescription", "rightSide", "<" );' class="imgButton" />
+			<img src="../images/less_or_equal.png" alt="$i18n.getString( 'less_or_equal' )" onclick='insertOperator( "rightStageDescription", "rightSide", "<=" );' class="imgButton" />
+			<img src="../images/greater.png" alt="$i18n.getString( 'greater' )" onclick='insertOperator( "rightStageDescription", "rightSide", ">" );' class="imgButton" >
+			<img src="../images/greater_or_equal.png" alt="$i18n.getString( 'greater_or_equal' )" onclick='insertOperator( "rightStageDescription", "rightSide", ">=" );' class="imgButton" >
+			<img src="../images/equal.png" alt="$i18n.getString( 'equal' )" onclick='insertOperator( "rightStageDescription", "rightSide", "==" );' class="imgButton" />
+			<img src="../images/diff.png" alt="$i18n.getString( 'diff' )" onclick='insertOperator( "rightStageDescription", "rightSide", "!=" );' class="imgButton" />
 			
-			<img src="../images/clear.png" align='right' alt="$i18n.getString( 'clear' )" onclick="clearValidation( 'rightSide', 'rightStageDescription' )" style="cursor:pointer;margin-right:0.5em"/>
+			<img src="../images/clear.png" align='right' alt="$i18n.getString( 'clear' )" onclick="clearValidation( 'rightSide', 'rightStageDescription' )" class="imgButton" />
 		</td>
 	</tr>
 	<tr>
 		<td>
-			<textarea rows='5' style="width:30em" id='leftSide' name='leftSide' onkeyup="getValidationDescription('leftStageDescription', 'leftSide')">$validation.leftSide</textarea>
+			<textarea rows='5' id='leftSide' name='leftSide' onkeyup="getValidationDescription('leftStageDescription', 'leftSide')">$validation.leftSide</textarea>
 		</td>
 		<td>
-			<textarea rows='5' style="width:30em" id='rightSide' name='rightSide' onkeyup="getValidationDescription('rightStageDescription', 'rightSide')">$validation.rightSide</textarea>
+			<textarea rows='5' id='rightSide' name='rightSide' onkeyup="getValidationDescription('rightStageDescription', 'rightSide')">$validation.rightSide</textarea>
 		</td>
 	</tr>
 	<tr>	
 		<td>
-			<fieldset style="border: 1px solid #3f5d8e; ">
-				<legend>$i18n.getString( "description" )</legend>
-				<div id='leftStageDescription' style="width:29em">$!leftDescription</div>
-			</fieldset>
-		</td>
-		<td>
-			<fieldset style="border: 1px solid #3f5d8e; ">
-				<legend>$i18n.getString( "description" )</legend>
-				<div id='rightStageDescription' style="width:29em;">$!rightDescription</div>
-			</fieldset>
-		</td>
-	</tr>
-	<tr>
-		<td>
-			<input type='submit' value="$i18n.getString( "update" )" style="width:10em">
-			<input type='button' value="$i18n.getString( "cancel" )" style="width:10em" onclick="window.location.href='programValidation.action?programId=$validation.program.id'">
+			<fieldset>
+				<legend>$i18n.getString( "description" )</legend>
+				<div id='leftStageDescription'>$!leftDescription</div>
+			</fieldset>
+		</td>
+		<td>
+			<fieldset>
+				<legend>$i18n.getString( "description" )</legend>
+				<div id='rightStageDescription'>$!rightDescription</div>
+			</fieldset>
+		</td>
+	</tr>
+	<tr>
+		<td>&nbsp;</td>
+	</tr>
+	<tr>
+		<td>
+			<input type='submit' value="$i18n.getString( 'update' )">
+			<input type='button' value="$i18n.getString( 'cancel' )" onclick="window.location.href='programValidation.action?programId=$validation.program.id'">
 		</td>
 		<td></td>
 	</tr>

=== modified file 'dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/webapp/dhis-web-maintenance-patient/updatePatientAttibuteForm.vm'
--- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/webapp/dhis-web-maintenance-patient/updatePatientAttibuteForm.vm	2011-10-04 07:05:02 +0000
+++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/webapp/dhis-web-maintenance-patient/updatePatientAttibuteForm.vm	2012-03-15 09:28:38 +0000
@@ -45,17 +45,17 @@
     <tbody>
       <tr>
         <td>$i18n.getString( "name" ) <em title="$i18n.getString( "required" )" class="required">*</em></td>
-        <td><input type="text" id="name" name="name" value="$encoder.htmlEncode( $patientAttribute.name )" style="width:30em" class="{validate:{required:true,rangelength:[2,160]}}"></td>
+        <td><input type="text" id="name" name="name" value="$encoder.htmlEncode( $patientAttribute.name )" class="{validate:{required:true,rangelength:[2,160]}}"></td>
       </tr>   
       <tr>
         <td>$i18n.getString( "description" ) <em title="$i18n.getString( "required" )" class="required">*</em></td>
-        <td><input type="text" id="description" name="description" value="$encoder.htmlEncode( $patientAttribute.description )" style="width:30em" class="{validate:{required:true,minlength:2}}"></td>
+        <td><input type="text" id="description" name="description" value="$encoder.htmlEncode( $patientAttribute.description )" class="{validate:{required:true,minlength:2}}"></td>
       </tr>
       
       <tr>
-		<td width="20em"><label for="mandatory">$i18n.getString( "mandatory" )<em title="$i18n.getString( "required" )" class="required">*</em></label></td>
+		<td><label for="mandatory">$i18n.getString( "mandatory" )<em title="$i18n.getString( "required" )" class="required">*</em></label></td>
 		<td>
-			<select id="mandatory" name="mandatory" style="min-width:30.5em">
+			<select id="mandatory" name="mandatory">
 				<option value="true" #if( $patientAttribute.mandatory ) selected="selected" #end>$i18n.getString( "yes" )</option>
 				<option value="false" #if( !$patientAttribute.mandatory ) selected="selected" #end>$i18n.getString( "no" )</option>
 			</select>
@@ -64,9 +64,9 @@
 	</tr>
 	
 	<tr>
-		<td width="20em"><label for="inheritable">$i18n.getString( "inheritable" )<em title="$i18n.getString( "required" )" class="required">*</em></label></td>
+		<td><label for="inheritable">$i18n.getString( "inheritable" )<em title="$i18n.getString( "required" )" class="required">*</em></label></td>
 		<td>
-			<select id="inheritable" name="inheritable" style="min-width:30.5em">
+			<select id="inheritable" name="inheritable">
 				<option value="true" #if( $patientAttribute.inheritable) selected="selected" #end>$i18n.getString( "yes" )</option>
 				<option value="false" #if( !$patientAttribute.inheritable) selected="selected" #end>$i18n.getString( "no" )</option>
 			</select>
@@ -74,16 +74,16 @@
 		<td></td>				
 	</tr>
 	<tr>
-		<td width="30em"><label for="noChar">$i18n.getString( "no_of_char" )</label></td>
+		<td><label for="noChar">$i18n.getString( "no_of_char" )</label></td>
 		<td>
-			<input type="text" name="noChars" id="noChars" class="{validate:{required:false, number:true}}" style="min-width:30em" value="$!patientAttribute.noChars">
+			<input type="text" name="noChars" id="noChars" class="{validate:{required:false, number:true}}" value="$!patientAttribute.noChars">
 		</td>		
 		<td></td>				
 	</tr>
     <tr>
         <td>$i18n.getString( "value_type" ) <em title="$i18n.getString( "required" )" class="required">*</em></td>
         <td>
-            <select id="valueType" name="valueType" style="min-width:30.5em" onchange="ATTRIBUTE_OPTION.selectValueType(this);">
+            <select id="valueType" name="valueType" onchange="ATTRIBUTE_OPTION.selectValueType(this);">
                 <option value="NUMBER" #if( $patientAttribute.valueType == 'NUMBER' ) selected="selected" #end>$i18n.getString( "number" )</option>
                 <option value="TEXT" #if( $patientAttribute.valueType == 'TEXT' ) selected="selected" #end>$i18n.getString( "text" )</option>
                 <option value="YES/NO" #if( $patientAttribute.valueType == 'YES/NO' ) selected="selected" #end>$i18n.getString( "yes_no" )</option>
@@ -94,7 +94,7 @@
     </tr>
       
 	  <tr id="attributeComboRow"> 
-    	<td width="20em"><label>$i18n.getString( "attribute_options" ) <em title="$i18n.getString( "required" )" class="required">*</em></label></td>
+    	<td><label>$i18n.getString( "attribute_options" ) <em title="$i18n.getString( "required" )" class="required">*</em></label></td>
     	<td >
     		<table id="attrOptionContainer">
     			 #foreach($option in $patientAttribute.attributeOptions) 
@@ -107,20 +107,21 @@
     	<td><span id="attrMessage"  name="attrMessage" style="color:red;"></span></td>
       </tr>
       <tr>
-        <td colspan="3" style="height:15px"></td>
+        <td colspan="3"></td>
       </tr>
 	  <tr>
-    	<td width="20em"><label for="groupBy">$i18n.getString( "groupBy" )</td>
+    	<td><label for="groupBy">$i18n.getString( "groupBy" )</td>
     	<td><input type="checkbox" name="groupBy" value="true" #if( $patientAttribute.groupBy == 'true' ) checked #end></td>
       </tr>
     </tbody>
+	<tr>
+		<td></td>
+		<td>
+			 <input type="submit" value="$i18n.getString( 'update' )">
+			<input type="button" value="$i18n.getString( 'cancel' )" onclick="window.location.href='patientAttribute.action'">
+		</td>
+	</tr>
   </table>  
-
-<p>
-    <input type="submit" value="$i18n.getString( "update" )" style="width:10em">
-    <input type="button" value="$i18n.getString( "cancel" )" onclick="window.location.href='patientAttribute.action'" style="width:10em">
-</p>
-
 </form>
 
 <script>

=== modified file 'dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/webapp/dhis-web-maintenance-patient/updatePatientAttibuteGroupForm.vm'
--- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/webapp/dhis-web-maintenance-patient/updatePatientAttibuteGroupForm.vm	2011-10-03 09:40:38 +0000
+++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/webapp/dhis-web-maintenance-patient/updatePatientAttibuteGroupForm.vm	2012-03-15 09:28:38 +0000
@@ -44,11 +44,11 @@
 	</tr>
 	<tr>
 		<td>$i18n.getString( "name" ) <em title="$i18n.getString( 'required' )" class="required">*</em></td>
-		<td><input type="text" id="name" name="name" value="$encoder.htmlEncode( $patientAttributeGroup.name )" style="width:20em"/></td>
+		<td><input type="text" id="name" name="name" value="$encoder.htmlEncode( $patientAttributeGroup.name )" /></td>
 	</tr>   
 	<tr>
 		<td>$i18n.getString( "description" ) <em title="$i18n.getString( 'required' )" class="required">*</em></td>
-		<td><input type="text" id="description" name="description" value="$encoder.htmlEncode( $patientAttributeGroup.description )" style="width:20em"/></td>
+		<td><input type="text" id="description" name="description" value="$encoder.htmlEncode( $patientAttributeGroup.description )" /></td>
 	</tr>
 	<tr>
 		<td colspan="2" height="15px"></td>
@@ -56,28 +56,25 @@
 </table>
 
 <table>
-	<col style="width: 450px"/>
-	<col/>
-	<col style="width: 450px"/>
 	
 	<tr>
 		<th>$i18n.getString( "availableAttribute" )</th>
 		<th>$i18n.getString( "filter" )</th>
 		<th>$i18n.getString( "selectedAttribute" )
-			<select id="memberValidator" multiple="multiple" style="display:none" class="{validate:{required:true}}"/>
+			<select id="memberValidator" multiple="multiple" class="{validate:{required:true}} hidden"/>
 		</th>
 	</tr>
 	
 	<tr>
 		<td>
-			<select multiple id="availableAttributes" name="availableAttributes" size="15" style="width:100%"></select>
-		</td>
-		<td style="text-align:center">
-			<input type="button" value="&gt;" title="$i18n.getString('move_selected')" onclick="dhisAjaxSelect_moveAllSelected( 'availableAttributes', 'selectedAttributes' )"/><br/>
-			<input type="button" value="&lt;" title="$i18n.getString('remove_selected')" onclick="dhisAjaxSelect_moveAllSelected( 'selectedAttributes', 'availableAttributes' )"/>
-		</td>
-		<td>
-			<select multiple id="selectedAttributes" name="selectedAttributes" size="15" style="width:100%">
+			<select multiple id="availableAttributes" name="availableAttributes" size="15"></select>
+		</td>
+		<td>
+			<input type="button" value="&gt;" title="$i18n.getString('move_selected')" onclick="dhisAjaxSelect_moveAllSelected( 'availableAttributes', 'selectedAttributes' )" class='filterButton'/><br/>
+			<input type="button" value="&lt;" title="$i18n.getString('remove_selected')" onclick="dhisAjaxSelect_moveAllSelected( 'selectedAttributes', 'availableAttributes' )" class='filterButton'/>
+		</td>
+		<td>
+			<select multiple id="selectedAttributes" name="selectedAttributes" size="15">
 			#foreach($patientAttribute in $patientAttributeGroup.attributes)
 			#if($!patientAttribute)
 				<option value='$patientAttribute.id'>$patientAttribute.name</option>
@@ -92,13 +89,13 @@
 	</tr>  
 
 	<tr>
-		<td colspan="2" style="height:15px"></td>
+		<td>
+			<input type="submit" value="$i18n.getString( 'update' )" />
+			<input type="button" value="$i18n.getString( 'cancel' )" onclick="window.location.href='patientAttributeGroup.action'" />
+		</td>
 	</tr>
 </table>  
 
-<p>
-    <input type="submit" value="$i18n.getString( 'update' )" style="width:10em"/>
-    <input type="button" value="$i18n.getString( 'cancel' )" onclick="window.location.href='patientAttributeGroup.action'" style="width:10em"/>
-</p>
+
 
 </form>     

=== modified file 'dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/webapp/dhis-web-maintenance-patient/updatePatientChartForm.vm'
--- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/webapp/dhis-web-maintenance-patient/updatePatientChartForm.vm	2011-10-03 09:40:38 +0000
+++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/webapp/dhis-web-maintenance-patient/updatePatientChartForm.vm	2012-03-15 09:28:38 +0000
@@ -21,13 +21,13 @@
     </tr>
     <tr>
         <td><label for="title">$i18n.getString( "title" ) <em title="$i18n.getString( "required" )" class="required">*</em></label></td>
-        <td><input type="text" id="title" name="title" style="width:298px" value='$patientChart.title' class="{validate:{required:true,minlength:4}}"></td>
+        <td><input type="text" id="title" name="title" value='$patientChart.title' class="{validate:{required:true,minlength:4}}"></td>
     </tr>
 
     <tr>
     	<td><label for="type">$i18n.getString( "chart_type" ) <em title="$i18n.getString( "required" )" class="required">*</em></label></td>
     	<td>
-    		<select id="type" name="type" style="width:300px">
+    		<select id="type" name="type" >
     			<option value="bar" #if($patientChart.type=='bar') selected #end>$i18n.getString( "bar_chart" )</option>
     			<option value="bar3d" #if($patientChart.type=='bar3d') selected #end>$i18n.getString( "bar3d_chart" )</option>
     			<option value="line" #if($patientChart.type=='line') selected #end>$i18n.getString( "line_chart" )</option>
@@ -38,7 +38,7 @@
     <tr>
         <td><label for="type">$i18n.getString( "chart_size" ) <em title="$i18n.getString( "required" )" class="required">*</em></label></td>
         <td>
-            <select id="size" name="size" style="width:300px">
+            <select id="size" name="size" >
                 <option value="normal" #if ( $!patientChart.size == "normal" ) selected #end>$i18n.getString( "normal" )</option>
                 <option value="wide" #if ( $!patientChart.size == "wide" ) selected #end>$i18n.getString( "wide" )</option>
                 <option value="tall" #if ( $!patientChart.size == "tall" ) selected #end>$i18n.getString( "tall" )</option>
@@ -50,7 +50,7 @@
         <td><input type="checkbox" id="regression" name="regression" value="true" #if ( $!patientChart.regression == "true" ) checked #end></td>
     </tr>
     <tr>
-        <td colspan="2" style="height:15px"></td>
+		<td>&nbsp;</td>
     </tr>
 	
 	<!-- dataelements -->
@@ -58,7 +58,7 @@
 	<tr>
         <td>$i18n.getString( "value_x_dataelements" ) <em title="$i18n.getString( "required" )" class="required">*</em></td>
         <td>
-            <select id="dataElementId" name="dataElementId" style="width:300px" class="{validate:{required:true}}">
+            <select id="dataElementId" name="dataElementId" class="{validate:{required:true}}">
 				<option value="">$i18n.getString('please_select')</option>
                 #foreach( $dataElement in $dataElements )
                     <option value="$dataElement.id" #if( $!patientChart.dataElement.id == $dataElement.id ) selected #end>$dataElement.name</option>
@@ -67,19 +67,15 @@
         </td>
     </tr>
     <tr>
-        <td colspan="2" style="height:15px"></td>
+        <td>&nbsp;</td>
     </tr>
-
-</table>
-
-<table>
-    <tr>        
-        <td colspan="2">
-            <input type="submit" value="$i18n.getString( 'save' )" style="width:120px" />
-            <input type="button" value="$i18n.getString( 'back' )" onclick="javascript:window.location.href='patientChartList.action?programId=$patientChart.program.id'" style="width:120px" />
+	<tr>   
+		<td></td>
+        <td>
+            <input type="submit" value="$i18n.getString( 'save' )" />
+            <input type="button" value="$i18n.getString( 'back' )" onclick="javascript:window.location.href='patientChartList.action?programId=$patientChart.program.id'" />
         </td>
     </tr>
-    
 </table>
 
 </form>

=== modified file 'dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/webapp/dhis-web-maintenance-patient/updatePatientIdentifierType.vm'
--- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/webapp/dhis-web-maintenance-patient/updatePatientIdentifierType.vm	2011-11-02 07:29:58 +0000
+++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/webapp/dhis-web-maintenance-patient/updatePatientIdentifierType.vm	2012-03-15 09:28:38 +0000
@@ -26,20 +26,20 @@
 	<tbody>
 		<tr>
 			<td><label>$i18n.getString( "name" ) <em title="$i18n.getString( 'required' )" class="required">*</em></label></td>
-			<td><input type="text" id="name" name="name"  value="$encoder.htmlEncode($patientIdentifierType.name)" maxlength="30" style="width:30em" class="{validate:{required:true,rangelength:[4,100]}}"/></td>
+			<td><input type="text" id="name" name="name"  value="$encoder.htmlEncode($patientIdentifierType.name)" class="{validate:{required:true,rangelength:[4,100]}}"/></td>
 			<td></td>
 		</tr>
 		
 		<tr>
 			<td><label>$i18n.getString( "description" ) <em title="$i18n.getString( 'required' )" class="required">*</em></label></td>
-			<td><input type="text" id="description" name="description" value="$encoder.htmlEncode($patientIdentifierType.description)" style="width:30em" class="{validate:{required:true,minlength:4, maxlength: 150}}"/></td>
+			<td><input type="text" id="description" name="description" value="$encoder.htmlEncode($!patientIdentifierType.description)" class="{validate:{required:true,minlength:4, maxlength: 150}}"/></td>
 			<td></td>
 		</tr>	
 		
 		<tr>
 			<td><label for="mandatory">$i18n.getString( "mandatory" )<em title="$i18n.getString( 'required' )" class="required">*</em></label></td>
 			<td>
-				<select id="mandatory" name="mandatory" style="min-width:30.2em">
+				<select id="mandatory" name="mandatory">
 					<option value="true" #if( $patientIdentifierType.mandatory ) selected="selected" #end>$i18n.getString( "yes" )</option>
 					<option value="false" #if( !$patientIdentifierType.mandatory ) selected="selected" #end>$i18n.getString( "no" )</option>
 				</select>
@@ -50,7 +50,7 @@
 		<tr>
 			<td><label for="related">$i18n.getString( "related" )<em title="$i18n.getString( 'required' )" class="required">*</em></label></td>
 			<td>
-				<select id="related" name="related" style="min-width:30.2em" class="{validate:{required:true}}">
+				<select id="related" name="related" class="{validate:{required:true}}">
 					<option value="true" #if( $patientIdentifierType.related ) selected="selected" #end>$i18n.getString( "yes" )</option>
 					<option value="false" #if( !$patientIdentifierType.related ) selected="selected" #end>$i18n.getString( "no" )</option>
 				</select>
@@ -61,7 +61,7 @@
 		<tr>
 			<td><label for="noChars">$i18n.getString( "no_of_char" )</label></td>
 			<td>
-				<input type="text" name="noChars" id="noChars" value="$!patientIdentifierType.noChars" class="{validate:{required:false, number:true}}" style="min-width:30em" />
+				<input type="text" name="noChars" id="noChars" value="$!patientIdentifierType.noChars" class="{validate:{required:false, number:true}}" />
 			</td>		
 			<td></td>				
 		</tr> 	
@@ -69,7 +69,7 @@
 		<tr>
 			<td><label for="type">$i18n.getString( "type" )<em title="$i18n.getString( 'required' )" class="required">*</em></label></td>
 			<td>
-				<select id="type" name="type" style="min-width:30.2em"  class="{validate:{required:true}}">
+				<select id="type" name="type" class="{validate:{required:true}}">
 					<option value="text" #if( $patientIdentifierType.type=='text' ) selected="selected" #end>$i18n.getString( "text" )</option>
 					<option value="number" #if( $patientIdentifierType.type=='number' ) selected="selected" #end>$i18n.getString( "number" )</option>
 					<option value="letter" #if( $patientIdentifierType.type=='letter' ) selected="selected" #end>$i18n.getString( "letter" )</option>
@@ -78,11 +78,14 @@
 			<td></td>				
 		</tr>
 	</tbody>
+	<tr>
+		<td></td>
+		<td>
+			<input type="submit" value="$i18n.getString( 'update' )" />
+			<input type="button" value="$i18n.getString( 'cancel' )" onclick="window.location.href='patientIdentifierType.action'" />
+		</td>
+	</tr>
 </table>
 
-<p>
-	<input type="submit" value="$i18n.getString( 'update' )" style="width:10em"/>
-	<input type="button" value="$i18n.getString( 'cancel' )" onclick="window.location.href='patientIdentifierType.action'" style="width:10em"/>
-</p>
 
 </form>

=== modified file 'dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/webapp/dhis-web-maintenance-patient/updateProgramAttributeForm.vm'
--- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/webapp/dhis-web-maintenance-patient/updateProgramAttributeForm.vm	2011-09-29 04:17:34 +0000
+++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/webapp/dhis-web-maintenance-patient/updateProgramAttributeForm.vm	2012-03-15 09:28:38 +0000
@@ -35,20 +35,20 @@
 	
     <tr>
         <td width="20em"><label>$i18n.getString( "name" )</label></td>
-        <td><input type="text" id="name" name="name" value='$programAttribute.name' style="width:30em"/></td>
+        <td><input type="text" id="name" name="name" value='$programAttribute.name' /></td>
         <td></td>
     </tr>   
     
     <tr>
         <td width="20em" ><label>$i18n.getString( "description" ) <em title="$i18n.getString( 'required' )" class="required">*</em></label></td>
-        <td><input type="text" id="description" name="description" value='$programAttribute.description' style="width:30em" class="{validate:{required:true,minlength:2}}"/></td>
+        <td><input type="text" id="description" name="description" value='$programAttribute.description' class="{validate:{required:true,minlength:2}}"/></td>
         <td></td>
     </tr>
     
     <tr>
         <td>$i18n.getString( "value_type" ) <em title="$i18n.getString( 'required' )" class="required">*</em></td>
         <td>
-            <select id="valueType" name="valueType" style="min-width:30.5em" onchange="ATTRIBUTE_OPTION.selectValueType(this);">
+            <select id="valueType" name="valueType" onchange="ATTRIBUTE_OPTION.selectValueType(this);">
                 <option value="NUMBER" #if( $programAttribute.valueType == 'NUMBER' ) selected="selected" #end>$i18n.getString( "number" )</option>
                 <option value="TEXT" #if( $programAttribute.valueType == 'TEXT' ) selected="selected" #end>$i18n.getString( "text" )</option>
                 <option value="YES/NO" #if( $programAttribute.valueType == 'YES/NO' ) selected="selected" #end>$i18n.getString( "yes_no" )</option>
@@ -58,13 +58,13 @@
         </td>
 	</tr>
 	<tr id="attributeComboRow"> 
-		<td width="20em"><label>$i18n.getString( "attribute_options" ) <em title="$i18n.getString( 'required' )" class="required">*</em></label></td>
+		<td><label>$i18n.getString( "attribute_options" ) <em title="$i18n.getString( 'required' )" class="required">*</em></label></td>
 		<td>
 			<table id="attrOptionContainer">
 			#foreach($option in $programAttribute.attributeOptions) 
 				<tr>
 					<td>
-						<input type='text' id='attrOption$option.id' name='attrOption$option.id' value="$option.name" style="width:28em;"/><a href='#' style='text-decoration: none; margin-left:0.5em;' title='$i18n.getString( "remove_option" )'  onClick='ATTRIBUTE_OPTION.remove(this,$option.id)'>[ - ]</a>
+						<input type='text' id='attrOption$option.id' name='attrOption$option.id' value="$option.name" /><a href='#' style='text-decoration: none; margin-left:0.5em;' title='$i18n.getString( "remove_option" )'  onClick='ATTRIBUTE_OPTION.remove(this,$option.id)'>[ - ]</a>
 					</td>
 				</tr>
 			#end
@@ -73,17 +73,16 @@
 		</td>
 	<td><span id="attrMessage"  name="attrMessage" style="color:red;"></span></td>
 	</tr>
+    </tbody>
 	<tr>
-		<td colspan="3" style="height:15px"></td>
+		<td></td>
+		<td>
+			<input type="submit" value="$i18n.getString( 'update' )" />
+			<input type="button" value="$i18n.getString( 'cancel' )" onclick="window.location.href='programAttribute.action'" />
+		</td>
 	</tr>
-    </tbody>
 </table>
 
-<p>
-    <input type="submit" value="$i18n.getString( 'update' )" style="width:10em"/>
-    <input type="button" value="$i18n.getString( 'cancel' )" onclick="window.location.href='programAttribute.action'" style="width:10em"/>
-</p>
-
 </form>   
 
 <script>

=== modified file 'dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/webapp/dhis-web-maintenance-patient/updateProgramForm.vm'
--- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/webapp/dhis-web-maintenance-patient/updateProgramForm.vm	2012-03-01 07:44:57 +0000
+++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/webapp/dhis-web-maintenance-patient/updateProgramForm.vm	2012-03-15 09:28:38 +0000
@@ -1,3 +1,4 @@
+<link rel="stylesheet" type="text/css" href="style/basic.css" media="screen" />
 <script>
 	jQuery(document).ready(	function(){
 		
@@ -15,9 +16,7 @@
 <h3>$i18n.getString( "edit_program" )</h3>
 
 <form id="updateProgramForm" name="updateProgramForm" action="updateProgram.action" method="post" >
-<div style="display:inline">
   <input type="hidden" id="id" name="id" value="$program.id">
-</div>
   
   <table id="detailsList">
     <thead>
@@ -28,12 +27,12 @@
     <tbody>
       <tr>
 		<td><label>$i18n.getString( "name" ) <em title="$i18n.getString( "required" )" class="required">*</em></label></td>
-		<td><input type="text" id="name" name="name" value="$encoder.htmlEncode( $program.name )" style="width:30em" class="{validate:{required:true,minlength:4}}"></td>
+		<td><input type="text" id="name" name="name" value="$encoder.htmlEncode( $program.name )" class="{validate:{required:true,minlength:4}}"></td>
 		<td></td>
 	  </tr>	  
       <tr>
 		<td><label>$i18n.getString( "description" ) <em title="$i18n.getString( "required" )" class="required">*</em></label></td>
-		<td><input type="text" id="description" name="description" value="$encoder.htmlEncode( $program.description )" style="width:30em" class="{validate:{required:true,minlength:4}}"></td>
+		<td><input type="text" id="description" name="description" value="$encoder.htmlEncode( $program.description )" class="{validate:{required:true,minlength:4}}"></td>
 		<td></td>
 	  </tr>
 	  
@@ -57,35 +56,34 @@
 		
 	<tr>
 		<td><label>$i18n.getString( "version" ) <em title="$i18n.getString( "required" )" class="required">*</em></label></td>
-		<td><input type="text" id="version" name="version" value="$program.version" style="width:30em" class="{validate:{required:true,number:true}}"></td>
+		<td><input type="text" id="version" name="version" value="$program.version" class="{validate:{required:true,number:true}}"></td>
 		<td></td>
 	</tr>		
 	<tr>
 		<td><label>$i18n.getString( "date_of_enrollment_description" ) <em title="$i18n.getString( "required" )" class="required">*</em></label></td>
-		<td><input type="text" id="dateOfEnrollmentDescription" name="dateOfEnrollmentDescription"  value="$!program.dateOfEnrollmentDescription" style="width:30em" class="{validate:{required:true,minlength:4}}" #if( $program.singleEvent=='true' ) disabled #end></td>
+		<td><input type="text" id="dateOfEnrollmentDescription" name="dateOfEnrollmentDescription"  value="$!program.dateOfEnrollmentDescription" class="{validate:{required:true,minlength:4}}" #if( $program.singleEvent=='true' ) disabled #end></td>
 		<td></td>
 	</tr>	
 	<tr>
 		<td><label>$i18n.getString( "date_of_incident_description" ) <em title="$i18n.getString( "required" )" class="required">*</em></label></td>
-		<td><input type="text" id="dateOfIncidentDescription" name="dateOfIncidentDescription" value="$!program.dateOfIncidentDescription" style="width:30em" class="{validate:{required:true,minlength:4}}"></td>
+		<td><input type="text" id="dateOfIncidentDescription" name="dateOfIncidentDescription" value="$!program.dateOfIncidentDescription" class="{validate:{required:true,minlength:4}}"></td>
 		<td></td>
 	</tr>
 	
 	  <tr>
 		<td><label>$i18n.getString( "no_max_days_allowed_input_data" ) <em title="$i18n.getString( "required" )" class="required">*</em></label></td>
-		<td><input type="text" id="maxDaysAllowedInputData" name="maxDaysAllowedInputData" value="$!program.maxDaysAllowedInputData" style="width:30em" class="{validate:{required:true,number:true}}"></td>
+		<td><input type="text" id="maxDaysAllowedInputData" name="maxDaysAllowedInputData" value="$!program.maxDaysAllowedInputData" class="{validate:{required:true,number:true}}"></td>
 		<td></td>
 	  </tr>	
 		  
       <tr>
-      	<td colspan="2" style="height:15px"></td>
+		<td></td>
+      	<td>
+			<input type="submit" value="$i18n.getString( 'update' )">
+			<input type="button" value="$i18n.getString( 'cancel' )" onclick="window.location.href='program.action'">
+		</td>
       </tr>
     </tbody>
   </table>  
 
-<p>
-	<input type="submit" value="$i18n.getString( "update" )" style="width:10em">
-	<input type="button" value="$i18n.getString( "cancel" )" onclick="window.location.href='program.action'" style="width:10em">
-</p>
-
 </form> 	

=== modified file 'dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/webapp/dhis-web-maintenance-patient/updateProgramStageForm.vm'
--- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/webapp/dhis-web-maintenance-patient/updateProgramStageForm.vm	2012-03-07 02:40:08 +0000
+++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/webapp/dhis-web-maintenance-patient/updateProgramStageForm.vm	2012-03-15 09:28:38 +0000
@@ -25,114 +25,101 @@
 	});
 </script>
 
-<style>
-tr.selected{
-	background-color:#3399FF;
-	color:#FFFFFF;
-}
-#selectedList tr{
-	cursor:pointer;
-}
-</style>
-
 <h3>$i18n.getString( "edit_program_stage" )</h3>
 
 <form id="updateProgramStageForm" name="updateProgramStageForm" action="updateProgramStage.action" method="post">
-
-<div style="display:inline">
 	<input type="hidden" id="id" name="id" value="$programStage.id"/>
-</div>
-  
-<table id="detailsList">
-    <thead>
-		<tr><th colspan="2">$i18n.getString( "program_stage_details" )</th></tr>
-    </thead>
-    <tbody>
-		<tr>
-			<td><label>$i18n.getString( "name" ) <em title="$i18n.getString( 'required' )" class="required">*</em></label></td>
-			<td><input type="text" id="name" name="name" value="$encoder.htmlEncode( $programStage.name )" style="width:30em"  maxlength="160" class="{validate:{required:true,rangelength:[4,160]}}"/></td>
-		</tr>
-
-		<tr>
-			<td><label>$i18n.getString( "description" ) <em title="$i18n.getString( 'required' )" class="required">*</em></label></td>
-			<td><input type="text" id="description" name="description" value="$encoder.htmlEncode( $programStage.description )" style="width:30em"  class="{validate:{required:true,minlength:4}}"/></td>
-		</tr>  
-
-		<tr>
-			<td><label>$i18n.getString( "min_days_from_start" )</label></td>
-			<td><input type="text" id="minDaysFromStart" name="minDaysFromStart" maxlength="30" value="$programStage.minDaysFromStart" style="width:30em" class="{validate:{number:true,min:0}}"/></td>
-		</tr> 
-
-		<tr>
-			<td><label>$i18n.getString( "program" )</label></td>
-			<td><input type="text" id="program" name="program" maxlength="30" value="$encoder.htmlEncode( $programStage.program.name )" style="width:30em" disabled="disabled"/></td>
-		</tr>     
-		
-		<tr>
-			<td><label>$i18n.getString( "irregular_encounter" )</label></td>
-			<td><input type="checkbox" id="irregular" name="irregular" value='true' #if( $programStage.irregular=='true' ) checked #end/></td>
-		</tr>	
-      
-		<tr><td>&nbsp;</td><td>&nbsp;</td></tr>       
-      
-    </tbody>
-</table>
-
-<table id="programStageMembersArea">
-    <thead>
-		<tr>
-			<th>$i18n.getString( "available_data_elements" )</th>
-			<th></th>
-			<th>$i18n.getString( "selected_data_elements" )
-				<select id="selectedDataElementsValidator" name='selectedDataElementsValidator' multiple="multiple" class="{validate:{required:true}}" style="display:none"> </select>
-				<select id="compulsories" name='compulsories' multiple="multiple" style="display:none"></select>
-			</th>
-		</tr>
-    </thead>
-	
-	<tbody>
-	
-	<tr>
-        <td>
-            <select size="15" id="availableList" multiple="multiple" style="width:30em;height:20em" ondblclick="selectDataElements( )">
-            </select>
-        </td>
-        <td valign="top" align="center">         
-            <input type="button" value="&gt;" onclick="selectDataElements()"/><br/>    
-            <input type="button" value="&lt;" onclick="unSelectDataElements()"/><br/><br/>                    
-        <td>
-			<div style="overflow:auto; height:20em; width:40em;border:1px solid #9DA1AA">
-				<table width="100%">
-					<thead>
-						<tr>
-							<th>$i18n.getString( "dataelement" )</th>
-							<th width="20px">$i18n.getString( "compulsory" )</th>
-						</tr>
-					</thead>
-					<tbody id="selectedList">
-						#foreach ( $programStageDataElement in $programStageDataElements )
-							<tr ondblclick="unSelectDataElement( this )" id="$programStageDataElement.dataElement.id">
-								<td onclick="select(this)">$encoder.htmlEncode( $programStageDataElement.dataElement.name )</td>
-								<td align="center"><input type="checkbox" name="compulsory" value="$programStageDataElement.dataElement.id" #if($programStageDataElement.compulsory == true ) checked #end /></td>
+	  
+	<table id="detailsList">
+		<thead>
+			<tr><th colspan="2">$i18n.getString( "program_stage_details" )</th></tr>
+		</thead>
+		<tbody>
+			<tr>
+				<td><label>$i18n.getString( "name" ) <em title="$i18n.getString( 'required' )" class="required">*</em></label></td>
+				<td><input type="text" id="name" name="name" value="$encoder.htmlEncode( $programStage.name )" class="{validate:{required:true,rangelength:[4,160]}}"/></td>
+			</tr>
+
+			<tr>
+				<td><label>$i18n.getString( "description" ) <em title="$i18n.getString( 'required' )" class="required">*</em></label></td>
+				<td><input type="text" id="description" name="description" value="$encoder.htmlEncode( $programStage.description )" class="{validate:{required:true,minlength:4}}"/></td>
+			</tr>  
+
+			<tr>
+				<td><label>$i18n.getString( "min_days_from_start" )</label></td>
+				<td><input type="text" id="minDaysFromStart" name="minDaysFromStart" value="$programStage.minDaysFromStart" class="{validate:{number:true,min:0}}"/></td>
+			</tr> 
+
+			<tr>
+				<td><label>$i18n.getString( "program" )</label></td>
+				<td><input type="text" id="program" name="program" maxlength="30" value="$encoder.htmlEncode( $programStage.program.name )" disabled="disabled"/></td>
+			</tr>     
+			
+			<tr>
+				<td><label>$i18n.getString( "irregular_encounter" )</label></td>
+				<td><input type="checkbox" id="irregular" name="irregular" value='true' #if( $programStage.irregular=='true' ) checked #end/></td>
+			</tr>	
+		  
+			<tr><td>&nbsp;</td></tr>       
+		  
+		</tbody>
+	</table>
+
+	<table id="programStageMembersArea">
+		<thead>
+			<tr>
+				<th>$i18n.getString( "available_data_elements" )</th>
+				<th></th>
+				<th>$i18n.getString( "selected_data_elements" )
+					<select id="selectedDataElementsValidator" name='selectedDataElementsValidator' multiple="multiple" class="{validate:{required:true}} hidden" > </select>
+					<select id="compulsories" name='compulsories' multiple="multiple" class="hidden"></select>
+				</th>
+			</tr>
+		</thead>
+		
+		<tbody>
+		
+		<tr>
+			<td>
+				<select size="15" id="availableList" multiple="multiple" ondblclick="selectDataElements( )">
+				</select>
+			</td>
+			<td valign="top" align="center">         
+				<input type="button" value="&gt;" onclick="selectDataElements()" class='filterButton' /><br/>    
+				<input type="button" value="&lt;" onclick="unSelectDataElements()" class='filterButton' /><br/><br/>                    
+			<td>
+				<div class="dataElementDiv">
+					<table>
+						<thead>
+							<tr>
+								<th>$i18n.getString( "dataelement" )</th>
+								<th width="20px">$i18n.getString( "compulsory" )</th>
 							</tr>
-						#end
-					</tbody>
-				</table>
-			</div>
-        </td>
-        
-        <td style="width:30px; text-align:center">
-            <a href="javascript:moveUpDataElement()"><img src="../images/move_up.png"/></a><br/><br/>
-            <a href="javascript:moveDownDataElement()"><img src="../images/move_down.png"/></a><br/><br/>
-        </td>  
-        
-    </tr>
-    </tbody>
-</table>
-<p>
-	<input type="submit" value="$i18n.getString( 'update' )" style="width:10em"/>
-	<input type="button" value="$i18n.getString( 'cancel' )" onclick="window.location.href='programStage.action?id=$programStage.program.id'" style="width:10em"/>
-</p>
+						</thead>
+						<tbody id="selectedList">
+							#foreach ( $programStageDataElement in $programStageDataElements )
+								<tr ondblclick="unSelectDataElement( this )" id="$programStageDataElement.dataElement.id">
+									<td onclick="select(this)">$encoder.htmlEncode( $programStageDataElement.dataElement.name )</td>
+									<td align="center"><input type="checkbox" name="compulsory" value="$programStageDataElement.dataElement.id" #if($programStageDataElement.compulsory == true ) checked #end /></td>
+								</tr>
+							#end
+						</tbody>
+					</table>
+				</div>
+			</td>
+			
+			<td>
+				<a href="javascript:moveUpDataElement()"><img src="../images/move_up.png"/></a><br/><br/>
+				<a href="javascript:moveDownDataElement()"><img src="../images/move_down.png"/></a><br/><br/>
+			</td>  
+			
+		</tr>
+		</tbody>
+	</table>
+	<p>
+		<input type="submit" value="$i18n.getString( 'update' )" />
+		<input type="button" value="$i18n.getString( 'cancel' )" onclick="window.location.href='programStage.action?id=$programStage.program.id'" />
+	</p>
 
 </form> 	
 

=== modified file 'dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/webapp/dhis-web-maintenance-patient/updateRelationshipTypeForm.vm'
--- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/webapp/dhis-web-maintenance-patient/updateRelationshipTypeForm.vm	2012-02-27 01:07:19 +0000
+++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/webapp/dhis-web-maintenance-patient/updateRelationshipTypeForm.vm	2012-03-15 09:28:38 +0000
@@ -14,9 +14,7 @@
 
 <form id="updateRelationshipTypeForm" name="updateRelationshipTypeForm" action="updateRelationshipType.action" method="post">
 
-<div style="display:inline">
-	<input type="hidden" id="id" name="id" value="$relationshipType.id"/>
-</div>
+<input type="hidden" id="id" name="id" value="$relationshipType.id"/>
   
 <table id="detailsList">
     <thead>
@@ -26,25 +24,24 @@
     <tbody>
 		<tr>
 			<td>$i18n.getString( "a_is_to_b" ) <em title="$i18n.getString( 'required' )" class="required">*</em></td>
-			<td><input type="text" id="aIsToB" name="aIsToB" value="$encoder.htmlEncode( $relationshipType.aIsToB )" style="width:30em" class="{validate:{required:true,rangelength:[2,160]}}"/></td>
+			<td><input type="text" id="aIsToB" name="aIsToB" value="$encoder.htmlEncode( $relationshipType.aIsToB )" class="{validate:{required:true,rangelength:[2,160]}}"/></td>
 		</tr>   
 		<tr>
 			<td>$i18n.getString( "b_is_to_a" ) <em title="$i18n.getString( 'required' )" class="required">*</em></td>
-			<td><input type="text" id="bIsToA" name="bIsToA" value="$encoder.htmlEncode( $relationshipType.bIsToA )" style="width:30em" class="{validate:{required:true,rangelength:[2,160]}}"/></td>
+			<td><input type="text" id="bIsToA" name="bIsToA" value="$encoder.htmlEncode( $relationshipType.bIsToA )" class="{validate:{required:true,rangelength:[2,160]}}"/></td>
 		</tr>
 		<tr>
 			<td><label>$i18n.getString( "description" ) <em title="$i18n.getString( 'required' )" class="required">*</em></label></td>
-			<td><input type="text" id="name" name="name" value="$encoder.htmlEncode( $relationshipType.name )" style="width:30em" class="{validate:{required:true,rangelength:[2,160]}}"/></td>
-		</tr>       
-		<tr>
-			<td colspan="2" style="height:15px"></td>
+			<td><input type="text" id="name" name="name" value="$encoder.htmlEncode( $relationshipType.name )" class="{validate:{required:true,rangelength:[2,160]}}"/></td>
 		</tr>
     </tbody>
+	<tr>
+		<td></td>
+		<td>
+			<input type="submit" value="$i18n.getString( 'update' )" />
+			<input type="button" value="$i18n.getString( 'cancel' )" onclick="window.location.href='relationshipType.action'" />
+		</td>
+	</tr>
   </table>  
 
-<p>
-    <input type="submit" value="$i18n.getString( 'update' )" style="width:10em"/>
-    <input type="button" value="$i18n.getString( 'cancel' )" onclick="window.location.href='relationshipType.action'" style="width:10em"/>
-</p>
-
 </form>     

=== modified file 'dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/webapp/dhis-web-maintenance-patient/updateSingleProgramValidationForm.vm'
--- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/webapp/dhis-web-maintenance-patient/updateSingleProgramValidationForm.vm	2011-09-29 04:17:34 +0000
+++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/webapp/dhis-web-maintenance-patient/updateSingleProgramValidationForm.vm	2012-03-15 09:28:38 +0000
@@ -19,7 +19,7 @@
 	</tr>
 	<tr>
 		<td colspan='2'>			
-			<input type="text" id='description' name='description' style="width:100%" value='$validation.description'>
+			<input type="text" id='description' name='description' value='$validation.description'>
 		</td>
 	</tr>
 	<tr>
@@ -29,7 +29,7 @@
 	</tr>
 	<tr>
 		<td>
-			<select style="width:30.2em" id='leftStage' name='leftStage' onchange="getLeftPrgramStageDataElements();">
+			<select id='leftStage' name='leftStage' onchange="getLeftPrgramStageDataElements();">
 				<option value=''>[$i18n.getString( "please_select" )]</option>
 				#foreach($stage in $validation.program.programStages)
 				<option value='$stage.id'>$stage.name</option>
@@ -39,42 +39,42 @@
 	</tr>
 	<tr>
 		<td>
-			<select style="width:30.2em" id='leftSideDE' name='leftSideDE' size='7' ondblclick="insertDataElement(this, 'leftSide');">
+			<select id='leftSideDE' name='leftSideDE' size='7' ondblclick="insertDataElement(this, 'leftSide');">
 			</select>
 		</td>
 	</tr>
 	<tr>
 		<td>
-			<img src="../images/plus.png" alt="$i18n.getString( 'plus' )" onclick='insertOperator( "leftStageDescription", "leftSide", "+" );' style="cursor:pointer;"/>
-			&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
-			<img src="../images/less.png" alt="$i18n.getString( 'less' )" onclick='insertOperator( "leftStageDescription", "leftSide", "<" );' style="cursor:pointer;">
-			<img src="../images/less_or_equal.png" alt="$i18n.getString( 'less_or_equal' )" onclick='insertOperator( "leftStageDescription", "leftSide", "<=" );' style="cursor:pointer;">
-			<img src="../images/greater.png" alt="$i18n.getString( 'greater' )" onclick='insertOperator( "leftStageDescription", "leftSide", ">" );' style="cursor:pointer;">
-			<img src="../images/greater_or_equal.png" alt="$i18n.getString( 'greater_or_equal' )" onclick='insertOperator( "leftStageDescription", "leftSide", ">=" );' style="cursor:pointer;">
-			<img src="../images/equal.png" alt="$i18n.getString( 'equal' )" onclick='insertOperator( "leftStageDescription", "leftSide", "==" );' style="cursor:pointer;"/>
-			<img src="../images/diff.png" alt="$i18n.getString( 'diff' )" onclick='insertOperator( "leftStageDescription", "leftSide", "!=" );' style="cursor:pointer;"/>
-			&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
-			<img src="../images/clear.png" alt="$i18n.getString( 'clear' )" align='right' onclick="clearValidation( 'leftSide', 'leftStageDescription' )" style="cursor:pointer;margin-right:0.5em"/>
+			<img src="../images/plus.png" alt="$i18n.getString( 'plus' )" onclick='insertOperator( "leftStageDescription", "leftSide", "+" );' class="imgButton" />
+			&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
+			<img src="../images/less.png" alt="$i18n.getString( 'less' )" onclick='insertOperator( "leftStageDescription", "leftSide", "<" );' class="imgButton" />
+			<img src="../images/less_or_equal.png" alt="$i18n.getString( 'less_or_equal' )" onclick='insertOperator( "leftStageDescription", "leftSide", "<=" );' class="imgButton" />
+			<img src="../images/greater.png" alt="$i18n.getString( 'greater' )" onclick='insertOperator( "leftStageDescription", "leftSide", ">" );' class="imgButton" />
+			<img src="../images/greater_or_equal.png" alt="$i18n.getString( 'greater_or_equal' )" onclick='insertOperator( "leftStageDescription", "leftSide", ">=" );' class="imgButton" />
+			<img src="../images/equal.png" alt="$i18n.getString( 'equal' )" onclick='insertOperator( "leftStageDescription", "leftSide", "==" );' class="imgButton" />
+			<img src="../images/diff.png" alt="$i18n.getString( 'diff' )" onclick='insertOperator( "leftStageDescription", "leftSide", "!=" );' class="imgButton"/>
+			&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
+			<img src="../images/clear.png" alt="$i18n.getString( 'clear' )" align='right'  onclick="clearValidation( 'leftSide', 'leftStageDescription' )" />
 		</td>
 	</tr>
 	<tr>
 		<td>
-			<textarea rows='5' style="width:30em" id='leftSide' name='leftSide' onkeyup="getValidationDescription('leftStageDescription', 'leftSide')">$validation.leftSide</textarea>
+			<textarea rows='5' id='leftSide' name='leftSide' onkeyup="getValidationDescription('leftStageDescription', 'leftSide')">$validation.leftSide</textarea>
 			<input type='hidden' id='rightSide' name='rightSide' value='1==1'>
 		</td>
 	</tr>
 	<tr>	
 		<td>
-			<fieldset style="border: 1px solid #3f5d8e; ">
+			<fieldset>
 				<legend>$i18n.getString( "description" )</legend>
-				<div id='leftStageDescription' style="width:29em">$!leftDescription</div>
+				<div id='leftStageDescription'>$!leftDescription</div>
 			</fieldset>
 		</td>
 	</tr>
 	<tr>
 		<td>
-			<input type='submit' value="$i18n.getString( "update" )" style="width:10em">
-			<input type='button' value="$i18n.getString( "cancel" )" style="width:10em" onclick="window.location.href='programValidation.action?programId=$validation.program.id'">
+			<input type='submit' value="$i18n.getString( 'update' )" >
+			<input type='button' value="$i18n.getString( 'cancel' )" onclick="window.location.href='programValidation.action?programId=$validation.program.id'">
 		</td>
 		<td></td>
 	</tr>