diff --git a/addons/account/configurable_account_chart.xml b/addons/account/configurable_account_chart.xml
index a6b271bedcb..73cb4499e20 100644
--- a/addons/account/configurable_account_chart.xml
+++ b/addons/account/configurable_account_chart.xml
@@ -154,7 +154,7 @@
         	<field name="code">1104</field>
             <field name="name">Bank Current Account</field>
             <field ref="conf_cas" name="parent_id"/>
-            <field name="type">other</field>
+            <field name="type">view</field>
             <field name="user_type" ref="conf_account_type_cash"/>
         </record>
 
diff --git a/addons/account/installer.py b/addons/account/installer.py
index 81993908be9..1cbed3cd2a7 100644
--- a/addons/account/installer.py
+++ b/addons/account/installer.py
@@ -32,6 +32,11 @@ class account_installer(osv.osv_memory):
     _name = 'account.installer'
     _inherit = 'res.config.installer'
 
+    def _get_default_accounts(self, cr, uid, context=None):
+        accounts = [{'acc_name':'Current','account_type':'cash'},
+                    {'acc_name':'Deposit','account_type':'cash'}]
+        return accounts
+
     def _get_charts(self, cr, uid, context=None):
         modules = self.pool.get('ir.module.module')
         ids = modules.search(cr, uid, [('category_id','=','Account Charts')])
@@ -77,6 +82,7 @@ class account_installer(osv.osv_memory):
         'sale_tax':lambda *a:0.0,
         'purchase_tax':lambda *a:0.0,
         'charts':'configurable',
+        'bank_accounts_id':_get_default_accounts
         }
 
     def on_change_start_date(self, cr, uid, id, start_date):
diff --git a/addons/base_setup/base_setup_data.xml b/addons/base_setup/base_setup_data.xml
index 90d48de5eba..024accc77ce 100644
--- a/addons/base_setup/base_setup_data.xml
+++ b/addons/base_setup/base_setup_data.xml
@@ -7,23 +7,25 @@
       <field name="type">form</field>
       <field name="arch" type="xml">
       <form string="Setup">
-      <group colspan="4" col="8" width="600">
-      <group>
-  		<field name="config_logo" widget="image" width="150" height="100" nolabel="1" colspan="1"/>
-  	</group>
-      	<group colspan="6">
-      		<separator string="Installation Done" colspan="8"/>
-      		<label align="0.0" string="Your new database is now fully installed." colspan="8"/>
-       		<field name="installed_users" nolabel= "1" colspan="8"/>
-       		<label align="0.0" colspan="8"	string="You can start configuring the system or connect directly to the database as an administrator."/>
-        </group>
-      </group>
-      <group colspan="8" col="8">
-    		<separator string="" colspan="8"/>
-    		<label string="" colspan="6"/>
-			<button name="menu" icon="gtk-ok" type="object" string="Use Directly" colspan="1"/>
-			<button name="config" icon="gtk-go-forward" type="object" string="Start Configuration" colspan="1"/>
-      </group>
+	      <group colspan="4" col="8">
+              	<group colspan="3" width="200">
+                	<field name="config_logo" widget="image" width="150" height="100" nolabel="1" colspan="1"/>
+                	<newline/>
+                	<label align="0.0" string="You can start configuring the system or connect directly to the database as an administrator." width="200" colspan="2"/>
+              	</group>
+              	<separator string="" position="vertical" colspan="1" rowspan="8"/>
+            	<group colspan="4" width="400">
+              		<separator string="Installation Done" colspan="4"/>
+              		<label align="0.0" string="Your new database is now fully installed." colspan="4"/>
+       				<field name="installed_users" nolabel= "1" colspan="4"/>
+            	</group>
+			</group>
+            	<group colspan="8" col="8">
+            		<separator string="" colspan="8"/>
+    				<label string="" colspan="6"/>
+					<button name="menu" icon="gtk-ok" type="object" string="Use Directly" colspan="1"/>
+					<button name="config" icon="gtk-go-forward" type="object" string="Start Configuration" colspan="1"/>
+           </group>
     </form>
    </field>
   </record>
diff --git a/addons/base_setup/base_setup_installer.xml b/addons/base_setup/base_setup_installer.xml
index 2b4a870236a..7a543f5466f 100644
--- a/addons/base_setup/base_setup_installer.xml
+++ b/addons/base_setup/base_setup_installer.xml
@@ -8,7 +8,7 @@
       <field name="arch" type="xml">
         <data>
           <form position="attributes">
-            <attribute name="string">Base Setup Modules Installation</attribute>
+            <attribute name="string">Install OpenERP Modules</attribute>
           </form>
           <xpath expr="//label[@string='description']"
                  position="attributes">
diff --git a/addons/base_setup/base_setup_todo.xml b/addons/base_setup/base_setup_todo.xml
index eb108aef229..b348b0c8a60 100644
--- a/addons/base_setup/base_setup_todo.xml
+++ b/addons/base_setup/base_setup_todo.xml
@@ -11,7 +11,7 @@
             <attribute name="string">Main Company Setup</attribute>
           </form>
 		  <xpath expr="//label[@string='description']" position="attributes">
-	            <attribute name="string">Information of your company will be used to custiomize your documents like Invoices, Sale Orders,...</attribute>
+	            <attribute name="string">Information of your company will be used to custiomise your documents like Invoices, Sale Orders,...</attribute>
 	      </xpath>
 	      <xpath expr='//separator[@string="title"]' position='attributes'>
 	          	  <attribute name='string'>Configure Your Company</attribute>
diff --git a/addons/base_setup/gtk_contact_form.py b/addons/base_setup/gtk_contact_form.py
index b1d01cecb66..354080df451 100644
--- a/addons/base_setup/gtk_contact_form.py
+++ b/addons/base_setup/gtk_contact_form.py
@@ -46,10 +46,10 @@ class base_gtkcontactform(osv.osv_memory):
          return defaults
 
     _columns = {
-             'name':fields.char('Your Name', size=64, required=True),
+             'name':fields.char('Your Name', size=64),
              'job':fields.char('Job Title', size=64,),
-             'email':fields.char('E-mail', size=64, required=True),
-             'phone':fields.char('Phone', size=64, required=True),
+             'email':fields.char('E-mail', size=64),
+             'phone':fields.char('Phone', size=64),
              'total_employees':fields.selection([('1-5','1-5'),('5-20','5-20'),('20-100','20-100'),('100-500','100-500'),('500','500+')], 'No Of Employees', size=32),
              'industry':fields.selection([('apparel','Apparel'),('banking','Banking'),('biotechnology','Biotechnology'),('chemicals','Chemicals'),('communications','Communications'),
                                           ('construction','Construction'),('consulting','Consulting'),('education','Education'),('electronics','Electronics'),('energy','Energy'),('engineering','Engineering'),
diff --git a/addons/base_setup/gtk_contact_form.xml b/addons/base_setup/gtk_contact_form.xml
index c4fe08207dd..f833f7051d6 100644
--- a/addons/base_setup/gtk_contact_form.xml
+++ b/addons/base_setup/gtk_contact_form.xml
@@ -31,10 +31,10 @@
 		       </group>
           		<group colspan="4" attrs="{'invisible':[('ebook','=',False),('updates','=',False)]}">
           		 	<separator colspan="4" string="About You"/>
-	            	<field name="name" colspan="2" required="True"/>
+	            	<field name="name" colspan="2" attrs="{'required':[('ebook','=',True),('updates','=',True)]}"/>
 	            	<field name="job" colspan="2"/>
-		            <field name="email" colspan="2"/>
-		            <field name="phone" colspan="2"/>
+		            <field name="email" colspan="2" attrs="{'required':[('ebook','=',True),('updates','=',True)]}"/>
+		            <field name="phone" colspan="2" attrs="{'required':[('ebook','=',True),('updates','=',True)]}"/>
 		            <field name="total_employees" colspan="2"/>
 		            <field name="industry" colspan="2"/>
 		        </group>
diff --git a/addons/base_setup/installer.py b/addons/base_setup/installer.py
index 13b37c67e1f..a92d5ab4b97 100644
--- a/addons/base_setup/installer.py
+++ b/addons/base_setup/installer.py
@@ -93,9 +93,9 @@ class base_setup_installer(osv.osv_memory):
 
 
     def onchange_moduleselection(self, cr, uid, ids, *args):
-        progress = self._progress(cr, uid) - (2.5 * len(filter(lambda x: x==1, args)))
-        if progress <= 5.0:
-            progress = 5.0
+        progress = self._progress(cr, uid) - round((len(filter(lambda x: x==1, args)))*80/len(args))
+        if progress <= 10.0:
+            progress = 10.0
         return {'value':{'progress':progress}}
 
     def modules_to_install(self, cr, uid, ids, context=None):
diff --git a/addons/hr/hr_installer.xml b/addons/hr/hr_installer.xml
index b01f538b193..3ce73f07b12 100644
--- a/addons/hr/hr_installer.xml
+++ b/addons/hr/hr_installer.xml
@@ -19,7 +19,7 @@
 	      		</xpath>
           <xpath expr="//label[@string='description']"
                  position="attributes">
-            <attribute name="string">The base Human Resources addon will help you manage your employee roster, but your can enhance it even further by installing a few HR-related applications.</attribute>
+            <attribute name="string">The base Human Resources addon will help you manage your employee roster, but you can enhance it even further by installing a few HR-related applications.</attribute>
           </xpath>
           <group colspan="8">
             <field name="hr_holidays"/>