diff --git a/addons/account/partner_view.xml b/addons/account/partner_view.xml
index 5d9bbb7e9b0..2d97f1581ca 100644
--- a/addons/account/partner_view.xml
+++ b/addons/account/partner_view.xml
@@ -70,8 +70,8 @@
             <field name="priority">2</field>
             <field name="inherit_id" ref="base.view_partner_form"/>
             <field name="arch" type="xml">
-                <notebook>
-                <page string="Accounting" position="inside">
+                <page string="Notes" position="before">
+                <page string="Accounting">
                     <group col="2" colspan="2">
                         <separator string="Customer Accounting Properties" colspan="2"/>
                         <field name="property_account_receivable" groups="account.group_account_user" />
@@ -119,7 +119,7 @@
                         </tree>
                     </field>
                 </page>
-                </notebook>
+                </page>
             </field>
         </record>
 
diff --git a/addons/crm/__openerp__.py b/addons/crm/__openerp__.py
index 5dcb655e8db..6e7a8edb807 100644
--- a/addons/crm/__openerp__.py
+++ b/addons/crm/__openerp__.py
@@ -69,7 +69,6 @@ Create dashboard for CRM that includes:
         'crm_opportunity_data.xml',
         'crm_phonecall_data.xml',
     ],
-
     'update_xml': [
         'wizard/crm_lead_to_partner_view.xml',
         'wizard/crm_lead_to_opportunity_view.xml',
diff --git a/addons/crm/wizard/crm_send_email_view.xml b/addons/crm/wizard/crm_send_email_view.xml
index f56bf5e6a88..c0125014c1a 100644
--- a/addons/crm/wizard/crm_send_email_view.xml
+++ b/addons/crm/wizard/crm_send_email_view.xml
@@ -9,13 +9,15 @@
             <field name="model">crm.send.mail</field>
             <field name="type">form</field>
             <field name="arch" type="xml">
-                <form string="Send New Mail" col="2">
-                	<separator string="Send New Mail" colspan="2"/>
+                <form string="Send New Mail" col="4">
+                    <separator string="Send New Mail" colspan="4"/>
+                    <group colspan="4" col="6">
                     <field name="email_from" />
                     <field name="email_to"  />
                     <field name="email_cc" />
-                    <field name="subject" />
-                    <notebook colspan="2">
+                    <field name="subject" colspan="6"/>
+                    </group>
+                    <notebook colspan="6">
                         <page string="Message">
                             <field name="text" nolabel="1" colspan="4"/>
                         </page>
@@ -31,8 +33,8 @@
                             </field>
                         </page>
                     </notebook>
-                    <separator string="" colspan="2"/>
-                    <group colspan="2" col="4" >
+                    <separator string="" colspan="6"/>
+                    <group colspan="6" col="4" >
                         <field name="state" />
                         <button name="action_cancel" string="_Cancel" icon="gtk-cancel" special="cancel" />
                         <button name="action_send" type="object" string="_Send" icon="gtk-go-forward" />
diff --git a/addons/sale/sale.py b/addons/sale/sale.py
index f18f142b061..b7229fcef46 100644
--- a/addons/sale/sale.py
+++ b/addons/sale/sale.py
@@ -204,7 +204,8 @@ class sale_order(osv.osv):
         return result.keys()
 
     _columns = {
-        'name': fields.char('Order Reference', size=64, required=True, select=True),
+        'name': fields.char('Order Reference', size=64, required=True,
+            readonly=True, states={'draft': [('readonly', False)]}, select=True),
         'shop_id': fields.many2one('sale.shop', 'Shop', required=True, readonly=True, states={'draft': [('readonly', False)]}),
         'origin': fields.char('Source document', size=64, help="Reference of the document that generated this sale order request."),
         'client_order_ref': fields.char('Customer Reference', size=64),