diff --git a/addons/crm/crm.py b/addons/crm/crm.py
index 6ed5be068f0..922e7d91b99 100644
--- a/addons/crm/crm.py
+++ b/addons/crm/crm.py
@@ -653,7 +653,7 @@ class crm_case(osv.osv):
                     "Reminder: [%s] %s" % (str(case.id), case.name, ),
                     self.format_body(body),
                     reply_to=case.section_id.reply_to,
-                    tinycrm=str(case.id),
+                    openobject_id=str(case.id),
                     attach=attach_to_send
                 )
                 if flag:
@@ -713,7 +713,7 @@ class crm_case(osv.osv):
                 '['+str(case.id)+'] '+case.name,
                 self.format_body(body),
                 reply_to=case.section_id.reply_to,
-                tinycrm=str(case.id)
+                openobject_id=str(case.id)
             )
         return True
 
@@ -885,7 +885,7 @@ class crm_email_add_cc_wizard(osv.osv_memory):
             subject or '['+str(case.id)+'] '+case.name,
             crm_case.format_body(body),
             email_cc = [email],
-            tinycrm=str(case.id)
+            openobject_id=str(case.id)
         )
         if flag:
             crm_case.write(cr, uid, case.id, {'email_cc' : case.email_cc and case.email_cc +','+ email or email})
diff --git a/addons/crm/crm_lead.py b/addons/crm/crm_lead.py
index 04a5a09da3d..cb97f8b4c6b 100644
--- a/addons/crm/crm_lead.py
+++ b/addons/crm/crm_lead.py
@@ -33,10 +33,11 @@ class crm_lead(osv.osv):
     _order = "id desc"
     _inherit = 'crm.case'    
     _columns = {
+            'name': fields.char('Lead Subject', size=64),
             'categ_id': fields.many2one('crm.case.categ', 'Category', domain="[('section_id','=',section_id),('object_id.model', '=', 'crm.opportunity')]"),
             'type_id': fields.many2one('crm.case.resource.type', 'Lead Type Name', domain="[('section_id','=',section_id),('object_id.model', '=', 'crm.lead')]"),
-            'partner_name': fields.char("Employee's Name", size=64),
-            'partner_name2': fields.char('Employee Email', size=64),
+            'partner_name': fields.char("Lead Name", size=64),
+            'partner_name2': fields.char('Email', size=64),
             'partner_phone': fields.char('Phone', size=32),
             'partner_mobile': fields.char('Mobile', size=32),
             'priority': fields.selection(crm.AVAILABLE_PRIORITIES, 'Priority'),
diff --git a/addons/crm/crm_lead_view.xml b/addons/crm/crm_lead_view.xml
index 2c5024ebd0f..f16402e5bd8 100644
--- a/addons/crm/crm_lead_view.xml
+++ b/addons/crm/crm_lead_view.xml
@@ -26,33 +26,20 @@
         <field name="type">form</field>
         <field name="arch" type="xml">
             <form string="Leads Form">
-                <group colspan="4" col="7">
-                    <field name="name" select="1" string="Lead Subject"/>
-                    <field name="section_id" colspan="1" widget="selection"/>
-                    <field name="opportunity_id" string="Opportunity Case"/>
-	                <button string="Convert to Opportunity" name="%(wizard_crm_lead_opportunity_set)d" icon="gtk-index" type="action"  attrs="{'invisible':[('opportunity_id','!=',False)]}"/>
-
-                    <label string="Stage: " align="1.0"/>
-                    <group colspan="1" col="2">
-                        <field name="stage_id" select="1" nolabel="1"/>
-                        <button icon="gtk-go-forward" string="" name="stage_next" type="object"/>
-                    </group>
-                    <field name="categ_id" select="1" on_change="onchange_categ_id(categ_id)" string="Lead Source"/>
-                    <field name="type_id" string="Campaign Type" select="1"/>
+                <group colspan="4" col="5">
+                    <field name="partner_name" string="Lead Name" required="1"/>
+                    <field name="name" string="Lead Subject"/>                                       
+                    <button string="Convert to Opportunity" name="%(wizard_crm_lead_opportunity_set)d" icon="gtk-index" type="action"/>                    
                     <newline/>
-                    <field name="date"/>
-                	<field name="date_deadline"/>
-                    <field name="user_id" select="2"/>
+                    <field name="partner_name2" string="Contact Name"/>                    
+                    <field name="email_from" string="Email"/>                    
+                    
                 </group>
                 <notebook colspan="4">
                 <page string="Leads">
-                    <separator string="Lead Information" colspan="4"/>
-                    <field name="partner_name" string="Lead Name"/>
-                    <field name="partner_name2" string="Contact Name"/>
+                    <separator colspan="4" string="Communication"/>
                     <field name="partner_phone"/>
                     <field name="partner_mobile"/>
-                    <field name="email_from" string="Lead Email"/>
-                    <newline/>
                     <label string="Partner:" align="1.0"/>
                     <group colspan="1" col="2">
                         <field name="partner_id" nolabel="1" colspan="1"/>
@@ -63,9 +50,23 @@
                     </group>
                     <field name="partner_address_id" string="Contact" on_change="onchange_partner_address_id(partner_address_id, email_from)"/>
 
-                    <field name="priority" string="Priority"/>
-                    <newline/>
-                    <separator colspan="4" string="Lead Details"/>
+                    <separator colspan="4" string="Status and Categarization"/>
+                    <group colspan="4" col="6">
+                        <field name="user_id" select="2"/>
+                        <label string="Status: " align="1.0"/>
+                        <group colspan="1" col="2">
+                            <field name="stage_id" select="1" nolabel="1"/>
+                            <button icon="gtk-go-forward" string="" name="stage_next" type="object"/>
+                        </group>
+                        <field name="categ_id" select="1" on_change="onchange_categ_id(categ_id)" string="Lead Source" widget="selection" domain="[('object_id.model', '=', 'crm.opportunity')]"/>
+                   
+                        <field name="type_id" string="Campaign" select="1"/>
+                        <field name="section_id" colspan="1" widget="selection"/>
+                        <field name="priority" string="Priority"/>
+        
+                        <field name="create_date"/>
+	                </group>
+                    <separator colspan="4" string="Details"/>
                     <field name="description" nolabel="1" colspan="4"/>
 
                     <separator colspan="4"/>
@@ -115,14 +116,12 @@
         <field name="model">crm.lead</field>
         <field name="type">tree</field>
         <field name="arch" type="xml">
-            <tree string="Leads Tree"  colors="red:state=='open';black:state in ('draft', 'pending');grey: state in ('cancel','done')">
-                <field name="id"/>
-                <field name="name" string="Lead Subject"/>
-                <field name="partner_phone"/>
-                <field name="partner_name2" string="Contact Name"/>
-                <field name="stage_id"/>
+            <tree string="Leads Tree"  colors="red:state=='open';black:state in ('draft', 'pending');grey: state in ('cancel','done')">                
+                <field name="partner_name" string="Lead Name"/>
+                <field name="stage_id" string="Status"/>
+                <field name="create_date"/>
                 <field name="categ_id" string="Lead Source"/>
-                <field name="type_id" string="Campaign Type"/>
+                <field name="email_from" string="Email"/>
                 <field name="user_id"/>
                 <field name="state"/>
                 <button name="case_open" string="Open" states="draft,pending" type="object"  icon="gtk-go-forward"/>
diff --git a/addons/crm/crm_opportunity.py b/addons/crm/crm_opportunity.py
index 4e2e6902f7f..9a90eb8ccd7 100644
--- a/addons/crm/crm_opportunity.py
+++ b/addons/crm/crm_opportunity.py
@@ -44,6 +44,7 @@ class crm_opportunity(osv.osv):
         'ref2' : fields.reference('Reference 2', selection=crm._links_get, size=128),
         'date_closed': fields.datetime('Closed', readonly=True),
         'phonecall_id':fields.many2one ('crm.phonecall', 'Phonecall'),
+        'partner_phone': fields.char('Phone', size=32),
     }
 
 crm_opportunity()
diff --git a/addons/crm/crm_opportunity_view.xml b/addons/crm/crm_opportunity_view.xml
index 0268ffc0b3c..8e7f17fcfff 100644
--- a/addons/crm/crm_opportunity_view.xml
+++ b/addons/crm/crm_opportunity_view.xml
@@ -39,37 +39,47 @@
         <field name="type">form</field>
         <field name="arch" type="xml">
             <form string="Opportunities">
-                <group colspan="4" col="7">
-                    <field name="name" select="1" string="Opportunity" colspan="2"/>
-                    <field name="section_id" colspan="1" widget="selection"/>
-                    <field name="user_id" select="2" string="Responsible"/>
-					<button string="Schedule a Meeting"
+                <group colspan="4" col="5">                    
+                    <field name="name" select="1" string="Opportunity" colspan="4"/>
+                    <button string="Schedule a Meeting"
                         name="%(wizard_crm_opportunity_meeting_set)d" icon="gtk-redo" type="action" />
-                        <newline/>
+                    <newline/>
+                    <field name="planned_revenue" required="1"/>
+                    <field name="planned_cost"/>
+                    <button string="Schedule a Phone Call"
+                        name="%(wizard_crm_opportunity_reschedule_phone_call)d" icon="gtk-redo" type="action"  />
+                    <newline/>
+                    <field name="probability"/>
+                    <field name="date_deadline" string="Excepted Close Date"/>
+                    
+                </group>
+                <notebook colspan="4">
+                <page string="Opportunity">
+                    <separator colspan="4" string="Communication"/>                    
+                    <field name="partner_id" select="1" on_change="onchange_partner_id(partner_id, email_from)" colspan="2"/>
+                    <field name="partner_address_id" string="Contact" on_change="onchange_partner_address_id(partner_address_id, email_from)" colspan="1"/>
+                    <field name="email_from" colspan="2" string="Email"/>
+                    <field name="partner_phone" colspan="2"/>
+
+                    <separator colspan="4" string="Status and Categarization"/>
+                    <group colspan="4" col="6">
+                        <field name="user_id" select="2" string="Responsible"/>
                         <label string="Sales Stage: " align="1.0"/>
                         <group colspan="1" col="2">
                         <field name="stage_id" select="1" nolabel="1"/>
                         <button icon="gtk-go-forward" string="" name="stage_next" type="object"/>
                         </group>
-                    <field name="date" />
-                    <field name="date_deadline"/>
-                    <button string="Schedule a Phone Call"
-                        name="%(wizard_crm_opportunity_reschedule_phone_call)d" icon="gtk-redo" type="action"  />
-                </group>
-                <notebook colspan="4">
-                <page string="Description">
-                    <field name="partner_id" select="1" on_change="onchange_partner_id(partner_id, email_from)" colspan="2"/>
-                    <field name="partner_address_id" string="Contact" on_change="onchange_partner_address_id(partner_address_id, email_from)" colspan="1"/>
-                    <field name="email_from" colspan="2"/>
-                    <field name="categ_id" select="1" on_change="onchange_categ_id(categ_id)" string="Source"/>
-                    <field name="priority" string="Priority"/>
-                    <field name="type_id" select="1" string="Type"/>
-                    <separator colspan="4" string="Estimates"/>
-                    <field name="planned_revenue"/>
-                    <field name="planned_cost"/>
-                    <field name="probability"/>
-                    <separator colspan="4" string="Description Information"/>
-                        <field name="description" nolabel="1" colspan="4"/>
+                        <field name="categ_id" select="1" on_change="onchange_categ_id(categ_id)" string="Lead Source" widget="selection" domain="[('object_id.model', '=', 'crm.opportunity')]"/>
+                        <field name="type_id" select="1" string="Campaign"/>
+                        <field name="section_id" colspan="1" widget="selection"/>
+                        <field name="priority" string="Priority"/>
+                    
+                    </group>
+                    
+                    
+                    
+                    <separator colspan="4" string="Details"/>
+                    <field name="description" nolabel="1" colspan="4"/>
 
                     <separator colspan="4"/>
                     <group col="8" colspan="4">