=== modified file 'dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/javascripts/jQuery/jquery.dhisPaging.js'
--- dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/javascripts/jQuery/jquery.dhisPaging.js	2011-05-16 14:21:57 +0000
+++ dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/javascripts/jQuery/jquery.dhisPaging.js	2011-05-16 15:04:53 +0000
@@ -31,13 +31,13 @@
 
 (function($) {
   var templates = {
-    button: "<button id='${id}' style='width: 80px; margin-bottom: 4px; margin-top: 4px;'>${text}</button>",
+    wrapper: "<div id='${id}' style='padding: 0; margin: 0; background-color: #eee; border: 1px solid #666;' />",
+    button: "<button id='${id}' style='width: 70px; margin: 4px;'>${text}</button>",
     option: "<option>${text}</option>",
     option_selected: "<option selected='selected'>${text}</option>",
-    wrapper: "<div id='${id}' style='padding: 0; margin: 0;' />",
-    pagesize_input: "<input id='${id}' type='text' style='width: 100px;'/>",
-    filter_input: "<input id='${id}'></input>",
-    select_page: "<select id='${id}'></select>"
+    pagesize_input: "Page size <input id='${id}' type='text' style='width: 50px;'/>",
+    filter_input: "<input id='${id}' placeholder='Filter'></input>",
+    select_page: "Page <select id='${id}'></select>"
   }
 
   var methods = {
@@ -104,6 +104,7 @@
       params.usePaging = true;
 
       var $select = $(this);
+      $select.css("border", "none");
       var id = $(this).attr("id");
       var wrapper_id = id + "_wrapper";
       var select_page_id = id + "_select_page";

=== modified file 'dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-dataset/src/main/webapp/dhis-web-maintenance-dataset/javascript/viewDataEntryForm.js'
--- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-dataset/src/main/webapp/dhis-web-maintenance-dataset/javascript/viewDataEntryForm.js	2011-05-12 23:33:22 +0000
+++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-dataset/src/main/webapp/dhis-web-maintenance-dataset/javascript/viewDataEntryForm.js	2011-05-16 15:04:53 +0000
@@ -20,15 +20,15 @@
 		var dataElementSelector = $("#dataElementSelector");
 
 		/* Great for debugging when size of dialog is changed */
-		// console.log("D: " + dialog.height() + ", DE: " + dataElementSelector.height() + ", I: " + indicatorSelector.height());
+//		console.log("D: " + dialog.height() + ", DE: " + dataElementSelector.height() + ", I: " + indicatorSelector.height());
 
 		// TODO look into this.. firefox does not treat the box-model the same as webkit... 
 		// 		should be fixable by setting fixed paddings/margin somewhere!
 		
-		var adjustment = 65;
-		if($.browser.webkit) adjustment = 66;
-		else if($.browser.mozilla) adjustment = 65;
-		
+		var adjustment = 96;
+		if($.browser.webkit) adjustment = 96;
+		else if($.browser.mozilla) adjustment = 95;
+
 		dataElementSelector.height( dialog.height() - adjustment );
 		indicatorSelector.height( dialog.height() - adjustment );
 	});

=== modified file 'dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-dataset/src/main/webapp/dhis-web-maintenance-dataset/viewDataEntryForm.vm'
--- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-dataset/src/main/webapp/dhis-web-maintenance-dataset/viewDataEntryForm.vm	2011-05-16 14:21:57 +0000
+++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-dataset/src/main/webapp/dhis-web-maintenance-dataset/viewDataEntryForm.vm	2011-05-16 15:04:53 +0000
@@ -188,12 +188,10 @@
 			</tr>
 
 			<tr>
-				<td>
+				<td colspan="2">
 					<button type="button" id="dataElementsButton">Data Elements</button>
 					<button type="button" id="indicatorsButton">Indicators</button>&nbsp;&nbsp;<span style="color:#606060">|</span>&nbsp;
 					<button type="button" id="insertButton">Insert</button>
-				</td>
-				<td>
 					<span id="message_"></span>
 				</td>
 			</tr>