diff --git a/addons/crm/crm_claims_view.xml b/addons/crm/crm_claims_view.xml
index 86387ec015d..fecf8ae8ee3 100644
--- a/addons/crm/crm_claims_view.xml
+++ b/addons/crm/crm_claims_view.xml
@@ -50,37 +50,49 @@
         <field name="type">form</field>
         <field name="arch" type="xml">
             <form string="Claims">
-                <group colspan="4" col="6">
+                <group colspan="4" col="4">
                     <field name="name"/>
-                    <field name="partner_id"/>
-                    <field name="user_id" string="Responsible" select="2"/>
-                    <newline/>
-                    <field name="section_id" widget="selection"/>
                     <field name="date" string="Date of Claim"/>
-                    <field name="categ_id" string="Type of claim" select="1" on_change="onchange_categ_id(categ_id)"/>
-                    <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="planned_cost" string="Claim Cost"/>
                 </group>
+                <group colspan="4" col="4">
                 <notebook>
                 <page string="Claims Info">
-                    <field name="partner_address_id" string="Contact" on_change="onchange_partner_address_id(partner_address_id, email_from)" colspan="1"/>
-                    <field name="email_from"/>
-                    <field name="partner_phone"/>
-                    <field name="partner_mobile"/>
-                    <newline/>
-                    <field name="planned_cost" string="Claim Cost"/>
-                    <field name="probability"/>
-                    <newline/>
-                    <field name="priority"/>
-                    <field name="type_id" string="Type of Action" select="1"/>
-                    <field name="ref"/>
-                    <field name="ref2"/>
+                	<separator colspan="4" string="Communication"/>
+                	<group colspan="4" col="4">
+                		<field name="partner_id" string="Partner"
+                        	on_change="onchange_partner_id(partner_id)" />
+	                    <field name="partner_address_id" string="Contact"
+	                    	on_change="onchange_partner_address_id(partner_address_id, email_from)" />
+	                    <field name="partner_phone"/>
+	                    <field name="partner_mobile"/>
+	                    <field name="email_from"/>
+	                </group>
+                    <separator colspan="4" string="Status and Categarization"/>
+                    <group colspan="4" col="6">
+                    	<field name="user_id" string="Responsible" select="2"/>
+                    	<field name="section_id" widget="selection"/>
+                    	<field name="probability"/>
+                    	<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" widget="selection"
+                    		on_change="onchange_categ_id(categ_id)"
+                    		domain="[('object_id.model', '=', 'crm.claim')]" />
+                    	<field name="type_id" string="Type of Action" select="1"
+                    		domain="[('object_id.model', '=', 'crm.claim')]" />
+                    	<field name="priority"/>
+                    </group>
+                    <separator colspan="4" string="References"/>
+                    <group colspan="4" col="4">
+	                    <field name="ref"/>
+	                    <field name="ref2"/>
+                    </group>
                     <separator colspan="4" string="Claim/Action Description"/>
                     <field name="description" colspan="4" nolabel="1"/>
-                    <separator colspan="4" string="Status"/>
+                    <separator colspan="4" string=""/>
                     <group col="8" colspan="4">
                         <field name="state" select="1"/>
                         <button name="case_close" string="Done" states="open,draft,pending" type="object" icon="gtk-jump-to"/>
@@ -90,7 +102,7 @@
                         <button name="case_reset" string="Reset to Draft" states="done,cancel" type="object" icon="gtk-convert"/>
                     </group>
                 </page>
-                <page string="History">
+                <page string="History" groups="base.group_extended">
                     <field name="id" select="1"/>
                     <field name="active"/>
                     <field name="canal_id"/>
@@ -139,6 +151,7 @@
                     <button colspan="4" string="Send New Email" name="%(crm.wizard_crm_new_send_mail)d" context="{'mail':'new'}" icon="gtk-go-forward" type="action"/>
                  </page>
                 </notebook>
+                </group>
             </form>
         </field>
     </record>
diff --git a/addons/crm/crm_fund_view.xml b/addons/crm/crm_fund_view.xml
index 077b45af6ff..b172add3df0 100644
--- a/addons/crm/crm_fund_view.xml
+++ b/addons/crm/crm_fund_view.xml
@@ -60,25 +60,32 @@
         <field name="arch" type="xml">
             <form string="Funds Form">
                 <group colspan="4" col="6">
-                    <field name="name" select="1" string="Name" colspan="2"/>
+                    <field name="name" select="1" string="Name" colspan="4"/>
                     <field name="section_id" colspan="1" widget="selection"/>
-                    <field name="categ_id" select="1" on_change="onchange_categ_id(categ_id)"/>
-                    <newline/>
-                    <field name="date" string="Next Meeting"/>
-                    <field name="duration"/>
-                    <field name="type_id" select="1" string="Payment Mode"/>
+                    <field name="type_id" string="Payment Mode" select="1" widget="selection"
+                    		domain="[('object_id.model', '=', 'crm.fundraising')]" />
                 </group>
                 <notebook colspan="4">
                 <page string="Funds">
-                    <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"/>
-                    <newline/>
-                    <field name="email_from" colspan="2"/>
-                    <field name="user_id" select="2" string="Responsible"/>
+                	<separator colspan="4" string="Communication"/>
+                	<group colspan="4" col="4">
+	                    <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"/>
+                    </group>
                     <separator colspan="4" string="Estimates"/>
                     <field name="planned_cost"/>
                     <field name="planned_revenue"/>
                     <field name="probability"/>
+                    <separator colspan="4" string="Status and Categarization"/>
+                    <group colspan="4" col="6">
+                    	<field name="user_id" select="2" string="Responsible"/>
+                    	<field name="categ_id" select="1"
+                    		on_change="onchange_categ_id(categ_id)"  widget="selection"
+                    		domain="[('object_id.model', '=', 'crm.fundraising')]" />
+                    	<field name="date"/>
+	                    <field name="duration"/>
+                    </group>
                     <separator colspan="4" string="Description Information"/>
                         <field name="description" nolabel="1" colspan="4"/>
                     <separator colspan="4"/>
@@ -92,7 +99,7 @@
                         <button name="case_reset" string="Reset to Draft" states="done,cancel" type="object"  icon="gtk-convert"/>
                     </group>
                 </page>
-                <page string="History">
+                <page string="History" groups="base.group_extended">
                     <field name="id" select="1"/>
                     <field name="active"/>
                     <field name="priority" string="Priority"/>
@@ -119,7 +126,7 @@
                         </form>
                     </field>
                 </page>
-                 <page string="Emails">
+                 <page string="Emails" groups="base.group_extended">
                    <group colspan="4">
                        <field colspan="4" name="email_cc" string="CC"/>
                    </group>
diff --git a/addons/crm/crm_helpdesk_view.xml b/addons/crm/crm_helpdesk_view.xml
index 71274822f9c..6773bb160c6 100644
--- a/addons/crm/crm_helpdesk_view.xml
+++ b/addons/crm/crm_helpdesk_view.xml
@@ -35,6 +35,7 @@
                 </group>
                 <notebook colspan="4">
                     <page string="General">
+                    	<separator colspan="4" string="Communication"/>
                         <group col="8" colspan="4">
                             <field colspan="4" name="partner_id" on_change="onchange_partner_id(partner_id, email_from)" select="1"/>
                             <field colspan="3" name="partner_address_id" on_change="onchange_partner_address_id(partner_address_id, email_from)" select="2"/>
@@ -58,7 +59,7 @@
                             <button name="case_reset" states="done,cancel" string="Reset to Draft" type="object" icon="gtk-convert"/>
                         </group>
                     </page>
-                    <page string="History">
+                    <page string="History" groups="base.group_extended">
                         <field name="id" select="1"/>
                         <field name="active" select="2"/>
                         <field name="categ_id" on_change="onchange_categ_id(categ_id)" select="2"/>
@@ -86,7 +87,7 @@
                             </form>
                         </field>
                     </page>
-                    <page string="Emails">
+                    <page string="Emails" groups="base.group_extended">
                        <group colspan="4">
                            <field colspan="4" name="email_cc" string="CC"/>
                        </group>
diff --git a/addons/crm/crm_lead_view.xml b/addons/crm/crm_lead_view.xml
index b865bb5a1d0..a8e8c2cd3bb 100644
--- a/addons/crm/crm_lead_view.xml
+++ b/addons/crm/crm_lead_view.xml
@@ -46,7 +46,7 @@
                     <group colspan="4" col="4">
                     <notebook>
                     <page string="Leads">
-                        <separator colspan="4" string="Communication"/>                                                                        
+                        <separator colspan="4" string="Communication"/>
                         <field name="partner_id" string="Partner"
                         	on_change="onchange_partner_id(partner_id)" />
                         <field name="partner_address_id"
@@ -58,17 +58,17 @@
                         <group colspan="4" col="6">
                             <field name="user_id" select="2"/>                                                        
                             <field name="stage_id" select="1" string="Status" widget="selection" domain="[('object_id.model', '=', 'crm.lead')]"/>                                
-                            <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="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="date" string="Create Date"/>
 	                    </group>
                         <separator colspan="4" string="Details"/>
                         <field name="description" nolabel="1" colspan="4"/>
-
                         <separator colspan="4"/>
                         <group col="8" colspan="4">
                             <field name="state" select="2"/>
@@ -105,13 +105,13 @@
                                 <field name="date"/>
                             </tree>
                         </field>
-                        <button colspan="4" string="Send New Email" name="%(crm.wizard_crm_new_send_mail)d" context="{'mail':'new'}" icon="gtk-go-forward" type="action"/>
+                        <button colspan="4" string="Send New Email"
+                        	name="%(crm.wizard_crm_new_send_mail)d"
+                        	context="{'mail':'new'}" icon="gtk-go-forward"
+                        	type="action" />
                      </page>
                     </notebook>
                     </group>
-
-                
-
             </form>
         </field>
     </record>
diff --git a/addons/crm/crm_meeting_view.xml b/addons/crm/crm_meeting_view.xml
index 07bdd9438cd..08f55ade474 100644
--- a/addons/crm/crm_meeting_view.xml
+++ b/addons/crm/crm_meeting_view.xml
@@ -115,8 +115,8 @@
             <tree string="Meetings Tree"  colors="red:state=='open';black:state in ('draft', 'cancel','done','pending')">
                 <field name="id" widget="char"/>
                 <field name="name" string="Title"/>
-                <field name="date" string="Next Meeting"/>
-                <field name="section_id" widget="selection"/>
+                <field name="date" string="Meeting Date"/>
+                <field name="section_id" />
                 <field name="priority"/>
                 <field name="categ_id"/>
                 <field name="user_id"/>
@@ -162,7 +162,7 @@
             	<search string="Search Meetings">
                		<group col="12" colspan="4">
                			<filter icon="terp-crm" string="My Meetings" domain="[('user_id','=',uid)]" help="My Meetings"/>
-	               		<filter icon="terp-crm" string="Draft" domain="[('state','in',('draft', 'open'))]" default="1" help="Current Meetings"/>
+	               		<filter icon="terp-crm" string="Current" domain="[('state','in',('draft', 'open'))]" default="1" help="Current Meetings"/>
 	                    <filter icon="terp-crm" string="Confirmed" domain="[('state','=','done')]" help="Confirmed Meetings"/>
 	               		<separator orientation="vertical"/>
 	               		<field name="name" select="1" string="Subject"/>
diff --git a/addons/crm/crm_opportunity_view.xml b/addons/crm/crm_opportunity_view.xml
index 5cb39d37119..4916fbe174a 100644
--- a/addons/crm/crm_opportunity_view.xml
+++ b/addons/crm/crm_opportunity_view.xml
@@ -91,7 +91,7 @@
                     </group>
                 </page>
 
-                <page string="History">
+                <page string="History" groups="base.group_extended">
                     <field name="active"/>
                     <field name="canal_id"/>
                     <field name="som"/>
@@ -116,7 +116,7 @@
                         </form>
                     </field>
                 </page>
-                 <page string="Emails">
+                 <page string="Emails" groups="base.group_extended">
                    <group colspan="4">
                        <field colspan="4" name="email_cc" string="CC"/>
                    </group>
diff --git a/addons/crm/crm_phonecall_view.xml b/addons/crm/crm_phonecall_view.xml
index f64cf5fda54..9ae2533c85c 100644
--- a/addons/crm/crm_phonecall_view.xml
+++ b/addons/crm/crm_phonecall_view.xml
@@ -77,53 +77,64 @@
         <field name="model">crm.phonecall</field>
         <field name="type">form</field>
         <field name="arch" type="xml">
-            <form string="Phone Call">
-                <group colspan="4" col="4">
-                    <field name="name" string="Subject"/>
-                    <field name="section_id" colspan="1" widget="selection"/>
-                    <field name="user_id" string="Assigned to" select="2"/>
-                    <field name="date" string="Planned Date"/>
-                    <field name="duration"/>
-                    <field name="opportunity_id" on_change="onchange_case_id(case_id, name, partner_id)"
-                    context="{'default_name':name,'default_section_id':section_id,'default_user_id':user_id,'default_duration':duration,
-                           'default_partner_id':partner_id,'default_partner_address_id':partner_address_id,'default_partner_phone':partner_phone,
-	                          'default_partner_mobile':partner_mobile,'default_categ_id':categ_id}"/>
-					<newline/>
-					<group col="5" colspan="4">
-						<label string="" colspan="2"/>
-						<button string="Schedule a Meeting"
-	                        name="%(wizard_crm_phonecall_meeting_set)d" icon="gtk-redo" type="action" />
-	                    <button string="Convert to Opportunity" name="%(wizard_crm_phonecall_opportunity_set)d" icon="gtk-index" type="action" attrs="{'invisible':[('opportunity_id','!=',False)]}" />
-                	</group>
-                <notebook colspan="4">
-                <page string="General">
-                    <field name="categ_id" string="Direction" select="1" on_change="onchange_categ_id(categ_id)" required="1" readonly="1"/>
-                    <field name="active" string="Reminder"/>
-                    <group colspan="2" col="3">
-                        <field name="partner_id" string="Partner"/>
-                        <button string="Convert to Partner" icon="terp-crm" name="%(wizard_crm_phonecall_partner_create)d" type="action" attrs="{'invisible':[('partner_id','!=',False)]}"  />
-                    </group>
-                    <field name="partner_address_id" string="Contact"/>
-                    <field name="partner_phone"/>
-                    <field name="partner_mobile"/>
-                    <newline/>
-                    <field name="som"/>
-                    <field name="priority" string="Relevant"/>
-                    <separator string= "Description" colspan="4"/>
-                    <field name="description" nolabel="1" colspan="4"/>
-                    <separator colspan="4"/>
-                    <group col="8" colspan="4">
-                        <field name="state" select="1"/>
-                        <button name="case_cancel" string="Cancel" states="draft,open,pending" type="object" icon="gtk-cancel"/>
-                        <button name="case_open" string="Open" states="draft,pending" type="object" icon="gtk-go-forward"/>
-                        <button name="case_pending" string="Not Held" states="open" type="object" icon="gtk-undo"/>
-                        <button name="case_close" string="Held" states="open,draft,pending" type="object" icon="gtk-jump-to"/>
-                        <button name="case_reset" string="Reset to Draft" states="done,cancel" type="object" icon="gtk-convert"/>
-                    </group>
-                </page>
-               </notebook>
-               </group>
-           </form>
+        	<form string="Phone Call">
+        		<group colspan="4" col="4">
+        			<field name="name" string="Subject" />
+        			<field name="date" string="Planned Date" />
+        			<field name="partner_phone" />
+        			<field name="duration" />
+        			<newline />
+        			<group col="7" colspan="4">
+        				<label string="" colspan="2" />
+        				<button string="Schedule a Meeting"
+        					name="%(wizard_crm_phonecall_meeting_set)d" icon="gtk-redo"
+        					type="action" />
+        				<button string="Convert to Opportunity"
+        					name="%(wizard_crm_phonecall_opportunity_set)d"
+        					icon="gtk-index" type="action"
+        					attrs="{'invisible':[('opportunity_id','!=',False)]}" />
+        				<button string="Convert to Partner"
+        					icon="terp-crm"
+        					name="%(wizard_crm_phonecall_partner_create)d"
+        					type="action"
+        					attrs="{'invisible':[('partner_id','!=',False)]}" />
+        			</group>
+        			<group colspan="4" col="4">
+        				<notebook colspan="4">
+        					<page string="General">
+        						<separator colspan="4" string="Communication" />
+        						<field name="partner_id" />
+        						<field name="partner_address_id" string="Contact" />
+        						<field name="partner_mobile" />
+        						<separator colspan="4" string="Status and Categarization" />
+        						<group colspan="4" col="6">
+	        						<field name="user_id" string="Assigned to" select="2" />
+	        						<field name="section_id" colspan="1" widget="selection" />
+	        						<field name="opportunity_id"
+	        							on_change="onchange_case_id(case_id, name, partner_id)"
+	        							context="{'default_name':name,'default_section_id':section_id,'default_user_id':user_id,'default_duration':duration,
+                           					'default_partner_id':partner_id,'default_partner_address_id':partner_address_id,'default_partner_phone':partner_phone,
+	                          				'default_partner_mobile':partner_mobile,'default_categ_id':categ_id}" />
+	        						<field name="som" />
+	        						<field name="priority" />
+	        						<field name="active" string="Reminder" />
+	        					</group>
+	        					<separator string="Description" colspan="4" />
+	        					<field name="description" nolabel="1" colspan="4" />
+        						<separator colspan="4" />
+        						<group col="8" colspan="4">
+        							<field name="state" select="1" />
+        							<button name="case_cancel" string="Cancel" states="draft,open,pending" type="object" icon="gtk-cancel"/>
+			                        <button name="case_open" string="Open" states="draft,pending" type="object" icon="gtk-go-forward"/>
+			                        <button name="case_pending" string="Not Held" states="open" type="object" icon="gtk-undo"/>
+			                        <button name="case_close" string="Held" states="open,draft,pending" type="object" icon="gtk-jump-to"/>
+			                        <button name="case_reset" string="Reset to Draft" states="done,cancel" type="object" icon="gtk-convert"/>
+        						</group>
+        					</page>
+        				</notebook>
+        			</group>
+        		</group>
+        	</form>
         </field>
     </record>
 
diff --git a/addons/crm/crm_view.xml b/addons/crm/crm_view.xml
index fe29f3125d8..9996ed372ad 100644
--- a/addons/crm/crm_view.xml
+++ b/addons/crm/crm_view.xml
@@ -372,7 +372,7 @@
                                 <button name="case_reset" states="done,cancel" string="Reset to Draft" type="object" icon="gtk-convert"/>
                             </group>
                         </page>
-                        <page string="History">
+                        <page string="History" groups="base.group_extended">
                             <field name="id" select="1"/>
                             <field name="active" select="2"/>
                             <separator colspan="4" string="Dates"/>
@@ -390,7 +390,7 @@
                                 </form>
                             </field>
                         </page>
-                        <page string="Emails">
+                        <page string="Emails" groups="base.group_extended">
                            <group colspan="4">
                                <field colspan="4" name="email_cc" string="CC"/>
                            </group>