diff --git a/base_partner_surname/partner_view.xml b/base_partner_surname/partner_view.xml
index 205242e68..799d64407 100644
--- a/base_partner_surname/partner_view.xml
+++ b/base_partner_surname/partner_view.xml
@@ -21,35 +21,12 @@
         <field name="type">form</field>
         <field name="inherit_id" ref="base.view_partner_form"/>
         <field name="arch" type="xml">
-            <field name="address" position='replace'>
-            	<field colspan="4" mode="form,tree" name="address" nolabel="1" select="1" height="260">
-	            	<form string="Partner Contacts">
-	                     <field name="name" />
-							<field name="title" domain="[('domain', '=', 'contact')]"/>
-							<field name="first_name" select="1" on_change="onchange_name(first_name,last_name)"/>
-							<field name="last_name" select="1" on_change="onchange_name(first_name,last_name)"/>
-							<field name="function"/>
-							<field name="type" />
-							<newline/>
-							<field name="street" />
-							<field name="street2"/>
-							<newline/>
-							<field name="zip" />
-							<field name="city" />
-							<newline/>
-							<field name="country_id" />
-							<field name="state_id" />
-							<newline/>
-							<field name="phone"/>
-							<field name="fax"/>
-							<newline/>
-							<field name="mobile"/>
-							<field name="email"  widget="email" />
-	            	</form>
-	            </field>
-            </field>
+            <xpath expr="/form/notebook/page[@string='General']/field/form/group/field[@name='name']" position="before">
+                <field name="first_name" on_change="onchange_name(first_name,last_name)"/>
+                <field name="last_name" on_change="onchange_name(first_name,last_name)"/>
+                <newline />
+            </xpath>
         </field>
     </record>
-    
     </data>
 </openerp>