diff --git a/openerp/addons/base/module/module.py b/openerp/addons/base/module/module.py
index 49a65acebca..4717ea63a84 100644
--- a/openerp/addons/base/module/module.py
+++ b/openerp/addons/base/module/module.py
@@ -177,8 +177,8 @@ class module(osv.osv):
     _columns = {
         'name': fields.char("Technical Name", size=128, readonly=True, required=True, select=True),
         'category_id': fields.many2one('ir.module.category', 'Category', readonly=True, select=True),
-        'shortdesc': fields.char('Module Name', size=256, readonly=True, translate=True),
-        'summary': fields.char('Summary', size=256, readonly=True, translate=True),
+        'shortdesc': fields.char('Module Name', size=64, readonly=True, translate=True),
+        'summary': fields.char('Summary', size=64, readonly=True, translate=True),
         'description': fields.text("Description", readonly=True, translate=True),
         'author': fields.char("Author", size=128, readonly=True),
         'maintainer': fields.char('Maintainer', size=128, readonly=True),
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 1d62c74b781..f6466479bff 100644
--- a/openerp/addons/base/module/wizard/base_import_language_view.xml
+++ b/openerp/addons/base/module/wizard/base_import_language_view.xml
@@ -10,7 +10,7 @@
                 <form string="Import Translation" version="7.0">
                     <group>
                         <field name="name"/>
-                        <field name="code" string="Code" placeholder="en_US"/>
+                        <field name="code" string="Code" placeholder="e.g. en_US"/>
                         <field name="data"/>
                         <field name="overwrite"/>
                     </group>
diff --git a/openerp/addons/base/res/res_company_view.xml b/openerp/addons/base/res/res_company_view.xml
index 8637da10f4c..c3e2501ccbb 100644
--- a/openerp/addons/base/res/res_company_view.xml
+++ b/openerp/addons/base/res/res_company_view.xml
@@ -34,7 +34,7 @@
                         </h1>
                         <label for="rml_header1" class="oe_edit_only"/>
                         <div>
-                            <field name="rml_header1" placeholder="Global Business Solutions"/>
+                            <field name="rml_header1" placeholder="e.g. Global Business Solutions"/>
                         </div>
                     </div>
                     <group col="4">
diff --git a/openerp/addons/base/res/res_partner_view.xml b/openerp/addons/base/res/res_partner_view.xml
index 01c4649138a..4448ec10b97 100644
--- a/openerp/addons/base/res/res_partner_view.xml
+++ b/openerp/addons/base/res/res_partner_view.xml
@@ -101,18 +101,19 @@
                 <sheet>
                     <field name="image_small" widget='image' class="oe_avatar oe_left"/>
                     <div class="oe_title">
+                        <div class="oe_edit_only">
+                            <label for="name"/> (
+                            <field name="is_company" on_change="onchange_type(is_company)" class="oe_inline"/> <label for="is_company" string="Is a Company?"/>)
+                        </div>
                         <h1>
                             <field name="name" default_focus="1" placeholder="Name" />
                         </h1>
                         <field name="parent_id"
-                            string="Work for Company"
+                            placeholder="Company"
                             domain="[('is_company', '=', True)]" context="{'default_is_company': True}"
                             attrs="{'invisible': [('is_company','=', True)]}"
                             on_change="onchange_address(use_parent_address, parent_id)"/>
-                        <div class="oe_edit_only">
-                            <field name="is_company" on_change="onchange_type(is_company)" class="oe_inline"/> <label for="is_company" string="Company?"/>
-                            <field name="category_id" widget="many2many_tags" placeholder="Select Tags"/>
-                        </div>
+                        <field name="category_id" widget="many2many_tags" placeholder="Tags..."/>
                     </div>
                     <div class="oe_right oe_button_box" name="buttons"> </div>
 
@@ -133,10 +134,10 @@
                                 <field name="street2"/>
                                 <div class="address_format">
                                     <field name="city" placeholder="City" style="width: 40%%"/>
-                                    <field name="state_id" class="oe_no_button" placeholder="State" style="width: 24%%"/>
+                                    <field name="state_id" options='{"no_open": true}' placeholder="State" style="width: 24%%"/>
                                     <field name="zip" placeholder="ZIP" style="width: 34%%"/>
                                 </div>
-                                <field name="country_id" placeholder="Country" class="oe_no_button"/>
+                                <field name="country_id" placeholder="Country" options='{"no_open": true}'/>
                             </div>
                             <field name="website" widget="url" placeholder="e.g. www.openerp.com"/>
                         </group>
@@ -148,6 +149,7 @@
                             <field name="fax"/>
                             <field name="email" widget="email"/>
                             <field name="title" domain="[('domain', '=', 'contact')]"
+                                groups="base.group_no_one"
                                 options='{"no_open": true}' attrs="{'invisible': [('is_company','=', True)]}" />
                         </group>
                     </group>
@@ -215,7 +217,7 @@
                                 </group>
                                 <group>
                                     <field name="customer"/>
-                                    <field name="supplier" invisible="1"/>
+                                    <field name="supplier" invisible="not context.get('default_supplier')"/>
                                 </group>
                                 <group>
                                     <field name="ref"/>