diff --git a/VERSION b/VERSION
index c886326f..0aed930e 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-Version 2.00.1 (2012-08-27 14:54:08) rc4
+Version 2.00.1 (2012-08-27 15:08:16) rc4
diff --git a/applications/admin/languages/default.py b/applications/admin/languages/default.py
index e764c539..31a8dc24 100644
--- a/applications/admin/languages/default.py
+++ b/applications/admin/languages/default.py
@@ -4,39 +4,124 @@
 '!langname!': 'English (US)',
 '%Y-%m-%d': '%m-%d-%Y',
 '%Y-%m-%d %H:%M:%S': '%m-%d-%Y %H:%M:%S',
+'(requires internet access)': '(requires internet access)',
+'(something like "it-it")': '(something like "it-it")',
 'About': 'About',
+'Additional code for your application': 'Additional code for your application',
 'Admin language': 'Admin language',
 'administrative interface': 'administrative interface',
 'Administrator Password:': 'Administrator Password:',
+'and rename it:': 'and rename it:',
+'Application name:': 'Application name:',
+'are not used yet': 'are not used yet',
 'Are you sure you want to delete this object?': 'Are you sure you want to delete this object?',
 'arguments': 'arguments',
 'back': '<<back',
+'can be a git repo': 'can be a git repo',
+'Change admin password': 'Change admin password',
+'Check for upgrades': 'Check for upgrades',
+'Checking for upgrades...': 'Checking for upgrades...',
+'Clean': 'Clean',
 'code': 'code',
+'collapse/expand all': 'collapse/expand all',
+'Compile': 'Compile',
+'Controllers': 'Controllers',
+'controllers': 'controllers',
+'Create': 'Create',
+'create file with filename:': 'create file with filename:',
 'created by': 'created by',
+'crontab': 'crontab',
+'currently running': 'currently running',
+'database administration': 'database administration',
 'Debug': 'Debug',
+'defines tables': 'defines tables',
+'Delete this file (you will be asked to confirm deletion)': 'Delete this file (you will be asked to confirm deletion)',
+'Deploy': 'Deploy',
+'Deploy on Google App Engine': 'Deploy on Google App Engine',
+'Deploy to OpenShift': 'Deploy to OpenShift',
 'Detailed traceback description': 'Detailed traceback description',
 'direction: ltr': 'direction: ltr',
+'Disable': 'Disable',
+'download layouts': 'download layouts',
+'download plugins': 'download plugins',
 'Edit': 'Edit',
+'Edit application': 'Edit application',
 'Error snapshot': 'Error snapshot',
 'Error ticket': 'Error ticket',
 'Errors': 'Errors',
 'Exception instance attributes': 'Exception instance attributes',
+'exposes': 'exposes',
+'extends': 'extends',
+'filter': 'filter',
 'Frames': 'Frames',
+'Get from URL:': 'Get from URL:',
+'Git Pull': 'Git Pull',
+'Git Push': 'Git Push',
 'Help': 'Help',
+'includes': 'includes',
 'inspect attributes': 'inspect attributes',
+'Install': 'Install',
+'Installed applications': 'Installed applications',
+'languages': 'languages',
+'Languages': 'Languages',
+'loading...': 'loading...',
 'locals': 'locals',
 'Login': 'Login',
 'Login to the Administrative Interface': 'Login to the Administrative Interface',
 'Logout': 'Logout',
+'Models': 'Models',
+'models': 'models',
+'modules': 'modules',
+'Modules': 'Modules',
+'New application wizard': 'New application wizard',
+'New simple application': 'New simple application',
+'Overwrite installed app': 'Overwrite installed app',
+'Pack all': 'Pack all',
+'Plugins': 'Plugins',
+'plugins': 'plugins',
+'Plural-Forms:': 'Plural-Forms:',
 'Powered by': 'Powered by',
+'Private files': 'Private files',
+'private files': 'private files',
+'Reload routes': 'Reload routes',
 'request': 'request',
 'response': 'response',
+'rules:': 'rules:',
+"Run tests in this file (to run all files, you may also use the button labelled 'test')": "Run tests in this file (to run all files, you may also use the button labelled 'test')",
+'Running on %s': 'Running on %s',
 'session': 'session',
+'shell': 'shell',
 'Site': 'Site',
+'Start wizard': 'Start wizard',
+'static': 'static',
+'Static files': 'Static files',
+'Submit': 'Submit',
+'test': 'test',
+'The application logic, each URL path is mapped in one exposed function in the controller': 'The application logic, each URL path is mapped in one exposed function in the controller',
+'The data representation, define database tables and sets': 'The data representation, define database tables and sets',
+'The presentations layer, views are also known as templates': 'The presentations layer, views are also known as templates',
+'There are no models': 'There are no models',
+'There are no plugins': 'There are no plugins',
+'These files are not served, they are only available from within your app': 'These files are not served, they are only available from within your app',
+'These files are served without processing, your images go here': 'These files are served without processing, your images go here',
 'Ticket ID': 'Ticket ID',
+'To create a plugin, name a file/folder plugin_[name]': 'To create a plugin, name a file/folder plugin_[name]',
 'Traceback': 'Traceback',
+'Translation strings for the application': 'Translation strings for the application',
+'Uninstall': 'Uninstall',
+'update all languages': 'update all languages',
+'upload': 'upload',
+'Upload a package:': 'Upload a package:',
+'Upload and install packed application': 'Upload and install packed application',
+'upload file:': 'upload file:',
+'upload plugin file:': 'upload plugin file:',
 'variables': 'variables',
 'Version': 'Version',
+'Version %s.%s.%s (%s) %s': 'Version %s.%s.%s (%s) %s',
 'Versioning': 'Versioning',
+'views': 'views',
+'Views': 'Views',
 'Web Framework': 'Web Framework',
+'web2py is up to date': 'web2py is up to date',
+'web2py Recent Tweets': 'web2py Recent Tweets',
 }
diff --git a/applications/admin/views/appadmin.html b/applications/admin/views/appadmin.html
index 1d967c2f..bdbfd307 100644
--- a/applications/admin/views/appadmin.html
+++ b/applications/admin/views/appadmin.html
@@ -12,6 +12,7 @@
 {{if request.function=='index':}}
 <h2>{{=T("Available databases and tables")}}</h2>
   {{if not databases:}}{{=T("No databases in this application")}}{{pass}}
+<table>
   {{for db in sorted(databases):}}
     {{for table in databases[db].tables:}}
       {{qry='%s.%s.id>0'%(db,table)}}
@@ -28,19 +29,23 @@
              {{qry=''}}
              {{pass}}
       {{pass}}
-      <h3>
-    {{=A("%s.%s" % (db,table),_href=URL('select',args=[db],vars=dict(query=qry)))}}
-      </h3>
-      [ {{=A(str(T('insert new'))+' '+table,_href=URL('insert',args=[db,table]))}} ]
-    <br /><br />
+  <tr>
+    <th style="font-size: 1.75em;">
+      {{=A("%s.%s" % (db,table),_href=URL('select',args=[db],vars=dict(query=qry)))}}
+    </th>
+    <td>
+      {{=A(str(T('New Record')),_href=URL('insert',args=[db,table]),_class="btn")}}
+    </td>
+  </tr>
     {{pass}}
+</table>
   {{pass}}
 
 {{elif request.function=='select':}}
   <h2>{{=XML(str(T("database %s select"))%A(request.args[0],_href=URL('index'))) }}
   </h2>
-   {{if table:}}
-  [ {{=A(str(T('insert new %s'))%table,_href=URL('insert',args=[request.args[0],table]))}} ]<br/><br/>
+  {{if table:}}
+  {{=A(str(T('New Record')),_href=URL('insert',args=[request.args[0],table]),_class="btn")}}<br/><br/>
     <h3>{{=T("Rows in table")}}</h3><br/>
    {{else:}}
     <h3>{{=T("Rows selected")}}</h3><br/>
@@ -51,8 +56,8 @@
       {{=T('"update" is an optional expression like "field1=\'newvalue\'". You cannot update or delete the results of a JOIN')}}</p>
     <br/><br/>
     <h4>{{=T("%s selected", nrows)}}</h4>
-    {{if start>0:}}[ {{=A(T('previous 100 rows'),_href=URL('select',args=request.args[0],vars=dict(start=start-100)))}} ]{{pass}}
-    {{if stop<nrows:}}[ {{=A(T('next 100 rows'),_href=URL('select',args=request.args[0],vars=dict(start=start+100)))}} ]{{pass}}    
+    {{if start>0:}}{{=A(T('previous 100 rows'),_href=URL('select',args=request.args[0],vars=dict(start=start-100)),_class="btn")}}{{pass}}
+    {{if stop<nrows:}}{{=A(T('next 100 rows'),_href=URL('select',args=request.args[0],vars=dict(start=start+100)),_class="btn")}}{{pass}}    
     {{if rows:}}
        <div style="overflow: auto;" width="80%">
        {{linkto=URL('update',args=request.args[0])}}
@@ -61,7 +66,7 @@
        </div>
     {{pass}}
     <br/><br/><h3>{{=T("Import/Export")}}</h3><br/>
-    [ <a href="{{=URL('csv',args=request.args[0],vars=dict(query=query))}}">{{=T("export as csv file")}}</a> ]
+    <a href="{{=URL('csv',args=request.args[0],vars=dict(query=query))}}" class="btn">{{=T("export as csv file")}}</a>
   {{=formcsv or ''}}
 
 {{elif request.function=='insert':}}  
diff --git a/applications/examples/views/appadmin.html b/applications/examples/views/appadmin.html
index 1d967c2f..bdbfd307 100644
--- a/applications/examples/views/appadmin.html
+++ b/applications/examples/views/appadmin.html
@@ -12,6 +12,7 @@
 {{if request.function=='index':}}
 <h2>{{=T("Available databases and tables")}}</h2>
   {{if not databases:}}{{=T("No databases in this application")}}{{pass}}
+<table>
   {{for db in sorted(databases):}}
     {{for table in databases[db].tables:}}
       {{qry='%s.%s.id>0'%(db,table)}}
@@ -28,19 +29,23 @@
              {{qry=''}}
              {{pass}}
       {{pass}}
-      <h3>
-    {{=A("%s.%s" % (db,table),_href=URL('select',args=[db],vars=dict(query=qry)))}}
-      </h3>
-      [ {{=A(str(T('insert new'))+' '+table,_href=URL('insert',args=[db,table]))}} ]
-    <br /><br />
+  <tr>
+    <th style="font-size: 1.75em;">
+      {{=A("%s.%s" % (db,table),_href=URL('select',args=[db],vars=dict(query=qry)))}}
+    </th>
+    <td>
+      {{=A(str(T('New Record')),_href=URL('insert',args=[db,table]),_class="btn")}}
+    </td>
+  </tr>
     {{pass}}
+</table>
   {{pass}}
 
 {{elif request.function=='select':}}
   <h2>{{=XML(str(T("database %s select"))%A(request.args[0],_href=URL('index'))) }}
   </h2>
-   {{if table:}}
-  [ {{=A(str(T('insert new %s'))%table,_href=URL('insert',args=[request.args[0],table]))}} ]<br/><br/>
+  {{if table:}}
+  {{=A(str(T('New Record')),_href=URL('insert',args=[request.args[0],table]),_class="btn")}}<br/><br/>
     <h3>{{=T("Rows in table")}}</h3><br/>
    {{else:}}
     <h3>{{=T("Rows selected")}}</h3><br/>
@@ -51,8 +56,8 @@
       {{=T('"update" is an optional expression like "field1=\'newvalue\'". You cannot update or delete the results of a JOIN')}}</p>
     <br/><br/>
     <h4>{{=T("%s selected", nrows)}}</h4>
-    {{if start>0:}}[ {{=A(T('previous 100 rows'),_href=URL('select',args=request.args[0],vars=dict(start=start-100)))}} ]{{pass}}
-    {{if stop<nrows:}}[ {{=A(T('next 100 rows'),_href=URL('select',args=request.args[0],vars=dict(start=start+100)))}} ]{{pass}}    
+    {{if start>0:}}{{=A(T('previous 100 rows'),_href=URL('select',args=request.args[0],vars=dict(start=start-100)),_class="btn")}}{{pass}}
+    {{if stop<nrows:}}{{=A(T('next 100 rows'),_href=URL('select',args=request.args[0],vars=dict(start=start+100)),_class="btn")}}{{pass}}    
     {{if rows:}}
        <div style="overflow: auto;" width="80%">
        {{linkto=URL('update',args=request.args[0])}}
@@ -61,7 +66,7 @@
        </div>
     {{pass}}
     <br/><br/><h3>{{=T("Import/Export")}}</h3><br/>
-    [ <a href="{{=URL('csv',args=request.args[0],vars=dict(query=query))}}">{{=T("export as csv file")}}</a> ]
+    <a href="{{=URL('csv',args=request.args[0],vars=dict(query=query))}}" class="btn">{{=T("export as csv file")}}</a>
   {{=formcsv or ''}}
 
 {{elif request.function=='insert':}}  
diff --git a/applications/welcome/languages/it.py b/applications/welcome/languages/it.py
index 0d315706..753edd65 100644
--- a/applications/welcome/languages/it.py
+++ b/applications/welcome/languages/it.py
@@ -70,6 +70,7 @@
 'Hello World in a flash!': 'Salve Mondo in un flash!',
 'Home': 'Home',
 'How did you get here?': 'How did you get here?',
+'import': 'import',
 'Import/Export': 'Importa/Esporta',
 'Index': 'Indice',
 'insert new': 'inserisci nuovo',
@@ -119,8 +120,8 @@
 'Recipes': 'Recipes',
 'record': 'record',
 'record does not exist': 'il record non esiste',
-'record id': 'record id',
 'Record ID': 'Record ID',
+'record id': 'record id',
 'Register': 'Register',
 'register': 'registrazione',
 'Registration identifier': 'Registration identifier',
@@ -133,6 +134,8 @@
 'Services': 'Services',
 'state': 'stato',
 'Stylesheet': 'Foglio di stile (stylesheet)',
+'submit': 'submit',
+'Submit': 'Submit',
 'Support': 'Support',
 'Sure you want to delete this object?': 'Vuoi veramente cancellare questo oggetto?',
 'table': 'tabella',
diff --git a/applications/welcome/views/appadmin.html b/applications/welcome/views/appadmin.html
index 1d967c2f..bdbfd307 100644
--- a/applications/welcome/views/appadmin.html
+++ b/applications/welcome/views/appadmin.html
@@ -12,6 +12,7 @@
 {{if request.function=='index':}}
 <h2>{{=T("Available databases and tables")}}</h2>
   {{if not databases:}}{{=T("No databases in this application")}}{{pass}}
+<table>
   {{for db in sorted(databases):}}
     {{for table in databases[db].tables:}}
       {{qry='%s.%s.id>0'%(db,table)}}
@@ -28,19 +29,23 @@
              {{qry=''}}
              {{pass}}
       {{pass}}
-      <h3>
-    {{=A("%s.%s" % (db,table),_href=URL('select',args=[db],vars=dict(query=qry)))}}
-      </h3>
-      [ {{=A(str(T('insert new'))+' '+table,_href=URL('insert',args=[db,table]))}} ]
-    <br /><br />
+  <tr>
+    <th style="font-size: 1.75em;">
+      {{=A("%s.%s" % (db,table),_href=URL('select',args=[db],vars=dict(query=qry)))}}
+    </th>
+    <td>
+      {{=A(str(T('New Record')),_href=URL('insert',args=[db,table]),_class="btn")}}
+    </td>
+  </tr>
     {{pass}}
+</table>
   {{pass}}
 
 {{elif request.function=='select':}}
   <h2>{{=XML(str(T("database %s select"))%A(request.args[0],_href=URL('index'))) }}
   </h2>
-   {{if table:}}
-  [ {{=A(str(T('insert new %s'))%table,_href=URL('insert',args=[request.args[0],table]))}} ]<br/><br/>
+  {{if table:}}
+  {{=A(str(T('New Record')),_href=URL('insert',args=[request.args[0],table]),_class="btn")}}<br/><br/>
     <h3>{{=T("Rows in table")}}</h3><br/>
    {{else:}}
     <h3>{{=T("Rows selected")}}</h3><br/>
@@ -51,8 +56,8 @@
       {{=T('"update" is an optional expression like "field1=\'newvalue\'". You cannot update or delete the results of a JOIN')}}</p>
     <br/><br/>
     <h4>{{=T("%s selected", nrows)}}</h4>
-    {{if start>0:}}[ {{=A(T('previous 100 rows'),_href=URL('select',args=request.args[0],vars=dict(start=start-100)))}} ]{{pass}}
-    {{if stop<nrows:}}[ {{=A(T('next 100 rows'),_href=URL('select',args=request.args[0],vars=dict(start=start+100)))}} ]{{pass}}    
+    {{if start>0:}}{{=A(T('previous 100 rows'),_href=URL('select',args=request.args[0],vars=dict(start=start-100)),_class="btn")}}{{pass}}
+    {{if stop<nrows:}}{{=A(T('next 100 rows'),_href=URL('select',args=request.args[0],vars=dict(start=start+100)),_class="btn")}}{{pass}}    
     {{if rows:}}
        <div style="overflow: auto;" width="80%">
        {{linkto=URL('update',args=request.args[0])}}
@@ -61,7 +66,7 @@
        </div>
     {{pass}}
     <br/><br/><h3>{{=T("Import/Export")}}</h3><br/>
-    [ <a href="{{=URL('csv',args=request.args[0],vars=dict(query=query))}}">{{=T("export as csv file")}}</a> ]
+    <a href="{{=URL('csv',args=request.args[0],vars=dict(query=query))}}" class="btn">{{=T("export as csv file")}}</a>
   {{=formcsv or ''}}
 
 {{elif request.function=='insert':}}