diff --git a/VERSION b/VERSION
index 8046f55a..2f8eba14 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-Version 2.0.8 (2012-09-13 14:06:52) stable
+Version 2.0.8 (2012-09-13 14:12:00) stable
diff --git a/applications/admin/static/css/web2py.css b/applications/admin/static/css/web2py.css
index 54b1cbce..f0cdaf63 100644
--- a/applications/admin/static/css/web2py.css
+++ b/applications/admin/static/css/web2py.css
@@ -15,9 +15,9 @@ td,th {text-align:left; padding:2px 5px 2px 5px}
 th {vertical-align:middle; border-right:1px solid white}
 td {vertical-align:top}
 form table tr td label {text-align:left}
-p,table,ol,ul {padding:0; margin: 0.5em 0}
+p,table,ol,ul {padding:0; margin: 0.75em 0}
 p {text-align:justify}
-ol, ul {list-style-position:inside}
+ol, ul {list-style-position:outside; margin-left:2em}
 li {margin-bottom:0.5em}
 span,input,select,textarea,button,label,a {display:inline}
 img {border:0}
@@ -39,13 +39,6 @@ input[type=text],input[type=password],select{width:300px; margin-right:5px}
 
 /* Sticky footer begin */
 
-.wrapper {
-  min-height:100%;
-  height:auto !important;
-  height:100%;
-  margin:0 auto -8em; /* set last value to footer height plus footer vertical padding */
-}
-
 .main {
   padding:20px 0 50px 0;
 }
@@ -102,25 +95,42 @@ div.flash {
     top:48px;
     right:50px;
     min-width:280px;
-    opacity:0.85;
+    opacity:0.95;
     margin:0px 0px 10px 10px;
-    color:#fff;
     vertical-align:middle;
     cursor:pointer;
-    background:#000;
+    color:#fff;
+    background-color:#000;
     border:2px solid #fff;
-    border-radius:5px;
-    -moz-border-radius:5px;
-    -webkit-border-radius:5px;
+    border-radius:8px;
+    -o-border-radius: 8px;
+    -moz-border-radius:8px;
+    -webkit-border-radius:8px;
+    background-image: -webkit-linear-gradient(top,#222,#000);
+    background-image: -o-linear-gradient(top,#222,#000);
+    background-image: -moz-linear-gradient(90deg, #222, #000);
+    background-image: linear-gradient(top,#222,#000);
+    background-repeat: repeat-x;
+    font-family: "Helvetica Neue", Helvetica, Arial, sans-serif;
+    -webkit-font-smoothing: antialiased;
     z-index:2000;
 }
 
+div.flash:hover { opacity:0.25; }
+
 div.error_wrapper {display:block}
 div.error {
-    background-color:red;
+    width: 298px;
+    background:red;
+    border: 2px solid #d00;
     color:white;
-    padding:3px;
-    display:inline-block;	
+    padding:5px;
+    display:inline-block;
+    background-image: -webkit-linear-gradient(left,#f00,#fdd);
+    background-image: -o-linear-gradient(left,#f00,#fdd);
+    background-image: -moz-linear-gradient(0deg, #f00, #fdd);
+    background-image: linear-gradient(left,#f00,#fdd);
+    background-repeat: repeat-y;
 }
 
 .topbar {
@@ -166,19 +176,6 @@ div.error {
 
 /* #MEDIA QUERIES SECTION */
 
-    /* All Mobile Sizes (devices and browser) */
-    @media only screen and (max-width:767px) {
-/* removed because of bootswatch
-        .topbar {text-align:center}
-        #navbar,#menu {float:none}
-        #navbar {font-size:1.2em; padding:.6em 0 1.2em}
-        #menu  {padding:0 0 1.5em}
-        #menu select {font-size:1.2em; margin:0; padding:0}
-
-        div.flash {top:110px; right:10px}
-*/
-   }
-
 /*
 *Grid
 *
@@ -230,7 +227,7 @@ div.error {
     margin:0;
 }
 
-.web2py_search_actions{
+.web2py_search_actions {
     float:left;
     text-align:left;
 }
@@ -254,13 +251,13 @@ div.error {
 .web2py_console input[type=button],
 .web2py_console button {
     line-height:20px;
-    margin-right:5px; display:inline-block;
+    margin-right:2px; display:inline-block;
     padding:3px 5px 3px 5px;
 }
 
 .web2py_counter {
     margin-top:5px;
-    margin-right:5px;
+    margin-right:2px;
     width:35%;
     float:right;
     text-align:right;
@@ -298,7 +295,11 @@ li.w2p_grid_breadcrumb_elem {
     display:inline-block;
 }
 
-.ie9 #query_panel {padding-bottom:2px}
+.web2py_console form { vertical-align: middle; }
+.web2py_console input, .web2py_console select,
+.web2py_console a { margin: 2px; }
+
+.ie9 #w2p_query_panel {padding-bottom:2px}
 
 #wiki_page_body {
    width: 600px;
diff --git a/applications/examples/static/css/web2py.css b/applications/examples/static/css/web2py.css
index 54b1cbce..f0cdaf63 100644
--- a/applications/examples/static/css/web2py.css
+++ b/applications/examples/static/css/web2py.css
@@ -15,9 +15,9 @@ td,th {text-align:left; padding:2px 5px 2px 5px}
 th {vertical-align:middle; border-right:1px solid white}
 td {vertical-align:top}
 form table tr td label {text-align:left}
-p,table,ol,ul {padding:0; margin: 0.5em 0}
+p,table,ol,ul {padding:0; margin: 0.75em 0}
 p {text-align:justify}
-ol, ul {list-style-position:inside}
+ol, ul {list-style-position:outside; margin-left:2em}
 li {margin-bottom:0.5em}
 span,input,select,textarea,button,label,a {display:inline}
 img {border:0}
@@ -39,13 +39,6 @@ input[type=text],input[type=password],select{width:300px; margin-right:5px}
 
 /* Sticky footer begin */
 
-.wrapper {
-  min-height:100%;
-  height:auto !important;
-  height:100%;
-  margin:0 auto -8em; /* set last value to footer height plus footer vertical padding */
-}
-
 .main {
   padding:20px 0 50px 0;
 }
@@ -102,25 +95,42 @@ div.flash {
     top:48px;
     right:50px;
     min-width:280px;
-    opacity:0.85;
+    opacity:0.95;
     margin:0px 0px 10px 10px;
-    color:#fff;
     vertical-align:middle;
     cursor:pointer;
-    background:#000;
+    color:#fff;
+    background-color:#000;
     border:2px solid #fff;
-    border-radius:5px;
-    -moz-border-radius:5px;
-    -webkit-border-radius:5px;
+    border-radius:8px;
+    -o-border-radius: 8px;
+    -moz-border-radius:8px;
+    -webkit-border-radius:8px;
+    background-image: -webkit-linear-gradient(top,#222,#000);
+    background-image: -o-linear-gradient(top,#222,#000);
+    background-image: -moz-linear-gradient(90deg, #222, #000);
+    background-image: linear-gradient(top,#222,#000);
+    background-repeat: repeat-x;
+    font-family: "Helvetica Neue", Helvetica, Arial, sans-serif;
+    -webkit-font-smoothing: antialiased;
     z-index:2000;
 }
 
+div.flash:hover { opacity:0.25; }
+
 div.error_wrapper {display:block}
 div.error {
-    background-color:red;
+    width: 298px;
+    background:red;
+    border: 2px solid #d00;
     color:white;
-    padding:3px;
-    display:inline-block;	
+    padding:5px;
+    display:inline-block;
+    background-image: -webkit-linear-gradient(left,#f00,#fdd);
+    background-image: -o-linear-gradient(left,#f00,#fdd);
+    background-image: -moz-linear-gradient(0deg, #f00, #fdd);
+    background-image: linear-gradient(left,#f00,#fdd);
+    background-repeat: repeat-y;
 }
 
 .topbar {
@@ -166,19 +176,6 @@ div.error {
 
 /* #MEDIA QUERIES SECTION */
 
-    /* All Mobile Sizes (devices and browser) */
-    @media only screen and (max-width:767px) {
-/* removed because of bootswatch
-        .topbar {text-align:center}
-        #navbar,#menu {float:none}
-        #navbar {font-size:1.2em; padding:.6em 0 1.2em}
-        #menu  {padding:0 0 1.5em}
-        #menu select {font-size:1.2em; margin:0; padding:0}
-
-        div.flash {top:110px; right:10px}
-*/
-   }
-
 /*
 *Grid
 *
@@ -230,7 +227,7 @@ div.error {
     margin:0;
 }
 
-.web2py_search_actions{
+.web2py_search_actions {
     float:left;
     text-align:left;
 }
@@ -254,13 +251,13 @@ div.error {
 .web2py_console input[type=button],
 .web2py_console button {
     line-height:20px;
-    margin-right:5px; display:inline-block;
+    margin-right:2px; display:inline-block;
     padding:3px 5px 3px 5px;
 }
 
 .web2py_counter {
     margin-top:5px;
-    margin-right:5px;
+    margin-right:2px;
     width:35%;
     float:right;
     text-align:right;
@@ -298,7 +295,11 @@ li.w2p_grid_breadcrumb_elem {
     display:inline-block;
 }
 
-.ie9 #query_panel {padding-bottom:2px}
+.web2py_console form { vertical-align: middle; }
+.web2py_console input, .web2py_console select,
+.web2py_console a { margin: 2px; }
+
+.ie9 #w2p_query_panel {padding-bottom:2px}
 
 #wiki_page_body {
    width: 600px;
diff --git a/applications/welcome/views/default/index.html b/applications/welcome/views/default/index.html
index 8e47f8b8..6e9ab1ff 100644
--- a/applications/welcome/views/default/index.html
+++ b/applications/welcome/views/default/index.html
@@ -1,8 +1,6 @@
 {{left_sidebar_enabled,right_sidebar_enabled=False,('message' in globals())}}
 {{extend 'layout.html'}}
 
-{{=SQLFORM.grid(db.auth_user)}}
-
 {{if 'message' in globals():}}
 <h3>{{=message}}</h3>
 
diff --git a/applications/welcome/views/layout.html b/applications/welcome/views/layout.html
index 8747ee79..f2ca21ae 100644
--- a/applications/welcome/views/layout.html
+++ b/applications/welcome/views/layout.html
@@ -6,7 +6,6 @@
 <!--[if IE 9]><html class="ie9 ie-lte9 no-js" lang="{{=T.accepted_language or 'en'}}"> <![endif]-->
 <!--[if (gt IE 9)|!(IE)]><!--> <html class="no-js" lang="{{=T.accepted_language or 'en'}}"> <!--<![endif]-->
 <head>
-
   <meta charset="utf-8" />
   <!-- www.phpied.com/conditional-comments-block-downloads/ -->
   <!-- Always force latest IE rendering engine
@@ -91,59 +90,57 @@
 
   <div class="container">
     <!-- Masthead ================================================== -->
-    <header class="mastheader" id="header">
-      <div class="row">
-	<div class="page-header span12">
-          <h1>
-            {{=response.title or request.application}}
-            <small>{{=response.subtitle or ''}}</small>
-          </h1>
-	</div>
-      </div>
+    <header class="mastheader row" id="header">
+        <div class="span12">
+            <div class="page-header">
+                <h1>
+                    {{=response.title or request.application}}
+                    <small>{{=response.subtitle or ''}}</small>
+                </h1>
+            </div>
+        </div>
     </header>
 
-    <section id="main" class="main span12">
-      <div class="row">
+    <section id="main" class="main row">
         {{if left_sidebar_enabled:}}
         <div class="span3 left-sidebar">
-          {{block left_sidebar}}
-          <h3>Left Sidebar</h3>
-          <p></p>
-          {{end}}
+            {{block left_sidebar}}
+            <h3>Left Sidebar</h3>
+            <p></p>
+            {{end}}
         </div>
         {{pass}}
 
         <div class="{{=middle_columns}}">
-          {{block center}}
-          {{include}}
-          {{end}}
+            {{block center}}
+            {{include}}
+            {{end}}
         </div>
 
         {{if right_sidebar_enabled:}}
         <div class="span3">
-          {{block right_sidebar}}
-          <h3>Right Sidebar</h3>
-          <p></p>
-          {{end}}
+            {{block right_sidebar}}
+            <h3>Right Sidebar</h3>
+            <p></p>
+            {{end}}
         </div>
         {{pass}}
-      </div><!--/row-->
     </section><!--/main-->
 
     <!-- Footer ================================================== -->
-    <footer class="footer" id="footer">
-      <div class="row">
-	<div class="footer-content span12">
-	  {{block footer}} <!-- this is default footer -->
-          <div class="copyright pull-left">{{=T('Copyright')}} &#169; {{=request.now.year}}</div>
-          <div id="poweredBy" class="pull-right">
-            {{=T('Powered by')}}
-            <a href="http://www.web2py.com/">web2py</a>
-          </div>
-	  {{end}}
-	</div>
-      </div>
-    </footer>
+    <div class="row">
+        <footer class="footer span12" id="footer">
+            <div class="footer-content">
+                {{block footer}} <!-- this is default footer -->
+                <div class="copyright pull-left">{{=T('Copyright')}} &#169; {{=request.now.year}}</div>
+                <div id="poweredBy" class="pull-right">
+                    {{=T('Powered by')}}
+                    <a href="http://www.web2py.com/">web2py</a>
+                </div>
+                {{end}}
+            </div>
+        </footer>
+    </div>
 
   </div> <!-- /container -->
 
@@ -170,7 +167,7 @@
       jQuery('ul.nav li.dropdown a').click(function(){window.location=jQuery(this).attr('href');});
       // make all buttons bootstrap buttons
       jQuery('button, form input[type="submit"], form input[type="button"]').addClass('btn').css({'margin-right':'2px','margin-bottom':'2px'});
-  });
+    });
   </script>
   <script src="{{=URL('static','js/bootstrap.min.js')}}"></script>
   <!--[if lt IE 7 ]>