diff --git a/addons/crm/crm_lead.py b/addons/crm/crm_lead.py
index 0b58975bca2..c27c184fcfd 100644
--- a/addons/crm/crm_lead.py
+++ b/addons/crm/crm_lead.py
@@ -189,7 +189,7 @@ class crm_lead(base_stage, osv.osv):
             select=True, help="Optional linked partner, usually after conversion of the lead"),
 
         'id': fields.integer('ID', readonly=True),
-        'name': fields.char('Name', size=64, select=1),
+        'name': fields.char('Subject', size=64, select=1),
         'active': fields.boolean('Active', required=False),
         'date_action_last': fields.datetime('Last Action', readonly=1),
         'date_action_next': fields.datetime('Next Action', readonly=1),
diff --git a/addons/crm/crm_lead_view.xml b/addons/crm/crm_lead_view.xml
index 07e295d4e4c..68d6bb2322d 100644
--- a/addons/crm/crm_lead_view.xml
+++ b/addons/crm/crm_lead_view.xml
@@ -78,7 +78,7 @@
                 </div>
                 <sheet layout="auto">
                 <group colspan="4" col="7">
-                    <field name="name" required="1" string="Subject"/>
+                    <field name="name"/>
                     <field name="priority"/>
                     <field name="categ_id"
                         widget="selection"
@@ -171,7 +171,7 @@
                     <field name="needaction_pending" invisible="1"/>
                     <field name="date_deadline" invisible="1"/>
                     <field name="create_date" groups="base.group_no_one"/>
-                    <field name="name" string="Subject"/>
+                    <field name="name"/>
                     <field name="contact_name"/>
                     <field name="country_id" invisible="context.get('invisible_country', True)" />
                     <field name="email_from"/>
@@ -376,134 +376,129 @@
         <field name="type">form</field>
         <field name="priority">20</field>
         <field name="arch" type="xml">
-            <form string="Opportunities" layout="manual">
-                <div class="oe_form_topbar oe_form_topbar_hifirst">
-                    <button name="case_open" string="Open" type="object"
-                            states="draft"/>
-                    <button name="case_mark_won" string="Mark Won" type="object"
-                            states="draft,open"/>
-                    <button name="case_mark_lost" string="Mark Lost" type="object"
-                            states="draft,open"/>
-                    <button name="case_reset" string="Reset to Draft" type="object"
-                            states="cancel"/>
-                    <button name="case_escalate" string="Escalate" type="object"
-                            states="open"/>
-                    <button name="stage_previous" string="Previous" type="object"
-                            states="open" icon="gtk-go-back" context="{'stage_type': 'opportunity'}"/>
-                    <button name="stage_next" string="Next" type="object"  
-                            states="open" icon="gtk-go-forward" context="{'stage_type': 'opportunity'}"/>
-                    <div class="oe_right">
-                        <field name="stage_id" nolabel="1" widget="statusbar"
-                            on_change="onchange_stage_id(stage_id)"/>
-                    </div>
-                    <div class="oe_clear"/>
-                </div>
-                <sheet layout="auto">
-                <group colspan="4" col="2" width="auto">
-                    <field name="name" required="1" nolabel="1" class="oe_form_title"/>
-                    <div class="oe_text_right">
+            <form string="Opportunities" validate="0">
+                <header class="oe_form_topbar_hifirst">
+                    <button name="case_mark_won" string="Mark Won" states="open,pending" type="object" />
+                    <button name="case_open" string="Open" states="draft,pending" type="object" />
+                    <button name="case_pending" string="Pending" states="draft,open" type="object" />
+                    <button name="case_escalate" string="Escalate" states="open,pending" type="object" />
+                    <button name="case_mark_lost" string="Mark Lost" states="open,pending" type="object" />
+                    <button name="case_reset" string="Reset to Draft" states="done,cancel" type="object" />
+                    <button name="case_cancel" string="Cancel" states="draft" type="object" />
+                    <field name="state" nolabel="1" widget="statusbar" statusbar_visible="draft,open,done" statusbar_colors='{"pending":"blue"}'/>
+                </header>
+                <sheet>
+                    <div class="oe_right oe_form_button_box">
                         <button string="Schedule/Log Call"
-                            name="%(opportunity2phonecall_act)d" icon="terp-call-start"
+                            name="%(opportunity2phonecall_act)d"
                             type="action"/>
-                        <button string="Schedule Meeting" icon="gtk-redo"
+                        <button string="Schedule Meeting"
                             name="action_makeMeeting"
                             type="object"/>
                     </div>
-                </group>
-                <group colspan="4" col="4" class="oe_form_group_label_border" style="margin-top: 20px;">
-                    <field name="user_id"/>
-                    <field name="planned_revenue"/>
 
-                    <field name="date_action"/>
-                    <field name="date_deadline"/>
+                    <div class="oe_form_title">
+                        <label for="name" class="oe_form_readonly_hidden"/>
+                        <h1><field name="name"/></h1>
 
-                    <field name="title_action"/>
-                    <field name="probability"/>
+                        <label for="planned_revenue" class="oe_form_readonly_hidden"/>
+                        <h2>
+                            <field name="planned_revenue" class="oe_form_inline"/>
+                            <field name="company_currency" class="oe_form_readonly_hidden oe_form_inline"/> at 
+                            <field name="probability" class="oe_form_inline"/> % success rate
+                        </h2>
+                    </div>
+                    <group>
+                        <group>
+                            <field name="partner_id"
+                                on_change="onchange_partner_id(partner_id, email_from)"
+                                string="Customer"
+                                context="{'default_name': partner_name, 'default_email': email_from, 'default_phone': phone}"/>
+                            <field name="email_from" string="Email"/>
+                            <field name="phone"/>
+                        </group>
+
+                        <group>
+                            <label for="title_action"/>
+                            <div>
+                                <field name="date_action" nolabel="1"/> -
+                                <field name="title_action" class="oe_form_inline" nolabel="1" placeholder="Call for proposal"/>
+                            </div>
+                            <field name="date_deadline"/>
+                            <field name="priority"/>
+                        </group>
+
+                        <group>
+                            <field name="user_id"/>
+                            <field name="section_id" colspan="1" widget="selection"/>
+                        </group>
+                        <group>
+                            <field name="categ_id" select="1"
+                                string="Category" widget="selection"
+                                domain="[('object_id.model', '=', 'crm.lead')]" />
 
-                    <field name="type" invisible="1"/>
-                </group>
-                <notebook colspan="4">
-                <page string="Opportunity">
-                    <group col="4" colspan="2">
-                        <separator colspan="4" string="Contacts"/>
-                        <group colspan="2" col="3" class="oe_form_group_label_border">
-                            <field width="80%%" name="partner_id" select="1"
-                                on_change="onchange_partner_id(partner_id, email_from)" string="Customer"/>
-                            <button name="%(action_crm_lead2partner)d"
-                                icon="terp-partner" type="action"
-                                string="Create"
-                                attrs="{'invisible':[('partner_id','!=',False)]}"/>
-                            <field name="phone" colspan="3"/>
-                            <field width="80%%" name="email_from" string="Email"/>
-                            <button string="Mail"
-                                name="%(mail.action_email_compose_message_wizard)d"
-                                context="{'mail':'new', 'model': 'crm.lead'}"
-                                icon="terp-mail-message-new" type="action" />
                         </group>
                     </group>
-                    <group col="2" colspan="2" class="oe_form_group_label_border">
-                        <separator colspan="2" string="Category"/>
-                        <field name="section_id" colspan="1" widget="selection"/>
-                        <field name="categ_id" select="1"
-                            string="Category" widget="selection"
-                            domain="[('object_id.model', '=', 'crm.lead')]" />
-                        <field name="state"/>
-                        <field name="priority"/>
-                    </group>
 
-                    <separator colspan="4" string="Details"/>
-                    <field name="description" nolabel="1" colspan="4"/>
-                </page>
-                <page string="Lead">
-                    <separator string="Contact" colspan="4"/>
-                    <group colspan="4" col="4" class="oe_form_group_label_border">
-                        <field name="partner_name" string="Customer Name" colspan="4"/>
-                    </group>
-                    <group colspan="2" col="2" class="oe_form_group_label_border">
-                        <field domain="[('domain', '=', 'contact')]" name="title" widget="selection"/>
-                        <field name="fax"/>
-                        <field name="street"/>
-                        <field name="zip"/>
-                        <field name="country_id"/>
-                    </group>
-                    <group colspan="2" col="2" class="oe_form_group_label_border">
-                        <field name="function" />
-                        <field name="mobile"/>
-                        <field name="street2"/>
-                        <field name="city"/>
-                        <field name="state_id"/>
-                    </group>
+                                    <!--<button string="Mail"
+                                        name="%(mail.action_email_compose_message_wizard)d"
+                                        context="{'mail':'new', 'model': 'crm.lead'}"
+                                        icon="terp-mail-message-new" type="action" />-->
 
-                    <group colspan="2" col="2" class="oe_form_group_label_border">
-                        <separator string="Categorization" colspan="2"/>
-                        <field name="type_id" widget="selection"/>
-                        <field name="channel_id" widget="selection"/>
-                    </group>
-                    <group colspan="2" col="2" class="oe_form_group_label_border">
-                        <separator string="Mailings" colspan="2"/>
-                        <field name="opt_in" on_change="on_change_opt_in(opt_in)"/>
-                        <field name="opt_out" on_change="on_change_opt_out(opt_out)"/>
-                    </group>
-                </page>
-                <page string="Extra Info">
-                    <group col="2" colspan="2" class="oe_form_group_label_border">
-                        <separator string="Misc" colspan="2"/>
-                        <field name="active"/>
-                        <field name="day_open" groups="base.group_no_one"/>
-                        <field name="day_close" groups="base.group_no_one"/>
-                        <field name="referred"/>
-                    </group>
-                    <group col="2" colspan="2" class="oe_form_group_label_border">
-                        <separator colspan="4" string="References"/>
-                        <field name="ref"/>
-                        <field name="ref2"/>
-                    </group>
-                </page>
-                </notebook>
+                    <notebook colspan="4">
+                    <page string="Internal Notes">
+                        <field name="description"/>
+                    </page>
+                    <page string="Lead">
+                        <group>
+                            <group>
+                                <field name="partner_name"/>
+                                <label for="street" string="Address"/>
+                                <div>
+                                    <field name="street" placeholder="Street..."/>
+                                    <field name="street2" placeholder="street optional second line"/>
+                                    <div>
+                                        <field name="zip" class="oe_form_inline" placeholder="ZIP"/>
+                                        <field name="city" class="oe_form_inline" placeholder="City"/>
+                                    </div>
+                                    <field name="state_id" placeholder="State"/>
+                                    <field name="country_id" placeholder="Country"/>
+                                </div>
+                            </group>
+
+                            <group>
+                                <field name="contact_name" />
+                                <field name="function" />
+                                <field domain="[('domain', '=', 'contact')]" name="title"/>
+                                <field name="mobile"/>
+                                <field name="fax"/>
+                            </group>
+
+                            <group string="Categorization">
+                                <field name="type_id" widget="selection"/>
+                                <field name="channel_id" widget="selection"/>
+                            </group>
+                            <group string="Mailings">
+                                <field name="opt_in" on_change="on_change_opt_in(opt_in)"/>
+                                <field name="opt_out" on_change="on_change_opt_out(opt_out)"/>
+                            </group>
+                            <group string="Misc">
+                                <field name="active"/>
+                                <field name="day_open" groups="base.group_no_one"/>
+                                <field name="day_close" groups="base.group_no_one"/>
+                                <field name="referred"/>
+                            </group>
+                            <group string="References">
+                                <field name="ref"/>
+                                <field name="ref2"/>
+                            </group>
+                        </group>
+                    </page>
+                    </notebook>
                 </sheet>
-                <div class="oe_form_bottom">
-                    <field name="message_ids" colspan="4" widget="ThreadView" nolabel="1"/>
-                </div>
+                <footer>
+                    <field name="message_ids" widget="ThreadView"/>
+                </footer>
             </form>
         </field>
     </record>