=== modified file 'dhis-2/dhis-web/dhis-web-caseentry/src/main/java/org/hisp/dhis/caseentry/action/caseentry/LoadProgramStageInstancesAction.java'
--- dhis-2/dhis-web/dhis-web-caseentry/src/main/java/org/hisp/dhis/caseentry/action/caseentry/LoadProgramStageInstancesAction.java	2014-06-20 12:32:01 +0000
+++ dhis-2/dhis-web/dhis-web-caseentry/src/main/java/org/hisp/dhis/caseentry/action/caseentry/LoadProgramStageInstancesAction.java	2014-06-22 13:38:08 +0000
@@ -38,8 +38,6 @@
 import org.hisp.dhis.program.ProgramInstanceService;
 import org.hisp.dhis.program.ProgramService;
 import org.hisp.dhis.program.ProgramStageInstance;
-import org.hisp.dhis.program.ProgramStageInstanceService;
-import org.hisp.dhis.trackedentity.TrackedEntityInstance;
 import org.hisp.dhis.trackedentity.TrackedEntityInstanceService;
 
 import com.opensymphony.xwork2.Action;

=== modified file 'dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-datadictionary/src/main/webapp/dhis-web-maintenance-datadictionary/javascript/categoryOption.js'
--- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-datadictionary/src/main/webapp/dhis-web-maintenance-datadictionary/javascript/categoryOption.js	2014-06-10 20:46:05 +0000
+++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-datadictionary/src/main/webapp/dhis-web-maintenance-datadictionary/javascript/categoryOption.js	2014-06-22 13:38:08 +0000
@@ -59,7 +59,7 @@
 
 function showMoreOrFewerOptions()
 {
-    $( ".showMoreOptions" ).toggle();
-    $( ".moreOptions" ).toggle();
+    $( "#showMoreOptions" ).toggle();
+    $( "#moreOptions" ).toggle();
 }
 

=== modified file 'dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-datadictionary/src/main/webapp/dhis-web-maintenance-datadictionary/multidimensional/addDataElementCategoryOptionForm.vm'
--- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-datadictionary/src/main/webapp/dhis-web-maintenance-datadictionary/multidimensional/addDataElementCategoryOptionForm.vm	2014-06-17 13:09:03 +0000
+++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-datadictionary/src/main/webapp/dhis-web-maintenance-datadictionary/multidimensional/addDataElementCategoryOptionForm.vm	2014-06-22 13:38:08 +0000
@@ -35,42 +35,37 @@
 <h3>$i18n.getString( "create_new_data_element_category_option" )</h3>
 
 <form id="addDataElementCategoryOptionForm" name="addDataElementCategoryOptionForm" action="addDataElementCategoryOption.action" method="post" class="inputForm">
+  
   <table>
     <tr>
-      <th colspan="4">$i18n.getString( "details" )</th>      
+      <th colspan="2">$i18n.getString( "details" )</th>      
     </tr>
     <tr>
-      <td><label>$i18n.getString( "name" ) <em title="$i18n.getString( "required" )" class="required">*</em></label></td>
-      <td colspan="3"><input type="text" id="name" name="name" class="{validate:{required:true,rangelength:[2,150]}}"/></td>
+      <td style="width: 100px"><label>$i18n.getString( "name" ) <em title="$i18n.getString( "required" )" class="required">*</em></label></td>
+      <td><input type="text" id="name" name="name" class="{validate:{required:true,rangelength:[2,150]}}"/></td>
     </tr>   
 	<tr>
 	  <td><label>$i18n.getString( "code" )</td>
-	  <td colspan="3"><input type="text" id="code" name="code"/></td>
-    </tr>
-    <tr class="showMoreOptions">
-      <td colspan="4"><a href="javascript:showMoreOrFewerOptions()">$i18n.getString( "show_more_options" )</a></td>
-    </tr>
-    <tr class="moreOptions" style="display:none">
-      <td>
-        <label for="startDate">$i18n.getString( 'start_date' )</label>
-      </td>
-      <td>
-        <input type="text" id="startDate" name="startDate" style="width:20em">
-      </td>
-    </tr>
-    <tr class="moreOptions" style="display:none">
-      <td>
-        <label for="endDate">$i18n.getString( 'end_date' )</label>
-      </td>
-      <td>
-        <input type="text" id="endDate" name="endDate" style="width:20em">
-      </td>
-    </tr>
-  </table>
-
-  <div class="moreOptions" style="display:none">
-
-  <table style="margin-bottom: 20px;">
+	  <td><input type="text" id="code" name="code"/></td>
+    </tr>
+  </table>
+  
+  <div id="showMoreOptions" style="margin: 20px 0;"><a href="javascript:showMoreOrFewerOptions()">$i18n.getString( "show_more_options" )</a></div>
+  
+  <div id="moreOptions" style="display:none">
+    
+  <table>
+    <tr>
+      <td style="width: 100px"><label for="startDate">$i18n.getString( 'start_date' )</label></td>
+      <td><input type="text" id="startDate" name="startDate"></td>
+    </tr>
+    <tr>
+      <td><label for="endDate">$i18n.getString( 'end_date' )</label></td>
+      <td><input type="text" id="endDate" name="endDate"></td>
+    </tr>
+  </table>
+
+  <table style="margin: 20px 0;">
     <tr>
       <th>$i18n.getString( "organisation_units" )</th>
     </tr>
@@ -81,17 +76,13 @@
     </tr>
   </table>
 
-  <div id="showFewerOptions" style="margin-bottom: 20px;"><a href="javascript:showMoreOrFewerOptions()">$i18n.getString( "show_fewer_options" )</a></div>
+  <div id="showFewerOptions" style="margin: 20px 0;"><a href="javascript:showMoreOrFewerOptions()">$i18n.getString( "show_fewer_options" )</a></div>
 
   </div>
 
-  <table>
-    <tr>
-      <td></td>
-      <td>
-        <input type="submit"  value="$i18n.getString( 'add' )" style="width:100px">
-        <input type="button" onclick="dhis2.commons.redirectCurrentPage( 'categoryOption.action' )" value="$i18n.getString( 'cancel' )" style="width:100px"/></p>
-      </td>
-    </tr>
-  </table>
+  <p>
+    <input type="submit"  value="$i18n.getString( 'add' )" style="width:10em">
+    <input type="button" onclick="dhis2.commons.redirectCurrentPage( 'categoryOption.action' )" value="$i18n.getString( 'cancel' )" 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/multidimensional/updateDataElementCategoryOptionForm.vm'
--- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-datadictionary/src/main/webapp/dhis-web-maintenance-datadictionary/multidimensional/updateDataElementCategoryOptionForm.vm	2014-06-17 13:09:03 +0000
+++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-datadictionary/src/main/webapp/dhis-web-maintenance-datadictionary/multidimensional/updateDataElementCategoryOptionForm.vm	2014-06-22 13:38:08 +0000
@@ -43,41 +43,35 @@
   
   <table>
     <tr>
-      <th colspan="4">$i18n.getString( "details" )</th>      
+      <th colspan="2">$i18n.getString( "details" )</th>      
     </tr>
     <tr>
-      <td><label>$i18n.getString( "name" ) <em title="$i18n.getString( 'required' )" class="required">*</em></label></td>
+      <td style="width: 100px"><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( $dataElementCategoryOption.name )" class="{validate:{required:true,rangelength:[2,150]}}"/></td>
       <td></td>
     </tr>      
 	<tr>
 	  <td><label>$i18n.getString( "code" )</label></td>
-	  <td colspan="3"><input type="text" id="code" name="code" style="width:25em" value="$!encoder.htmlEncode( $dataElementCategoryOption.code )" /></td>
-    </tr>
-    <tr class="showMoreOptions">
-      <td colspan="4"><a href="javascript:showMoreOrFewerOptions()">$i18n.getString( "show_more_options" )</a></td>
-    </tr>
-    <tr class="moreOptions" style="display:none">
-      <td>
-        <label for="startDate">$i18n.getString( 'start_date' )</label>
-      </td>
-      <td>
-        <input type="text" id="startDate" name="startDate" style="width:20em" value="$!format.formatDate( $!dataElementCategoryOption.startDate )">
-          </td>
-      </tr>
-      <tr class="moreOptions" style="display:none">
-        <td>
-          <label for="endDate">$i18n.getString( 'end_date' )</label>
-        </td>
-      <td>
-          <input type="text" id="endDate" name="endDate" style="width:20em" value="$!format.formatDate( $!dataElementCategoryOption.endDate )">
-      </td>
+	  <td><input type="text" id="code" name="code" value="$!encoder.htmlEncode( $dataElementCategoryOption.code )" /></td>
+    </tr>
+  </table>  
+  
+  <div id="showMoreOptions" style="margin: 20px 0;"><a href="javascript:showMoreOrFewerOptions()">$i18n.getString( "show_more_options" )</a></div>
+  
+  <div id="moreOptions" style="display:none">
+    
+  <table>
+    <tr>
+      <td style="width: 100px"><label for="startDate">$i18n.getString( 'start_date' )</label></td>
+      <td><input type="text" id="startDate" name="startDate" value="$!format.formatDate( $!dataElementCategoryOption.startDate )"></td>
+    </tr>
+    <tr>
+      <td><label for="endDate">$i18n.getString( 'end_date' )</label></td>
+      <td><input type="text" id="endDate" name="endDate" value="$!format.formatDate( $!dataElementCategoryOption.endDate )"></td>
     </tr>
   </table>
 
-  <div class="moreOptions" style="display:none">
-
-  <table style="margin-bottom: 20px;">
+  <table style="margin: 20px 0;">
     <tr>
       <th>$i18n.getString( "organisation_units" )</th>
     </tr>
@@ -88,17 +82,13 @@
     </tr>
   </table>
 
-  <div id="showFewerOptions" style="margin-bottom: 20px;"><a href="javascript:showMoreOrFewerOptions()">$i18n.getString( "show_fewer_options" )</a></div>
+  <div id="showFewerOptions" style="margin: 20px 0;"><a href="javascript:showMoreOrFewerOptions()">$i18n.getString( "show_fewer_options" )</a></div>
 
   </div>
 
-  <table>
-    <tr>
-      <td></td>
-      <td colspan="3">
-        <input type="submit" value="$i18n.getString( 'save' )" style="width:100px"/>
-		<input type="button" onclick="dhis2.commons.redirectCurrentPage( 'categoryOption.action' )" value="$i18n.getString( 'cancel' )" style="width:100px"/></p>
-      </td>
-    </tr>
-  </table>
+  <p>
+    <input type="submit" value="$i18n.getString( 'save' )" style="width:10em"/>
+	<input type="button" onclick="dhis2.commons.redirectCurrentPage( 'categoryOption.action' )" value="$i18n.getString( 'cancel' )" style="width:10em"/></p>
+  </p>
+  
 </form>