diff --git a/openerp/addons/base/module/wizard/base_export_language_view.xml b/openerp/addons/base/module/wizard/base_export_language_view.xml
index 16477bbd5e5..fdbc99cca65 100644
--- a/openerp/addons/base/module/wizard/base_export_language_view.xml
+++ b/openerp/addons/base/module/wizard/base_export_language_view.xml
@@ -7,46 +7,29 @@
             <field name="model">base.language.export</field>
             <field name="type">form</field>
             <field name="arch" type="xml">
-                <form string="Export Translations">
-                    <group col="8">
-                        <group colspan="3">
-                            <field name="config_logo" widget="image" width="220" height="130" nolabel="1" colspan="1"/>
-                            <newline/>
-                            <label colspan="4" width="220" string="OpenERP translations (core, modules, clients) are managed through Launchpad.net, our open source project management facility. We use their online interface to synchronize all translations efforts."/>
-                            <label colspan="4" width="220" string="To improve or expand the official translations, you should use directly Lauchpad's web interface (Rosetta). If you need to perform mass translation, Launchpad also allows uploading full .po files at once"/>
-                            <label colspan="4" width="220"/>
-                            <label colspan="4" width="220" string="To browse official translations, you can start with these links:"/>
-                            <label colspan="4" width="220" string="https://help.launchpad.net/Translations"/>
-                            <label colspan="4" width="220" string="https://translations.launchpad.net/openobject"/>
+                <form string="Export Translations" version="7.0">
+                    <field invisible="1" name="state"/>
+                    <header states="choose">
+                        <button icon="gtk-cancel" name="act_cancel" special="cancel" string="_Close" type="object"/>
+                        <button icon="gtk-ok" name="act_getfile" string="_Export" type="object"/>
+                    </header> 
+                    <group colspan="4">
+                        <group states="choose" string="Export Translation">
+                            <field name="lang"/>
+                            <field name="format" required="1"/>
+                            <field height="200" name="modules" nolabel="1" colspan="4"/>
                         </group>
-                        <separator orientation="vertical" rowspan="15"/>
-                        <group colspan="4">
-                            <group colspan="4" states="choose">
-                                <separator colspan="4" string="Export Translation"/>
-                                <field name="lang"/>
-                                <field name="format" required="1"/>
-                                <field height="200" name="modules" nolabel="1" colspan="4"/>
-                                <field invisible="1" name="state"/>
-                            </group>
-                            <group colspan="4" states="get">
-                                <separator string="Export done" colspan="4"/>
-                                <field name="name" invisible="1" colspan="4"/>
-                                <field name="data" nolabel="1" readonly="1" filename="name" colspan="4"/>
-                                <field height="80" name="advice" nolabel="1" colspan="4"/>
-                            </group>
-                        </group>
-                        <group colspan="8" col="8" states="choose">
-                            <separator string="" colspan="8"/>
-                            <label colspan="6" width="220"/>
-                            <button icon="gtk-cancel" name="act_cancel" special="cancel" string="_Close" type="object"/>
-                            <button icon="gtk-ok" name="act_getfile" string="_Export" type="object"/>
-                        </group>
-                        <group colspan="8" col="8" states="get">
-                            <separator string="" colspan="8"/>
-                            <label colspan="7" width="220"/>
-                            <button icon="gtk-close" name="act_destroy" special="cancel" string="_Close" type="object"/>
+                        <group colspan="4" states="get" string="Export done">
+                            <field name="name" invisible="1" colspan="4"/>
+                            <field name="data" nolabel="1" readonly="1" filename="name" colspan="4"/>
+                            <field height="80" name="advice" nolabel="1" colspan="4"/>
                         </group>
                     </group>
+                    <group colspan="8" col="8" states="get">
+                        <separator string="" colspan="8"/>
+                        <label colspan="7" width="220"/>
+                        <button icon="gtk-close" name="act_destroy" special="cancel" string="_Close" type="object"/>
+                    </group>
                 </form>
             </field>
         </record>
diff --git a/openerp/addons/base/module/wizard/base_import_language_view.xml b/openerp/addons/base/module/wizard/base_import_language_view.xml
index 76cfd941543..d5e7cf916c4 100644
--- a/openerp/addons/base/module/wizard/base_import_language_view.xml
+++ b/openerp/addons/base/module/wizard/base_import_language_view.xml
@@ -10,13 +10,11 @@
                 <form string="Import Translation" version="7.0">
                     <header>
                         <button name="import_lang" string="_Import" type="object" icon="gtk-ok"/>
-                        <button special="cancel" string="_Close" icon="gtk-cancel"/>
                     </header>
-                    <separator string="Import Translation" colspan="2"/>
                     <label nolabel="1" string="If you need another language than the official ones available, you can import a language pack from here. Other OpenERP languages than the official ones can be found on launchpad." colspan="2"/>
-                    <group col="4">
+                    <group>
                         <field name="name"/>
-                        <field name="code"/>
+                        <field name="code" string="Code" placeholder="en_US"/>
                         <field name="data"/>
                         <field name="overwrite"/>
                     </group>
diff --git a/openerp/addons/base/module/wizard/base_language_install_view.xml b/openerp/addons/base/module/wizard/base_language_install_view.xml
index 0ebe9256a52..61152e9872b 100644
--- a/openerp/addons/base/module/wizard/base_language_install_view.xml
+++ b/openerp/addons/base/module/wizard/base_language_install_view.xml
@@ -7,40 +7,26 @@
             <field name="model">base.language.install</field>
             <field name="type">form</field>
             <field name="arch" type="xml">
-                <form string="Load a Translation">
-                    <group colspan="4" col="8">
-                        <group colspan="1">
-                            <field name="config_logo" widget="image" width="220" height="130" nolabel="1" colspan="1"/>
-                            <newline/>
-                            <label colspan="4" width="220" string="This wizard helps you add a new language to your OpenERP system. After loading a new language it becomes available as default interface language for users and partners."/>
-                            <label colspan="4" width="220"/>
-                            <label colspan="4" width="220" string="Please be patient, this operation may take a few minutes (depending on the number of modules currently installed)..."/>
-                            <field name="state" invisible="1"/>
+                <form string="Load a Translation" version="7.0">
+                    <field name="state" invisible="1"/>
+                    <header states="init">
+                        <button special="cancel" string="Cancel" icon="gtk-cancel" colspan="1"/>
+                        <button name="lang_install" string="Load" type="object" icon="gtk-ok" colspan="1"/>
+                    </header>
+                    <group>
+                        <group states="init">
+                            <field name="lang"/>
+                            <field name="overwrite" groups="base.group_no_one"/>
                         </group>
-                        <separator orientation="vertical" colspan="1" rowspan="12"/>
-                        <group colspan="6">
-                            <separator string="Load a Translation" colspan="4"/>
-                            <group states="init" colspan="4">
-                                <field name="lang" colspan="4"/>
-                                <field name="overwrite" colspan="4" groups="base.group_no_one"/>
-                            </group>
-                            <group states="done" colspan="4">
-                                <label string="The selected language has been successfully installed.
-You must change the preferences of the user and open a new menu to view the changes." colspan="4"/>
-                            </group>
+                        <group states="done">
+                            <label string="The selected language has been successfully installed.
+    You must change the preferences of the user and open a new menu to view the changes."/>
                         </group>
                     </group>
-                        <group colspan="8" col="8" states="init">
-                            <separator string="" colspan="8"/>
-                            <label colspan="6" width="220"/>
-                            <button special="cancel" string="Cancel" icon="gtk-cancel" colspan="1"/>
-                            <button name="lang_install" string="Load" type="object" icon="gtk-ok" colspan="1"/>
-                        </group>
-                        <group colspan="8" col="8" states="done">
-                            <separator string="" colspan="8"/>
-                            <label colspan="7" width="220"/>
-                            <button special="cancel" string="Close" icon="gtk-ok"/>
-                        </group>
+
+                    <group states="done">
+                        <button special="cancel" string="Close" icon="gtk-ok"/>
+                    </group>
                 </form>
            </field>
         </record>
diff --git a/openerp/addons/base/module/wizard/base_update_translations_view.xml b/openerp/addons/base/module/wizard/base_update_translations_view.xml
index d91d0d7845e..245f81ece9c 100644
--- a/openerp/addons/base/module/wizard/base_update_translations_view.xml
+++ b/openerp/addons/base/module/wizard/base_update_translations_view.xml
@@ -6,25 +6,16 @@
             <field name="model">base.update.translations</field>
             <field name="type">form</field>
             <field name="arch" type="xml">
-                <form string="Synchronize Terms">
-                    <group col="8">
-                        <group colspan="3">
-                            <field name="config_logo" widget="image" width="220" height="130" nolabel="1" colspan="1"/>
-                            <newline/>
-                            <label colspan="4" width="220" string="This wizard will detect new terms to translate in the application, so that you can then add translations manually or perform a complete export (as a template for a new language example)."/>
+                <form string="Synchronize Terms" version="7.0">
+                    <header>
+                        <button icon="gtk-cancel" name="act_cancel" special="cancel" string="Cancel" type="object"/>
+                        <button icon="gtk-ok" name="act_update" string="Update" type="object"/>
+                    </header>
+                    <sheet>
+                        <group>
+                            <field name="lang"/>
                         </group>
-                        <separator orientation="vertical" rowspan="15"/>
-                        <group colspan="4">
-                            <separator string="Synchronize Translation" colspan="4"/>
-                            <field name="lang" colspan="4"/>
-                        </group>
-                        <group colspan="8" col="8">
-                            <separator string="" colspan="8"/>
-                            <label colspan="6" width="220"/>
-                            <button icon="gtk-cancel" name="act_cancel" special="cancel" string="Cancel" type="object"/>
-                            <button icon="gtk-ok" name="act_update" string="Update" type="object"/>
-                        </group>
-                    </group>
+                    </sheet>
                 </form>
             </field>
         </record>
diff --git a/openerp/addons/base/res/res_users_view.xml b/openerp/addons/base/res/res_users_view.xml
index 38c1cc748df..c4e6a7a370e 100644
--- a/openerp/addons/base/res/res_users_view.xml
+++ b/openerp/addons/base/res/res_users_view.xml
@@ -124,7 +124,9 @@
                                 </group>
                             </page>
                             <page string="Allowed Companies" groups="base.group_multi_company">
-                                <field name="company_ids" widget="many2many_tags"/>
+                                <group>
+                                    <field name="company_ids" widget="many2many_tags" string="Default Company"/>
+                                </group>
                             </page>
                         </notebook>
                     </sheet>