diff --git a/VERSION b/VERSION
index 87b13f35..70d77739 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-Version 1.99.3 (2011-12-04 16:01:11) dev
+Version 1.99.3 (2011-12-04 16:24:53) dev
diff --git a/applications/examples/static/css/web2py.css b/applications/examples/static/css/web2py.css
index f9ad3a19..8e18b880 100644
--- a/applications/examples/static/css/web2py.css
+++ b/applications/examples/static/css/web2py.css
@@ -15,9 +15,9 @@ left { float:left; text-align: left; }
 center { width:100; text-align: center; vertical-align:middle;}
 label { white-space: nowrap; }
 th, label { font-weight: bold; }
-th, td { text-align: left; vertical-align: top; }
+th, td { text-align: left; vertical-align: top; padding: 2px 5px 2px 5px;}
 form table tr td label { text-align: right; }
-p, table, ol, ul { margin: 0.5em 0 0.5em 0 }
+p, table, ol, ul { padding: 0.5em 0 0.5em 0 }
 p {text-align: justify }
 ol, ul { padding-left: 30px }
 li { margin-bottom: 0.5em; }
@@ -164,8 +164,6 @@ div.error {
 }
 
 .breadcrumbs {
-  font-size: 1.25em;
-  float: left;
 }
 
 .copyright {float: left;}
@@ -192,13 +190,13 @@ div.error {
 * will look better with the declarations below
 * if needed to remove base.css consider keeping these following lines in some css file.
 */
+.web2py_table { border: 1px solid #ccc; }
+.web2py_paginator { border-left: 1px solid #ccc; border-right: 1px solid #ccc; border-bottom: 1px solid #ccc; }
 .web2py_grid a { text-decoration:none;}
 .web2py_grid table { width: 100% }
 .web2py_grid td { white-space:nowrap; }
-.web2py_grid th { background-color:#EAEAEA; }
-.web2py_grid tbody th,
 .web2py_grid tbody td {
-    padding: 5px 10px 5px;
+    padding: 2px 5px 2px 5px;
     line-height: 13.5px;
     vertical-align: middle;
 }
@@ -212,7 +210,10 @@ div.error {
     }
 
 .web2py_grid thead th {
-    padding-top: 9px;
+    background-color:#EAEAEA;	
+    padding: 10px 5px 10px 5px;
+    line-height: 13.5px;
+    vertical-align: middle;
     font-weight: bold;
     border-bottom: 1px solid #DDD;
     border-right: 1px solid #DDD;
@@ -220,6 +221,7 @@ div.error {
 .web2py_grid tr.odd {background-color: #F9F9F9;}
 .web2py_grid tr:hover {background-color: #F5F5F5; }
 
+/*
 .web2py_breadcrumbs a {
     line-height: 20px; margin-right: 5px; display: inline-block;
     padding: 3px 5px 3px 5px;
@@ -233,11 +235,11 @@ div.error {
     -webkit-background-clip: padding-box; border-radius: 2px;
     outline: none; position: relative; zoom: 1; *display: inline;
 }
+*/
 
 .web2py_console {
-    /*background-color: #f2f2f2; padding: 5px; border-bottom: 1px solid #DDD; */
     min-height: 60px;
-    /*text-align:center;*/
+    text-align: left;
 }
 
 
@@ -247,11 +249,12 @@ div.error {
     text-align:left;
 
 }
-.web2py_grid .row_buttons{
+.web2py_grid .row_buttons {
     min-height:25px;
+    vertical-align: middle;
 }
-.web2py_grid>.row_buttons a{
-    margin:10px;
+.web2py_grid .row_buttons a {
+    margin: 3px;
 }
 
 .web2py_grid .row_buttons a,
@@ -308,12 +311,6 @@ color: #222;
     text-align:right;
 }
 
-.web2py_table, .web2py_form {
-
-    border-left: 1px solid #CCC;
-    border-right: 1px solid #CCC;
-    border-bottom: 1px solid #CCC;
-}
 /*Fix firefox problem*/
 .web2py_table {clear: both; display: block;}
 
@@ -335,13 +332,16 @@ color: #222;
 .web2py_paginator .current {
     font-weight: bold;
 }
+#w2p_query_trigger {
+        margin-left: 0;
+}
 #w2p_query_panel {
-        float:left;
+        // float:left;
 	background:#e0e0e0;
         border:1px solid #CFCFCF;
 	// bottom:3px;
         // left:187px;
-        margin-top: 30px;
+        // margin-top: 30px;
         min-width:550px;
 	min-height:16px;
         padding: 3px 3px;
diff --git a/applications/welcome/static/css/web2py.css b/applications/welcome/static/css/web2py.css
index b9fafa65..8e18b880 100644
--- a/applications/welcome/static/css/web2py.css
+++ b/applications/welcome/static/css/web2py.css
@@ -191,6 +191,7 @@ div.error {
 * if needed to remove base.css consider keeping these following lines in some css file.
 */
 .web2py_table { border: 1px solid #ccc; }
+.web2py_paginator { border-left: 1px solid #ccc; border-right: 1px solid #ccc; border-bottom: 1px solid #ccc; }
 .web2py_grid a { text-decoration:none;}
 .web2py_grid table { width: 100% }
 .web2py_grid td { white-space:nowrap; }
diff --git a/gluon/sqlhtml.py b/gluon/sqlhtml.py
index f7af8d6e..66aaf3d0 100644
--- a/gluon/sqlhtml.py
+++ b/gluon/sqlhtml.py
@@ -1823,7 +1823,7 @@ class SQLFORM(FORM):
                     tr.append(row_buttons)
                 tbody.append(tr)
             htmltable.append(tbody)
-            htmltable = DIV(htmltable,_style='width:100%;overflow-x:scroll')
+            htmltable = DIV(htmltable,_style='width:100%;overflow-x:auto')
             if selectable:
                 htmltable = FORM(htmltable,INPUT(_type="submit"))
                 if htmltable.process(formname=formname).accepted:#