=== modified file 'dhis-2/dhis-services/dhis-service-core/src/main/java/org/hisp/dhis/dataelement/DefaultDataElementService.java'
--- dhis-2/dhis-services/dhis-service-core/src/main/java/org/hisp/dhis/dataelement/DefaultDataElementService.java	2014-03-18 08:10:10 +0000
+++ dhis-2/dhis-services/dhis-service-core/src/main/java/org/hisp/dhis/dataelement/DefaultDataElementService.java	2014-04-24 21:46:04 +0000
@@ -326,7 +326,6 @@
         return getCountByName( i18nService, dataElementStore, name );
     }
 
-    @Override
     public int getDataElementCountByDomainType( String domainType )
     {
         return dataElementStore.getCountByDomainType( domainType );

=== modified file 'dhis-2/dhis-web/dhis-web-dataentry/src/main/webapp/dhis-web-dataentry/javascript/form.js'
--- dhis-2/dhis-web/dhis-web-dataentry/src/main/webapp/dhis-web-dataentry/javascript/form.js	2014-04-14 07:59:24 +0000
+++ dhis-2/dhis-web/dhis-web-dataentry/src/main/webapp/dhis-web-dataentry/javascript/form.js	2014-04-24 21:46:04 +0000
@@ -422,32 +422,12 @@
             keyPress( event, this );
         } );
 
-		if ( formType != FORMTYPE_CUSTOM )
-		{
-        	$( this ).css( 'width', '100%' );
-		}
-
         if ( type == 'date' )
         {
-            $( this ).css( 'width', '100%' );
             datePicker( id );
         }
     } );
     
-    $( '.entryfield' ).not( '.entryarea' ).each( function( i )
-    {
-		if ( formType != FORMTYPE_CUSTOM )
-		{
-        	$( this ).css( 'text-align', 'center' );
-		}
-    } );
-
-    $( '.entryarea' ).each( function( i )
-    {
-    	$( this ).css( 'min-width', '264px' );
-    	$( this ).css( 'min-height', '45px' );
-    } );
-
     $( '.entryselect' ).each( function( i )
     {
         var id = $( this ).attr( 'id' );
@@ -467,9 +447,6 @@
         {
             saveBoolean( dataElementId, optionComboId, id );
         } );
-
-        $( this ).css( 'width', '88%' );
-        $( this ).css( 'margin-right', '2px' );
     } );
 
     $( '.entrytrueonly' ).each( function( i )
@@ -490,8 +467,6 @@
         {
             saveTrueOnly( dataElementId, optionComboId, id );
         } );
-
-        $( this ).css( 'width', '60%' );
     } );
 
     $( '.entryoptionset' ).each( function( i )
@@ -512,12 +487,6 @@
         {
             saveVal( dataElementId, optionComboId, id );
         } );
-
-        if ( formType != FORMTYPE_CUSTOM ) 
-        {
-            $( this ).css( 'width', '85%' );
-            $( this ).css( 'text-align', 'center' );
-        }
     } );
 
     $( '.commentlink' ).each( function( i )

=== modified file 'dhis-2/dhis-web/dhis-web-dataentry/src/main/webapp/dhis-web-dataentry/style/dhis-web-dataentry.css'
--- dhis-2/dhis-web/dhis-web-dataentry/src/main/webapp/dhis-web-dataentry/style/dhis-web-dataentry.css	2013-12-27 14:30:56 +0000
+++ dhis-2/dhis-web/dhis-web-dataentry/src/main/webapp/dhis-web-dataentry/style/dhis-web-dataentry.css	2014-04-24 21:46:04 +0000
@@ -62,14 +62,6 @@
   display: none;
 }
 
-input[type=text],textarea
-{
-  padding-left: 0;
-  padding-right: 0;
-  margin-top: 1px;
-  margin-bottom: 1px;
-}
-
 .separator
 {
   color: #aaa;
@@ -94,8 +86,8 @@
 
 .formSection td
 {
-  padding-right: 2px;
-  padding-left: 2px;
+  padding-right: 1px;
+  padding-left: 1px;
   height: 28px;
   white-space: nowrap;
 }
@@ -123,3 +115,20 @@
   font-size: 17px;
   padding: 5px 0;
 }
+
+.entryfield,
+.entryoptionset
+{
+  text-align: center;
+  box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.06);
+}
+
+.entryarea
+{
+  min-width: 264px;
+  min-height: 45px;
+  text-align: left;
+  padding: 2px;
+  box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.06);
+}
+