diff --git a/VERSION b/VERSION
index c88cbc2c..5bcc32f5 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-Version 2.00.0 (2012-05-28 15:45:54) dev
+Version 2.00.0 (2012-05-28 15:54:06) dev
diff --git a/applications/welcome/static/css/bootswatch.css b/applications/welcome/static/css/bootswatch.css
index d6ded53d..961896c1 100644
--- a/applications/welcome/static/css/bootswatch.css
+++ b/applications/welcome/static/css/bootswatch.css
@@ -7,6 +7,8 @@ h1,h2,h3,h4,h5,h6 {font-family: inherit;}
 
 li {margin-bottom: 0;} /*bootswatch*/
 
+.auth_navbar, .navbar .btn-group{padding:0;}
+
 @media only screen and (max-width: 320px) {
   .navbar-inner{position:relative;}
   #navbar{float:none;position:absolute;bottom:-10px;left:4px;}
diff --git a/applications/welcome/static/css/web2py.css b/applications/welcome/static/css/web2py.css
index a0554378..82f6c203 100644
--- a/applications/welcome/static/css/web2py.css
+++ b/applications/welcome/static/css/web2py.css
@@ -146,8 +146,6 @@ div.error {
 }
 
 #navbar {float: right; padding: 5px; /* same as superfish */}
-#navbar {padding: 9px;}
-#navbar a {color: inherit;}
 
 .right {
        width:100%;
diff --git a/applications/welcome/views/layout.html b/applications/welcome/views/layout.html
index 0e549aee..7454e378 100644
--- a/applications/welcome/views/layout.html
+++ b/applications/welcome/views/layout.html
@@ -70,6 +70,11 @@
                 if(jQuery(this).find('ul').length)
                     var a=jQuery(this).children('a').contents().before('<i class="icon-chevron-right"></i>'); 
              });
+             jQuery('.auth_navbar').each(function(){	        
+                jQuery(this)
+					.addClass('btn-group')
+					.children('a').addClass('btn')
+             });
           });
 	</script>
 	<noscript><link href="{{=URL('static', 'css/bootswatch_nojs.css')}}" rel="stylesheet" type="text/css" /></noscript>
@@ -88,7 +93,7 @@
 					<span class="icon-bar"></span>
 				</a>
 				<a class="brand" href="#">web2py&trade;&nbsp;</a>
-				<div id="navbar">{{='auth' in globals() and auth.navbar(separators=(' ',' | ',''))}}</div>
+				<div id="navbar">{{='auth' in globals() and auth.navbar(separators=(' ',' ',''))}}</div>
 				<div class="nav-collapse">
 					{{is_mobile=request.user_agent().is_mobile}}
 					{{if response.menu:}}
@@ -118,7 +123,7 @@
 			</div>
 		</header>
 
-		<section id="main" class="main">
+		<section id="main" class="main span12">
 			<div class="row">
 				{{if left_sidebar_enabled:}}
 				<div class="span3 left-sidebar">