=== modified file 'dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/css/widgets.css'
--- dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/css/widgets.css	2013-07-04 19:49:24 +0000
+++ dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/css/widgets.css	2013-07-17 15:23:18 +0000
@@ -810,6 +810,22 @@
 }
 
 /*----------------------------------------------------------------------------*/
+/* Filter                                                                     */
+/*----------------------------------------------------------------------------*/
+
+.filterInput
+{
+  max-width: 300px;
+  min-width: 120px;
+  width: 50%;
+}
+
+.filterButton
+{
+  width: 55px;
+}
+
+/*----------------------------------------------------------------------------*/
 /* Div                                                                        */
 /*----------------------------------------------------------------------------*/
 
@@ -817,3 +833,4 @@
 {
 	color: #777;
 }
+

=== modified file 'dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/macros.vm'
--- dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/macros.vm	2013-07-03 19:52:17 +0000
+++ dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/macros.vm	2013-07-17 15:23:18 +0000
@@ -1,10 +1,10 @@
 #macro( objectList $objectName $objects )
     <table class="objectListTable">
         <col>
-        <col width="80">
+        <col width="80">    
         <tr>
-            <td class="filter"><label for="filter">$i18n.getString( "filter_by_name" )</label>: <form action="none" onsubmit="filterValues(this.firstChild.firstChild.value);return false"><div><input id="filter" type="text"><input type="submit" value="Filter"></div></form></td>
-            <td style="text-align:right"><input type="button" value="$i18n.getString( "add_new" )" onclick="window.location.href='showAdd${objectName}Form.action'"></td>
+            <td class="filter"><label for="filter">$i18n.getString( "filter_by_name" )</label>: <form action="none" onsubmit="filterValues(this.firstChild.firstChild.value);return false"><div><input id="filter" type="text"><input type="submit" value="$i18n.getString( 'filter' )"></div></form></td>
+            <td style="text-align:right"><input type="button" value="$i18n.getString( 'add_new' )" onclick="window.location.href='showAdd${objectName}Form.action'"></td>
         </tr>
         <tr>
             <th>$i18n.getString( "name" )</th>
@@ -90,11 +90,10 @@
 
 #macro( filterDiv $action )
 <form id="filterKeyForm" action="${action}.action" method="POST">	
-	<input type="text" id="key" name="key" value="$!encoder.htmlEncode( $key )" placeholder="$i18n.getString( 'filter_by_name' )" style="width:140px"/>
+	<input type="text" id="key" name="key" value="$!encoder.htmlEncode( $key )" placeholder="$i18n.getString( 'filter_by_name' )" class="filterInput" />
 	<input type="hidden" id="curKey" name="curKey" value="$!encoder.htmlEncode( $key )"/>
-	<input type="submit" value="$i18n.getString( 'filter' )" style="width:55px"/>
-	<input type="button" value="$i18n.getString( 'clear' )" 
-	   onclick="window.location.href='${action}.action'" style="width:55px"/>
+	<input type="submit" value="$i18n.getString( 'filter' )" class="filterButton" />
+	<input type="button" value="$i18n.getString( 'clear' )" onclick="window.location.href='${action}.action'" class="filterButton" />
 </form>
 #end