diff --git a/bin/addons/base/base_update.xml b/bin/addons/base/base_update.xml
index 10e4607ef41..622d570d3d3 100644
--- a/bin/addons/base/base_update.xml
+++ b/bin/addons/base/base_update.xml
@@ -79,7 +79,7 @@
                     <notebook colspan="4">
                         <page string="Current Activity">
                             <field name="company_id" widget="selection" readonly="0"
-                                    context="{'user_id': self, 'user_preference': 1}"/>
+                                    context="{'user_id': self, 'user_preference': 1}" groups="base.group_multi_company"/>
                             <field name="view" readonly="0"/>
                             <label string="" colspan="2"/>
                             <field name="menu_tips" colspan="2"/>
@@ -116,14 +116,14 @@
                         <page string="User">
                             <field name="address_id" select="1"/>
                             <field name="user_email" widget="email"/>
-                            <field name="company_id" required="1" context="{'user_id': self, 'user_preference': 1}"/>
+                            <field name="company_id" required="1" context="{'user_id': self, 'user_preference': 1}" groups="base.group_multi_company"/>
                             <field name="action_id" required="True"/>
                             <field domain="[('usage','=','menu')]" name="menu_id" required="True"/>
                             <field name="context_lang"/>
                             <field name="context_tz"/>
                             <field name="view" readonly="0"/>
                             <field name="menu_tips" colspan="2"/>
-                            <label string="" colspan="2"/>
+                            <newline/>
                             <group colspan="2" col="2">
                                 <separator string="Signature" colspan="2"/>
                                 <field colspan="2" name="signature" nolabel="1"/>
@@ -152,7 +152,7 @@
                     <field name="name"/>
                     <field name="login"/>
                     <field name="address_id" string="Address" />
-                    <field name="company_id"/>
+                    <field name="company_id" groups="base.group_multi_company"/>
                 </tree>
             </field>
         </record>
@@ -163,10 +163,10 @@
             <field name="type">search</field>
             <field name="arch" type="xml">
                 <search string="Users">
-                    <field name="name" select="1"/>
-                    <field name="login" select="1"/>
-                    <field name="address_id" select="1" string="Address"/>
-                    <field name="company_ids" select="1" string="Company"/>
+                    <field name="name"/>
+                    <field name="login"/>
+                    <field name="address_id" string="Address"/>
+                    <field name="company_ids" string="Company"/>
                 </search>
             </field>
         </record>
diff --git a/bin/addons/base/ir/ir.xml b/bin/addons/base/ir/ir.xml
index 5c79df63beb..efc6fa88063 100644
--- a/bin/addons/base/ir/ir.xml
+++ b/bin/addons/base/ir/ir.xml
@@ -790,7 +790,7 @@
             <field name="type">form</field>
             <field name="arch" type="xml">
                 <form string="Role">
-                    <field name="name" select="1"/>
+                    <field name="name"/>
                     <field name="parent_id"/>
                     <separator string="Description" colspan="4"/>
                     <field name="description" nolabel="1" colspan="4"/>
@@ -820,6 +820,18 @@
                 </tree>
             </field>
         </record>
+        <record id="view_roles_search" model="ir.ui.view">
+            <field name="name">res.roles.search</field>
+            <field name="model">res.roles</field>
+            <field name="type">search</field>
+            <field name="arch" type="xml">
+                <search string="Role">
+                    <field name="name"/>
+                    <field name="parent_id"/>
+                </search>
+            </field>
+        </record>
+                    
         <record id="action_res_roles" model="ir.actions.act_window">
             <field name="name">Roles Structure</field>
             <field name="type">ir.actions.act_window</field>
@@ -836,6 +848,7 @@
             <field name="type">ir.actions.act_window</field>
             <field name="res_model">res.roles</field>
             <field name="view_type">form</field>
+            <field name="search_view_id" ref="view_roles_search"/>
         </record>
         <menuitem action="action_res_roles_form" id="menu_action_res_roles_form" parent="menu_action_res_roles"/>
 
@@ -1392,12 +1405,20 @@
             <field name="type">form</field>
             <field name="arch" type="xml">
                 <form string="Translations">
+                    <field name="lang"/>
+                    <field name="type"/>
                     <field name="name"/>
                     <field name="res_id"/>
-                    <field name="type"/>
-                    <field name="lang"/>
-                    <field name="src"/>
-                    <field name="value"/>
+                    <group colspan="4" col="4">
+                        <group colspan="2" col="2">
+		                    <separator string="Source Term" colspan="2"/>
+		                    <field name="src" nolabel="1" height="400"/>
+	                    </group>
+	                    <group colspan="2" col="2">
+		                    <separator string="Tranlsation Term" colspan="2"/>
+		                    <field name="value" nolabel="1" height="400"/>
+		                </group>
+	                </group>
                 </form>
             </field>
         </record>
@@ -1473,28 +1494,43 @@
             <field name="arch" type="xml">
                 <form string="Menu">
                     <group col="8">
-                        <field name="name" select="1" string="Menu" />
-                        <field  name="parent_id" select="1" colspan="4"/>
+                        <field name="name" string="Menu" />
+                        <field  name="parent_id" colspan="4"/>
                         <field name="sequence" colspan="2"/>
                         <field name="complete_name" string="Full Path" colspan="8"/>
                         <field name="action" colspan="4" />
                         <field name="icon" on_change="onchange_icon(icon)" colspan="2"/>
                         <field name="icon_pict" widget="picture" nolabel="1" colspan="2"/>
                     </group>
-                    <group col="4" colspan="4" expand="1">
-                        <separator string="Security on Groups" colspan="4"/>
-                        <field name="groups_id"  colspan="4" nolabel="1"/>
-                    </group>
+                    <notebook colspan="4">
+                        <page string="Security on Groups">
+		                    <field name="groups_id" colspan="4" nolabel="1"/>
+		                </page>
+		            </notebook>
                 </form>
             </field>
         </record>
+        
+        <record id="edit_menu_access_search" model="ir.ui.view">
+            <field name="name">ir.ui.menu.search</field>
+            <field name="model">ir.ui.menu</field>
+            <field name="type">search</field>
+            <field name="arch" type="xml">
+                <search string="Menu">
+	                <field name="name" string="Menu" />
+	                <field name="parent_id"/>
+	            </search>
+	        </field>
+	    </record>
+                        
         <record id="grant_menu_access" model="ir.actions.act_window">
             <field name="name">Manage Menus</field>
             <field name="res_model">ir.ui.menu</field>
             <field name="view_type">form</field>
             <field name="view_id" ref="edit_menu"/>
+            <field name="search_view_id" ref="edit_menu_access_search"/>
         </record>
-        <menuitem action="grant_menu_access" id="menu_grant_menu_access" parent="base.menu_security"/>
+        <menuitem action="grant_menu_access" id="menu_grant_menu_access" parent="base.menu_security" sequence="1"/>
 
         <!--
     =============================================================
@@ -1617,9 +1653,9 @@
             <field name="type">form</field>
             <field name="arch" type="xml">
                 <form string="Access Controls">
-                    <field colspan="4" name="name" select="1"/>
-                    <field name="model_id" select="1"/>
-                    <field name="group_id" select="1"/>
+                    <field colspan="4" name="name"/>
+                    <field name="model_id"/>
+                    <field name="group_id"/>
                     <newline/>
                     <field name="perm_read"/>
                     <field name="perm_write"/>
@@ -1628,13 +1664,27 @@
                 </form>
             </field>
         </record>
+        <record id="ir_access_view_search" model="ir.ui.view">
+            <field name="name">ir.model.access.search</field>
+            <field name="model">ir.model.access</field>
+            <field name="type">search</field>
+            <field name="arch" type="xml">
+                <search string="Access Controls">
+                    <field name="name"/>
+                    <field name="model_id"/>
+                    <field name="group_id"/>
+                </search>
+            </field>
+        </record>
+                    
         <record id="ir_access_act" model="ir.actions.act_window">
             <field name="name">Access Controls List</field>
             <field name="res_model">ir.model.access</field>
             <field name="view_type">form</field>
             <field name="view_id" ref="ir_access_view_tree"/>
+            <field name="search_view_id" ref="ir_access_view_search"/>
         </record>
-        <menuitem name="Access Controls" id="menu_security_access" parent="menu_security"/>
+        <menuitem name="Access Controls" id="menu_security_access" parent="menu_security" sequence="5"/>
         <menuitem action="ir_access_act" id="menu_ir_access_act" parent="menu_security_access"/>
 
         <!-- Rules -->
@@ -1648,7 +1698,7 @@
                     <group col="2" colspan="2">
                         <separator colspan="2" string="General"/>
                         <field colspan="4" name="name"/>
-                        <field name="model_id" select="1"/>
+                        <field name="model_id"/>
                     </group>
                     <group col="4" colspan="2">
                         <separator colspan="4" string="Access Rights"/>
@@ -1663,8 +1713,8 @@
                     </group>
                     <separator colspan="4" string="Groups (no group = global)"/>
                     <group colspan="4" expand="1">
-                        <field name="global" select="1"/>
-                        <field name="groups" select="1" nolabel="1" colspan="4"/>
+                        <field name="global"/>
+                        <field name="groups" nolabel="1" colspan="4"/>
                     </group>
                     <separator colspan="4" string="Combination of rules"/>
                     <label align="0.0" colspan="4"
@@ -1695,14 +1745,27 @@
                 </tree>
             </field>
         </record>
+        <record id="view_rule_search" model="ir.ui.view">
+            <field name="name">Record rules</field>
+            <field name="model">ir.rule</field>
+            <field name="type">search</field>
+            <field name="arch" type="xml">
+                <search string="Record rules">
+                    <field name="model_id"/>
+                    <field name="global"/>
+                    <field name="groups"/>
+                </search>
+            </field>
+        </record>
 
         <record id="action_rule" model="ir.actions.act_window">
             <field name="name">Record Rules</field>
             <field name="res_model">ir.rule</field>
             <field name="view_type">form</field>
             <field name="view_id" ref="view_rule_tree"/>
+            <field name="search_view_id" ref="view_rule_search"/>
         </record>
-        <menuitem action="action_rule" id="menu_action_rule" parent="base.menu_security"/>
+        <menuitem action="action_rule" id="menu_action_rule" parent="base.menu_security" sequence="3"/>
 
         <record id="property_rule" model="ir.rule">
             <field name="name">Property multi-company</field>
diff --git a/bin/addons/base/ir/ir_model.py b/bin/addons/base/ir/ir_model.py
index 39e5f7567c0..87cd37eec48 100644
--- a/bin/addons/base/ir/ir_model.py
+++ b/bin/addons/base/ir/ir_model.py
@@ -232,24 +232,7 @@ class ir_model_grid(osv.osv):
     <field name="group_0"/>
     ''' % (view_type,)
         for group in groups_br:
-            xml += '''<field name="grouDHCPDISCOVER on eth0 to 255.255.255.255 port 67 interval 3
-DHCPDISCOVER on eth0 to 255.255.255.255 port 67 interval 6
-DHCPDISCOVER on eth0 to 255.255.255.255 port 67 interval 9
-DHCPDISCOVER on eth0 to 255.255.255.255 port 67 interval 4
-No DHCPOFFERS received.
-No working leases in persistent database - sleeping.
- * Stopping the Firestarter firewall...
-   ...done.
- * Starting the Firestarter firewall...
-   ...done.
-                                                                                                                      [ OK ]
-rpa@rpa:~$  * Stopping NTP server ntpd
-   ...done.
- * Starting NTP server ntpd
-   ...done.
-
-
-p_%d"/>''' % (group.id, )
+            xml += '''<field name="group_%d"/>''' % (group.id, )
         xml += '''</%s>''' % (view_type,)
         result['arch'] = xml
         result['fields'] = self.fields_get(cr, uid, cols, context)
diff --git a/bin/addons/base/ir/workflow/workflow_view.xml b/bin/addons/base/ir/workflow/workflow_view.xml
index 4f70d77f119..a0f016e94c9 100644
--- a/bin/addons/base/ir/workflow/workflow_view.xml
+++ b/bin/addons/base/ir/workflow/workflow_view.xml
@@ -99,45 +99,49 @@
 	                    <field name="flow_start"/>
 	                    <field name="flow_stop"/>
 	                </group>
-                    <separator string="Properties" colspan="4"/>
-                    <group colspan="4" col="6">
-	                    <group colspan="1" col="2">
-							<separator string="Subflow" colspan="2"/>
-							<field name="subflow_id" attrs="{'readonly':[('kind','&lt;&gt;','subflow')]}"/>
-                            <field name="signal_send"/>
-	                    </group>
-	                    <group colspan="1" col="2">
-							<separator string="Conditions" colspan="2"/>
-							<field name="split_mode"/>
-                            <field name="join_mode"/>
-	                    </group>
-	                    <group colspan="4" col="2">
-							<separator string="Actions" colspan="2"/>
-							<field name="action_id"/>
-                            <field name="action" attrs="{'readonly':[('kind','=','dummy')]}"/>
-	                    </group>
-                    </group>
-                    <separator string="Transitions" colspan="4"/>
-                    <group colspan="4" col="4">
-                        <group col="2" colspan="2">
-                            <field name="in_transitions" nolabel="1">
-                                <tree string="Incoming Transitions">
-                                    <field name="act_from"/>
-                                    <field name="signal"/>
-                                    <field name="condition"/>
-                                </tree>
-                            </field>
-                        </group>
-                        <group col="2" colspan="2">
-	                        <field name="out_transitions" nolabel="1">
-	                            <tree string="Outgoing Transitions">
-	                                <field name="act_to"/>
-									<field name="signal"/>
-									<field name="condition"/>
-	                            </tree>
-	                        </field>
-	                    </group>
-                    </group>
+	                <notebook colspan="4">
+	                    <page string="Properties">
+		                    <group colspan="4" col="6">
+			                    <group colspan="1" col="2">
+									<separator string="Subflow" colspan="2"/>
+									<field name="subflow_id" attrs="{'readonly':[('kind','&lt;&gt;','subflow')]}"/>
+		                            <field name="signal_send"/>
+			                    </group>
+			                    <group colspan="1" col="2">
+									<separator string="Conditions" colspan="2"/>
+									<field name="split_mode"/>
+		                            <field name="join_mode"/>
+			                    </group>
+			                    <group colspan="1" col="2">
+									<separator string="Actions" colspan="2"/>
+									<field name="action_id"/>
+		                            <field name="action" attrs="{'readonly':[('kind','=','dummy')]}"/>
+			                    </group>
+		                    </group>
+		                </page>
+	                    <page string="Transitions">
+		                    <group colspan="4" col="4">
+		                        <group col="2" colspan="2">
+		                            <field name="in_transitions" nolabel="1" height="400">
+		                                <tree string="Incoming Transitions">
+		                                    <field name="act_from"/>
+		                                    <field name="signal"/>
+		                                    <field name="condition"/>
+		                                </tree>
+		                            </field>
+		                        </group>
+		                        <group col="2" colspan="2">
+			                        <field name="out_transitions" nolabel="1" height="400">
+			                            <tree string="Outgoing Transitions">
+			                                <field name="act_to"/>
+											<field name="signal"/>
+											<field name="condition"/>
+			                            </tree>
+			                        </field>
+			                    </group>
+		                    </group>
+		                </page>
+		            </notebook>
                 </form>
             </field>
         </record>
diff --git a/bin/addons/base/maintenance/maintenance_view.xml b/bin/addons/base/maintenance/maintenance_view.xml
index ca5cd459da4..e61348abca5 100644
--- a/bin/addons/base/maintenance/maintenance_view.xml
+++ b/bin/addons/base/maintenance/maintenance_view.xml
@@ -23,10 +23,10 @@
             <field name="arch" type="xml">
                 <form string="Maintenance Contract">
                     <separator string="Information" colspan="4"/>
-                    <field name="name" select="1" />
-                    <field name="state" />
-                    <field name="date_start" select="1"/>
-                    <field name="date_stop" select="1"/>
+                    <field name="name"/>
+                    <newline/>
+                    <field name="date_start"/>
+                    <field name="date_stop"/>
                     <separator string="Covered Modules" colspan="4"/>
                     <field name="module_ids" nolabel="1" colspan="4">
                         <tree string="Covered Modules">
@@ -34,16 +34,43 @@
                             <field name="version" />
                         </tree>
                     </field>
+                    <field name="state" colspan="4"/>
                 </form>
             </field>
         </record>
+        
+        <record id="maintenance_contract_search_view" model="ir.ui.view">
+            <field name="name">maintenance.contract.search</field>
+            <field name="model">maintenance.contract</field>
+            <field name="type">search</field>
+            <field name="arch" type="xml">
+                <search string="Maintenance Contract">
+                    <field name="name"/>
+                    <field name="date_start"/>
+                    <field name="date_stop"/>
+                </search>
+            </field>
+        </record>
+        
+        <record id="maintenance_contract_view_calendar" model="ir.ui.view">
+            <field name="name">maintenance.contract.calendar</field>
+            <field name="model">maintenance.contract</field>
+            <field name="type">calendar</field>
+            <field name="arch" type="xml">
+                <calendar string="Maintenance Contract" date_start="date_start" color="state">
+                    <field name="name"/>
+                    <field name="state"/>
+                </calendar>
+            </field>
+        </record>
 
         <record id="action_maintenance_contract_form" model="ir.actions.act_window">
-            <field name="name">Your Maintenance Contracts</field>
+            <field name="name">Maintenance Contracts</field>
             <field name="type">ir.actions.act_window</field>
             <field name="res_model">maintenance.contract</field>
             <field name="view_type">form</field>
-            <field name="view_mode">tree,form</field>
+            <field name="view_mode">tree,form,calendar</field>
+            <field name="search_view_id" ref="maintenance_contract_search_view"/>
         </record>
 
         <menuitem
@@ -79,7 +106,7 @@
                         </group>
                     </group>
                     <group colspan="4">
-                        <button type="object" string="_Cancel" icon="gtk-cancel" special="cancel" states="draft"/> 
+                        <button type="object" string="_Close" icon="gtk-cancel" special="cancel" states="draft"/> 
                         <button type="object" string="_Validate" icon="gtk-apply" name="action_validate" states="draft"/>
                         <button type="object" string="_Close" icon="gtk-close" special="cancel" states="validated,unvalidated"/>
                     </group>
diff --git a/bin/addons/base/module/module_view.xml b/bin/addons/base/module/module_view.xml
index 86ace2bcaf6..6f2155b7c7f 100644
--- a/bin/addons/base/module/module_view.xml
+++ b/bin/addons/base/module/module_view.xml
@@ -90,19 +90,26 @@
                     <field name="name" select="1"/>
                     <field name="certificate" />
                     <field colspan="4" name="shortdesc" select="2"/>
+                    <field name="category_id"/>
+                    <field name="demo" readonly="1"/>
                     <notebook colspan="4">
                         <page string="Module">
-                            <field colspan="4" name="description" select="2"/>
-                            <field name="installed_version"/>
-                            <field name="latest_version"/>
-                            <field name="author" select="2"/>
-                            <field name="website" select="2" widget="url"/>
-                            <field name="maintainer" attrs="{'invisible': [('maintainer', '=', False)]}"/>
-                            <field name="url" widget="url"/>
-                            <field name="contributors" widget="char" attrs="{'invisible': [('contributors', '=', False)]}"/>
-                            <field name="published_version"/>
-                            <field name="license"/>
-                            <field name="demo" readonly="1"/>
+                            <group colspan="4" col="4">
+                                <group colspan="2" col="2">
+                                    <separator string="Author" colspan="2"/>
+                                    <field name="author" select="2"/>
+                                    <field name="license"/>
+                                    <field name="website" select="2" widget="url" string="Author Website"/>
+                                </group>
+                                <group colspan="2" col="2">
+                                    <separator string="Version" colspan="2"/>
+                                    <field name="installed_version"/>
+                                    <field name="latest_version"/>
+                                    <field name="published_version"/>
+                                </group>
+                            </group>
+                            <separator string="Description" colspan="4"/>
+                            <field colspan="4" name="description" select="2" nolabel="1"/>
                             <newline/>
                             <field name="state" readonly="1" select="1"/>
                             <group col="6" colspan="2">
diff --git a/bin/addons/base/module/module_wizard.xml b/bin/addons/base/module/module_wizard.xml
index b989fc56041..af1e577412f 100644
--- a/bin/addons/base/module/module_wizard.xml
+++ b/bin/addons/base/module/module_wizard.xml
@@ -33,11 +33,11 @@
                 <form col="3" string="Export language">
                     <notebook>
                         <page string="Export Data">
-                            <group col="2" fill="0" states="choose">
+                            <group col="2" colspan="4" fill="0" states="choose">
                                 <separator colspan="2" string="Export translation file"/>
-                                <field name="lang" width="300"/>
+                                <field name="lang" required="1"/>
                                 <field name="format" required="1"/>
-                                <field height="200" name="modules" width="500"/>
+                                <field height="200" name="modules" nolabel="1" colspan="4"/>
                                 <field invisible="1" name="state"/>
                             </group>
                             <group col="1" fill="0" states="get">
@@ -56,7 +56,7 @@
                     </notebook>
 
                     <group col="2" colspan="3" fill="0">
-                        <button icon="gtk-cancel" name="act_cancel" special="cancel" states="choose" string="Cancel" type="object"/>
+                        <button icon="gtk-cancel" name="act_cancel" special="cancel" states="choose" string="Close" type="object"/>
                         <button icon="gtk-ok" name="act_getfile" states="choose" string="Get file" type="object"/>
                         <button icon="gtk-close" name="act_destroy" special="cancel" states="get" string="Close" type="object"/>
                     </group>
@@ -86,14 +86,11 @@
             <field name="type">form</field>
             <field name="arch" type="xml">
                 <form col="3" string="Update Translations">
-                    <image name="gtk-dialog-info"/>
-                    <group col="2" fill="0" height="500">
-                        <field name="lang" width="300"/>
-                    </group>
+                    <field name="lang"/>
                     <label align="0.0" colspan="4" string="This wizard will detect new terms in the application so that you can update them manually."/>
                     <separator colspan="4"/>
                     <group col="2" colspan="4" fill="0">
-                        <button icon="gtk-cancel" name="act_cancel" special="cancel" string="Cancel" type="object"/>
+                        <button icon="gtk-cancel" name="act_cancel" special="cancel" string="Close" type="object"/>
                         <button icon="gtk-ok" name="act_update" string="Update" type="object"/>
                     </group>
                 </form>
diff --git a/bin/addons/base/module/wizard/wizard_import_lang.py b/bin/addons/base/module/wizard/wizard_import_lang.py
index 471c02e8f9f..80f8048653f 100644
--- a/bin/addons/base/module/wizard/wizard_import_lang.py
+++ b/bin/addons/base/module/wizard/wizard_import_lang.py
@@ -27,18 +27,23 @@ from tempfile import TemporaryFile
 
 view_form="""<?xml version="1.0"?>
 <form string="Import language">
-    <image name="gtk-dialog-info" colspan="2"/>
-    <group colspan="2" col="4">
-        <separator string="Import New Language" colspan="4"/>
-        <field name="name" width="200"/>
-        <field name="code"/>
-        <field name="data" colspan="4"/>
-        <label string="You have to import a .CSV file which is encoded in UTF-8.\n
-Please check that the first line of your file is one of the following:" colspan="4" align="0.0"/>
-        <label string="type,name,res_id,src,value" colspan="4"/>
-        <label string="module,type,name,res_id,src,value" colspan="4"/>
-        <label string="You can also import .po files." colspan="4" align="0.0"/>
-    </group>
+    <notebook colspan="4">
+        <page string="Import Data">
+            <group colspan="2" col="4">
+                <separator string="Import New Language" colspan="4"/>
+                <field name="name" width="200"/>
+                <field name="code"/>
+                <field name="data" colspan="4"/>
+            </group>
+        </page>
+        <page string="Help">
+            <label string="You have to import a .CSV file which is encoded in UTF-8.\n
+    Please check that the first line of your file is one of the following:" colspan="4" align="0.0"/>
+            <label string="type,name,res_id,src,value" colspan="4"/>
+            <label string="module,type,name,res_id,src,value" colspan="4"/>
+            <label string="You can also import .po files." colspan="4" align="0.0"/>
+        </page>
+    </notebook>
 </form>"""
 
 fields_form={
@@ -69,7 +74,7 @@ class wizard_import_lang(wizard.interface):
             'actions': [],
             'result': {'type': 'form', 'arch': view_form, 'fields': fields_form,
                 'state':[
-                    ('end', 'Cancel', 'gtk-cancel'),
+                    ('end', 'Close', 'gtk-cancel'),
                     ('finish', 'Ok', 'gtk-ok', True)
                 ]
             }
diff --git a/bin/addons/base/module/wizard/wizard_module_import.py b/bin/addons/base/module/wizard/wizard_module_import.py
index 1350a4ad0ba..6c35822fd0f 100644
--- a/bin/addons/base/module/wizard/wizard_module_import.py
+++ b/bin/addons/base/module/wizard/wizard_module_import.py
@@ -93,7 +93,7 @@ class move_module_wizard(wizard.interface):
                 'arch': ask_form,
                 'fields': ask_fields,
                 'state': [
-                    ('end', 'Cancel', 'gtk-cancel'),
+                    ('end', 'Close', 'gtk-cancel'),
                     ('import', 'Import module', 'gtk-ok', True)
                 ]
             }
diff --git a/bin/addons/base/module/wizard/wizard_module_lang_install.py b/bin/addons/base/module/wizard/wizard_module_lang_install.py
index 7367bdb4baa..f8ce50cfb5a 100644
--- a/bin/addons/base/module/wizard/wizard_module_lang_install.py
+++ b/bin/addons/base/module/wizard/wizard_module_lang_install.py
@@ -34,10 +34,8 @@ view_form_end = """<?xml version="1.0"?>
 
 view_form = """<?xml version="1.0"?>
 <form string="System Upgrade">
-    <image name="gtk-dialog-info" colspan="2"/>
     <group colspan="2" col="4">
     <separator string="System Upgrade" colspan="4"/>
-        <label align="0.0" string="Choose a language to install:" colspan="4"/>
         <field name="lang" colspan="4" required="1"/>
         <label align="0.0" string="Note that this operation may take a few minutes." colspan="4"/>
     </group>
@@ -55,6 +53,7 @@ class wizard_lang_install(wizard.interface):
 
     fields_form = {
         'lang': {'string':'Language', 'type':'selection', 'selection':tools.scan_languages(),
+                 'help': 'Choose a language to install.',
         },
     }
 
@@ -63,7 +62,7 @@ class wizard_lang_install(wizard.interface):
             'actions': [],
             'result': {'type': 'form', 'arch': view_form, 'fields': fields_form,
                 'state': [
-                    ('end', 'Cancel', 'gtk-cancel'),
+                    ('end', 'Close', 'gtk-cancel'),
                     ('start', 'Start installation', 'gtk-ok', True)
                 ]
             }
diff --git a/bin/addons/base/module/wizard/wizard_update_module.py b/bin/addons/base/module/wizard/wizard_update_module.py
index 22e52bb6d6d..6526074852e 100644
--- a/bin/addons/base/module/wizard/wizard_update_module.py
+++ b/bin/addons/base/module/wizard/wizard_update_module.py
@@ -71,7 +71,7 @@ class wizard_update_module(wizard.interface):
             'actions': [],
             'result': {'type': 'form', 'arch': arch, 'fields': fields,
                 'state': [
-                    ('end', 'Cancel', 'gtk-cancel'),
+                    ('end', 'Close', 'gtk-cancel'),
                     ('update', 'Check new modules', 'gtk-ok', True)
                 ]
             }
diff --git a/bin/addons/base/res/res_lang_view.xml b/bin/addons/base/res/res_lang_view.xml
index bbb2c6c9974..bf1e611c3d6 100644
--- a/bin/addons/base/res/res_lang_view.xml
+++ b/bin/addons/base/res/res_lang_view.xml
@@ -13,6 +13,8 @@
                     <field name="direction"/>
                     <field name="translatable"/>
                     <field name="active"/>
+                    <button name="%(base.action_wizard_update_translations)d"
+                    string="Update Terms" type="action" icon="gtk-ok" help="Update Languague Terms"/>
                 </tree>
             </field>
         </record>
@@ -98,13 +100,27 @@
                 </form>
             </field>
         </record>
+        <record id="res_lang_search" model="ir.ui.view">
+            <field name="name">res.lang.search</field>
+            <field name="model">res.lang</field>
+            <field name="type">search</field>
+            <field name="arch" type="xml">
+                <search string="Languages">
+					<field name="name"/>
+					<field name="code"/>
+					<field name="iso_code"/>
+					<field name="direction"/>
+                </search>
+            </field>
+        </record>
 
         <record id="res_lang_act_window" model="ir.actions.act_window">
             <field name="name">Languages</field>
             <field name="res_model">res.lang</field>
             <field name="view_type">form</field>
             <field name="context">{'active_test': False}</field>
+            <field name="search_view_id" ref="res_lang_search"/>
         </record>
-        <menuitem action="res_lang_act_window" id="menu_res_lang_act_window" parent="base.menu_translation_app"/>
+        <menuitem action="res_lang_act_window" id="menu_res_lang_act_window" parent="menu_translation"/>
     </data>
 </openerp>
diff --git a/bin/addons/base/res/res_request_view.xml b/bin/addons/base/res/res_request_view.xml
index 1853682908f..ffc50168861 100644
--- a/bin/addons/base/res/res_request_view.xml
+++ b/bin/addons/base/res/res_request_view.xml
@@ -24,7 +24,7 @@
             <field name="arch" type="xml">
                 <form string="Requests">
                     <group colspan="4" col="6">
-	                    <field name="name"/>
+	                    <field name="name" colspan="4"/>
 	                    <field name="create_date" string="Request Date"/>
 	                    <newline/>
 	                	<field name="act_from"/>
@@ -38,7 +38,7 @@
                             <separator colspan="4" string="Description"/>
                             <newline/>
                             <field colspan="4" name="body" nolabel="1"/>
-                            <group col="4" colspan="4">
+                            <group col="5" colspan="4">
                                 <field name="state"/>
                                 <button name="request_close" states="waiting,draft,active" string="End of Request" type="object"/>
                                 <button name="request_send" states="draft,active" string="Send" type="object"/>