diff --git a/VERSION b/VERSION
index 2f8eba14..957b35c1 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-Version 2.0.8 (2012-09-13 14:12:00) stable
+Version 2.0.8 (2012-09-13 14:56:37) stable
diff --git a/applications/welcome/static/css/web2py.css b/applications/welcome/static/css/web2py.css
index f0cdaf63..57e03cd7 100644
--- a/applications/welcome/static/css/web2py.css
+++ b/applications/welcome/static/css/web2py.css
@@ -10,7 +10,7 @@ h3 {font-size:2.00em}
 h4 {font-size:1.50em}
 h5 {font-size:1.25em}
 h6 {font-size:1.12em}
-th,label {font-weight:bold; white-space:nowrap}
+th,label {font-weight:bold; white-space:nowrap;}
 td,th {text-align:left; padding:2px 5px 2px 5px}
 th {vertical-align:middle; border-right:1px solid white}
 td {vertical-align:top}
@@ -187,10 +187,7 @@ div.error {
 .web2py_paginator {}
 .web2py_grid {width:100%}
 .web2py_grid table {width:100%}
-.web2py_grid tbody td {
-    padding:2px 5px 2px 5px;
-    vertical-align:middle;
-}
+.web2py_grid tbody td {padding:2px 5px 2px 5px; vertical-align: middle;}
 
 .web2py_grid thead th,.web2py_grid tfoot td {
     background-color:#EAEAEA;
diff --git a/gluon/sqlhtml.py b/gluon/sqlhtml.py
index ead2ac0b..e40fa534 100644
--- a/gluon/sqlhtml.py
+++ b/gluon/sqlhtml.py
@@ -2114,11 +2114,12 @@ class SQLFORM(FORM):
         else:
             export_menu = None
 
-        res = DIV(console,
-                  DIV(htmltable,_class="web2py_table"),
-                  DIV(paginator,_class=\
-                          "web2py_paginator %(header)s %(cornerbottom)s" % ui),
+        res = DIV(console,DIV(htmltable,_class="web2py_table"),
                   _class='%s %s' % (_class, ui.get('widget')))
+        if paginator.components:
+            res.append(
+                DIV(paginator,
+                    _class="web2py_paginator %(header)s %(cornerbottom)s"%ui))
         if export_menu: res.append(export_menu)
         res.create_form = create_form
         res.update_form = update_form