=== modified file 'dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-datadictionary/src/main/webapp/dhis-web-maintenance-datadictionary/addDataElementForm.vm'
--- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-datadictionary/src/main/webapp/dhis-web-maintenance-datadictionary/addDataElementForm.vm	2012-02-07 03:20:10 +0000
+++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-datadictionary/src/main/webapp/dhis-web-maintenance-datadictionary/addDataElementForm.vm	2012-06-10 20:12:55 +0000
@@ -31,9 +31,6 @@
 <select name="factors" id="factorsSubmit" multiple="multiple" style="display:none"></select>
 
 <table>
-	<col width="200px" />
-	<col width="240px" />
-
 	<tr>
 		<th colspan="2">$i18n.getString( "details" )</th>
 	</tr>
@@ -64,7 +61,7 @@
 	<tr>
 		<td><label for="domainType">$i18n.getString( "domain_type" ) <em title="$i18n.getString( 'required' )" class="required">*</em></label></td>
 		<td>
-			<select id="domainType" name="domainType" style="min-width:244px">
+			<select id="domainType" name="domainType" style="min-width:246px; margin: 0;">
 				<option value="aggregate" selected="selected">$i18n.getString( "aggregate" )</option>
 				<option value="patient">$i18n.getString( "patient" )</option>				
 			</select>
@@ -73,7 +70,7 @@
 	<tr>
 		<td><label for="valueType">$i18n.getString( "value_type" ) <em title="$i18n.getString( 'required' )" class="required">*</em></label></td>
 		<td>
-			<select id="valueType" style="min-width:244px"  onchange="changeValueType( this.value )">
+			<select id="valueType" style="min-width:246px; margin: 0;"  onchange="changeValueType( this.value )">
 				<option value="int" selected="selected" onclick="enable('numberType');">$i18n.getString( "number" )</option>
 				<option value="string"onclick="disable('numberType');">$i18n.getString( "text" )</option>
 				<option value="bool"onclick="disable('numberType');">$i18n.getString( "yes_no" )</option>
@@ -85,7 +82,7 @@
 	<tr>
 		<td><label for="numberValueType">$i18n.getString( "number_value_type" )</label></td>
 		<td>
-			<select id="numberType" name="numberType" style="min-width:244px">
+			<select id="numberType" name="numberType" style="min-width:246px; margin: 0;">
 				<option value="number">$i18n.getString( "number" )</option>
 				<option value="int" >$i18n.getString( "int" )</option>
 				<option value="positiveNumber">$i18n.getString( "positiveNumber" )</option>
@@ -96,7 +93,7 @@
 	<tr>
 		<td><label for="zeroIsSignificant ">$i18n.getString( "store_zero_data_values" )</label></td>
 		<td>
-			<select id="zeroIsSignificant" name="zeroIsSignificant" style="min-width:244px">
+			<select id="zeroIsSignificant" name="zeroIsSignificant" style="min-width:246px; margin: 0;">
 				<option value="false" selected="selected">$i18n.getString( "no" )</option>
 				<option value="true" >$i18n.getString( "yes" )</option>
 			</select>
@@ -105,7 +102,7 @@
 	<tr id="aggregationOperator">
 		<td><label for="aggregationOperator">$i18n.getString( "aggregation_operator" ) <em title="$i18n.getString( 'required' )" class="required">*</em></label></td>
 		<td>
-			<select name="aggregationOperator" style="min-width:244px">
+			<select name="aggregationOperator" style="min-width:246px; margin: 0;">
 				<option value="sum" selected="selected">$i18n.getString( "sum" )</option>
 				<option value="average">$i18n.getString( "average" )</option>
 			</select>
@@ -118,7 +115,7 @@
 	<tr>	
 		<td><label for="selectedCategoryComboId">$i18n.getString( "category_combo" ) <em title="$i18n.getString( 'required' )" class="required">*</em></label></td>
 		<td>
-			<select id="selectedCategoryComboId" style="min-width:244px">				
+			<select id="selectedCategoryComboId" style="min-width:246px; margin: 0;">				
 			#foreach( $dataElementCategoryCombo in $dataElementCategoryCombos )
 				<option value="$dataElementCategoryCombo.id" #if( $dataElementCategoryCombo.id == $defaultCategoryCombo.id ) selected="selected" #end>$encoder.htmlEncode( $dataElementCategoryCombo.name )</option>
 			#end
@@ -133,7 +130,7 @@
 	<tr>
 		<td>$i18n.getString( 'option_set' )</td>			
 		<td>
-			<select id="selectedOptionSetId" name="selectedOptionSetId" style="min-width: 244px;">
+			<select id="selectedOptionSetId" name="selectedOptionSetId" style="min-width:246px; margin: 0;;">
 				<option value="0">[$i18n.getString('please_select')]</option>
 				#foreach ( $optionSet in $optionSets )
 				<option value="$optionSet.id">$optionSet.name</option>
@@ -200,7 +197,7 @@
     <tr>
 		<td>$encoder.htmlEncode( $groupSet.name )</td>			
 		<td>
-			<select id="selectedGroups" name="selectedGroups" style="min-width: 244px;">
+			<select id="selectedGroups" name="selectedGroups" style="min-width:246px; margin: 0;;">
 				<option value="-1">[ $i18n.getString( "select_group" ) ]</option>
 				#foreach ( $group in $groupSet.getSortedGroups() )
 				<option value="$group.id">$group.name</option>
@@ -213,8 +210,8 @@
 #end
 
 <p>
-	<input type="submit" value="$i18n.getString( 'add' )" style="width:10em"/>
-	<input type="button" value="$i18n.getString( 'cancel' )" onclick="window.location.href='dataElement.action'" style="width:10em"/>
+	<input type="submit" value="$i18n.getString( 'add' )" style="width:10em" />
+	<input type="button" value="$i18n.getString( 'cancel' )" onclick="window.location.href='dataElement.action'" style="width:10em" />
 </p>
 
 </form>

=== modified file 'dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-datadictionary/src/main/webapp/dhis-web-maintenance-datadictionary/updateDataElementForm.vm'
--- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-datadictionary/src/main/webapp/dhis-web-maintenance-datadictionary/updateDataElementForm.vm	2012-02-06 02:56:02 +0000
+++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-datadictionary/src/main/webapp/dhis-web-maintenance-datadictionary/updateDataElementForm.vm	2012-06-10 20:12:55 +0000
@@ -28,41 +28,42 @@
 <h3>$i18n.getString( "edit_data_element" )</h3>
 
 <form id="updateDataElementForm" action="updateDataElement.action" method="POST" >
-	<input type="hidden" id="id" name="id" value="$dataElement.id"/>
-	<input type="hidden" id="defaultCategoryCombo" value="$defaultCategoryCombo.id"/>
-	<select name="factors" id="factorsSubmit" multiple="multiple" style="display:none"></select>
+<input type="hidden" id="id" name="id" value="$dataElement.id"/>
+<input type="hidden" id="defaultCategoryCombo" value="$defaultCategoryCombo.id"/>
+<select name="factors" id="factorsSubmit" multiple="multiple" style="display:none"></select>
+
 <table>
 	<tr>
 		<th colspan="2">$i18n.getString( "details" )</th>
 	</tr>
 	<tr>
 		<td><label for="name">$i18n.getString( "name" ) <em title="$i18n.getString( 'required' )" class="required">*</em></label></td>
-		<td><input type="text" id="name" name="name" value="$encoder.htmlEncode( $dataElement.name )" onchange="nameChanged()" style="width:20em"/></td>
+		<td><input type="text" id="name" name="name" value="$encoder.htmlEncode( $dataElement.name )" onchange="nameChanged()" style="width:240px;"/></td>
 	</tr>
 	<tr>
 		<td><label for="shortName">$i18n.getString( "short_name" )</label></td>
-		<td><input type="text" id="shortName" name="shortName" value="$encoder.htmlEncode( $dataElement.shortName )" style="width:20em"/></td>
+		<td><input type="text" id="shortName" name="shortName" value="$encoder.htmlEncode( $dataElement.shortName )" style="width:240px;"/></td>
 	</tr>
 	<tr>
 		<td><label for="alternativeName">$i18n.getString( "alternative_name" )</label></td>
-		<td><input type="text" id="alternativeName" name="alternativeName" value="$!encoder.htmlEncode( $dataElement.alternativeName )" style="width:20em"/></td>
+		<td><input type="text" id="alternativeName" name="alternativeName" value="$!encoder.htmlEncode( $dataElement.alternativeName )" style="width:240px;"/></td>
 	</tr>
 	<tr>
 		<td><label for="code">$i18n.getString( "code" )</label></td>
-		<td><input type="text" id="code" name="code" value="$!encoder.htmlEncode( $dataElement.code )" style="width:20em"/></td>
+		<td><input type="text" id="code" name="code" value="$!encoder.htmlEncode( $dataElement.code )" style="width:240px;"/></td>
 	</tr>
 	<tr>
 		<td><label for="description">$i18n.getString( "description" )</label></td>
-		<td><textarea id="description" name="description" style="width:20em; height:8em">$!encoder.htmlEncode( $dataElement.description )</textarea></td>
+		<td><textarea id="description" name="description" style="width:240px; height:8em">$!encoder.htmlEncode( $dataElement.description )</textarea></td>
 	</tr>
 	<tr>
 		<td><label for="formName">$i18n.getString( "form_name" )</label></td>
-		<td><input type="text" id="formName" name="formName" value="$!encoder.htmlEncode( $dataElement.formName )" style="width:20em"/></td>
+		<td><input type="text" id="formName" name="formName" value="$!encoder.htmlEncode( $dataElement.formName )" style="width:240px"/></td>
 	</tr>
 	<tr>
 		<td><label for="active">$i18n.getString( "active" ) <em title="$i18n.getString( 'required' )" class="required">*</em></label></td>
 		<td>
-			<select id="active" name="active" style="min-width:20em">
+			<select id="active" name="active" style="min-width:246px; margin: 0;">
 				<option value="true" #if( $dataElement.active ) selected="selected" #end>$i18n.getString( "yes" )</option>
 				<option value="false" #if( !$dataElement.active ) selected="selected" #end>$i18n.getString( "no" )</option>
 			</select>
@@ -71,7 +72,7 @@
 	<tr>
 		<td><label for="domainType">$i18n.getString( "domain_type" ) <em title="$i18n.getString( 'required' )" class="required">*</em></label></td>
 		<td>
-			<select id="domainType" name="domainType" style="min-width:20em">
+			<select id="domainType" name="domainType" style="min-width:246px; margin: 0;">
 				<option value="aggregate" #if( $dataElement.getDomainTypeNullSafe() == 'aggregate' ) selected="selected" #end>$i18n.getString( "aggregate" )</option>
 				<option value="patient" #if( $dataElement.getDomainTypeNullSafe() == 'patient' ) selected="selected" #end>$i18n.getString( "patient" )</option>				
 			</select>
@@ -80,7 +81,7 @@
 	<tr #if( $calculatedDataElement ) style="display:none" #end>
 		<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:20em">
+			<select id="valueType" name="valueType" style="min-width:246px; margin: 0;">
 				<option value="int" #if( $dataElement.type == 'int' ) selected="selected" #end  onclick="enable('numberType');">$i18n.getString( "number" )</option>
 				<option value="string" #if( $dataElement.type == 'string' ) selected="selected" #end  onclick="disable('numberType');">$i18n.getString( "text" )</option>
 				<option value="bool" #if( $dataElement.type == 'bool' ) selected="selected" #end  onclick="disable('numberType');">$i18n.getString( "yes_no" )</option>
@@ -91,7 +92,7 @@
 	<tr>
 		<td><label for="numberValueType">$i18n.getString( "number_value_type" )</label></td>
 		<td>
-			<select id="numberType" name="numberType" style="min-width:20em">
+			<select id="numberType" name="numberType" style="min-width:246px; margin: 0;">
 				<option value="number" #if( $dataElement.numberType == 'number' ) selected="selected" #end>$i18n.getString( "number" )</option>
 				<option value="int" #if( $dataElement.numberType == 'int' ) selected="selected" #end>$i18n.getString( "int" )</option>
 				<option value="positiveNumber" #if( $dataElement.numberType == 'positiveNumber' ) selected="selected" #end>$i18n.getString( "positiveNumber" )</option>
@@ -109,7 +110,7 @@
 	<tr>
 		<td><label for="zeroIsSignificant ">$i18n.getString( "store_zero_data_values" )</label></td>
 		<td>
-			<select id="zeroIsSignificant" name="zeroIsSignificant" style="min-width:20em">				
+			<select id="zeroIsSignificant" name="zeroIsSignificant" style="min-width:246px; margin: 0;">				
 				<option value="false"#if(!$dataElement.zeroIsSignificant) selected="selected" #end >$i18n.getString( "no" )</option>
 				<option value="true" #if($dataElement.zeroIsSignificant) selected="selected" #end >$i18n.getString( "yes" )</option>
 			</select>
@@ -125,7 +126,7 @@
 	<tr>
 		<td><label for="aggregationOperator" id="lblOperator">$i18n.getString( "aggregation_operator" ) <em title="$i18n.getString( 'required' )" class="required">*</em></label></td>
 		<td>
-			<select id="aggregationOperator" name="aggregationOperator" style="min-width:20em">
+			<select id="aggregationOperator" name="aggregationOperator" style="min-width:246px; margin: 0;">
 				<option value="sum" #if( $dataElement.aggregationOperator == 'sum' ) selected="selected" #end>$i18n.getString( "sum" )</option>
 				<option value="average" #if( $dataElement.aggregationOperator == 'average' ) selected="selected" #end>$i18n.getString( "average" )</option>
 			</select>
@@ -133,12 +134,12 @@
 	</tr>
     <tr>
         <td><label for="url">$i18n.getString( "url" )</label></td>
-        <td><input type="text" id="url" name="url" value="$!encoder.htmlEncode( $dataElement.url )" style="width:20em"/></td>
+        <td><input type="text" id="url" name="url" value="$!encoder.htmlEncode( $dataElement.url )" style="width:240px"/></td>
     </tr>
 	<tr #if( $calculatedDataElement ) style="display:none" #end >	
 		<td><label for="selectedCategoryComboId">$i18n.getString( "category_combo" ) <em title="$i18n.getString( 'required' )" class="required">*</em></label></td>
 		<td>
-			<select id="selectedCategoryComboId" style="min-width:20em">				
+			<select id="selectedCategoryComboId" style="min-width:246px; margin: 0;">				
 			#foreach( $dataElementCategoryCombo in $dataElementCategoryCombos )
 				<option value="$dataElementCategoryCombo.id" #if( $dataElementCategoryCombo.id == $dataElement.categoryCombo.id ) selected="selected" #end>$encoder.htmlEncode( $dataElementCategoryCombo.name )</option>
 			#end
@@ -153,7 +154,7 @@
 	<tr>
 		<td>$i18n.getString( 'option_set' )</td>			
 		<td>
-			<select id="selectedOptionSetId" name="selectedOptionSetId" style="min-width: 244px;">
+			<select id="selectedOptionSetId" name="selectedOptionSetId" style="min-width:246px; margin: 0;;">
 				<option value="0">[$i18n.getString('please_select')]</option>
 				#foreach ( $optionSet in $optionSets )
 				<option value="$optionSet.id" #if( $dataElement.optionSet.id == "$optionSet.id" ) selected #end >$optionSet.name</option>
@@ -204,12 +205,10 @@
 
 #if( $groupSets.size() > 0 )
 <table>
-	<col width="200px" />
-	<col width="240px" />
-
 	<tr>
 		<td style="height:15px" colspan="2">
 	</tr>
+
 	<tr>
 		<th colspan="2">$i18n.getString( "data_element_groups" )</th>
     </tr>
@@ -218,7 +217,7 @@
     <tr>
 		<td>$encoder.htmlEncode( $groupSet.name )</td>
 		<td>
-			<select id="dataElementGroups" name="dataElementGroups" style="min-width: 244px;">
+			<select id="dataElementGroups" name="dataElementGroups" style="min-width:246px; margin: 0;">
 				<option value="-1">[ $i18n.getString( "select_group" ) ]</option>
 				#foreach ( $group in $groupSet.getSortedGroups() )
 				<option value="$group.id" #if( $group.members.contains( $dataElement ) ) selected="selected" #end>$group.name</option>