diff --git a/addons/website_customer/controllers/main.py b/addons/website_customer/controllers/main.py
index 8da41e9a8b7..d2bfddb3b86 100644
--- a/addons/website_customer/controllers/main.py
+++ b/addons/website_customer/controllers/main.py
@@ -70,10 +70,10 @@ class WebsiteCustomer(http.Controller):
         }
         return request.website.render("website_customer.index", values)
 
-    @website.route(['/customers/<model("res.partner"):partner_id>/'], type='http', auth="public", multilang=True)
-    def customer(self, partner_id=None, **post):
+    @website.route(['/customers/<model("res.partner"):partner>/'], type='http', auth="public", multilang=True)
+    def customer(self, partner=None, **post):
         """ Route for displaying a single partner / customer. """
         values = {
-            'partner_id': partner_id
+            'partner': partner
         }
         return request.website.render("website_customer.details", values)
diff --git a/addons/website_customer/views/website_customer.xml b/addons/website_customer/views/website_customer.xml
index 92fe500e3d1..797f1e433db 100644
--- a/addons/website_customer/views/website_customer.xml
+++ b/addons/website_customer/views/website_customer.xml
@@ -98,20 +98,20 @@
                     <div class="col-md-5">
                         <ol class="breadcrumb">
                             <li><a href="/customers">Our References</a></li>
-                            <li class="active" t-field="partner_id.name"/>
+                            <li class="active" t-field="partner.name"/>
                         </ol>
                     </div>
                     <div class="col-md-7">
-                        <t t-call="website.publish_management"><t t-set="object" t-value="partner_id"/></t>
+                        <t t-call="website.publish_management"><t t-set="object" t-value="partner"/></t>
                     </div>
                 </div>
                 <div class="oe_structure"/>
                 <div class="row">
                     <div class="col-md-12">
-                        <h1 class="text-center" t-field="partner_id.name"/>
+                        <h1 class="text-center" t-field="partner.name"/>
                     </div>
                     <div class="col-md-9">
-                        <div t-field="partner_id.website_description"/>
+                        <div t-field="partner.website_description"/>
                     </div>
                     <div class="col-md-3" id="ref_right_column">
                     </div>
@@ -130,18 +130,18 @@
                 </div>
                 <div class="panel-body">
                     <div class="text-center">
-                        <img t-att-src="partner_id.img('image')" class="img img-shadow"/>
+                        <img t-att-src="partner.img('image')" class="img img-shadow"/>
                     </div>
                     <address class="mt16 mb8">
-                        <strong t-field="partner_id.name"/>
-                        <p t-field="partner_id.commercial_partner_id"/>
-                        <div t-if="partner_id.phone">
-                            <span class="icon-phone"/> <span t-field="partner_id.phone"/>
+                        <strong t-field="partner.name"/>
+                        <p t-field="partner.commercial_partner_id"/>
+                        <div t-if="partner.phone">
+                            <span class="icon-phone"/> <span t-field="partner.phone"/>
                         </div>
-                        <div t-if="partner_id.email">
+                        <div t-if="partner.email">
                             <span class="icon-envelope"/>
-                            <a t-att-href="'mailto:'+partner_id.email">
-                              <span t-field="partner_id.email"/>
+                            <a t-att-href="'mailto:'+partner.email">
+                              <span t-field="partner.email"/>
                             </a>
                         </div>
                     </address>
diff --git a/addons/website_customer_crm_partner_assign/views/website_customer.xml b/addons/website_customer_crm_partner_assign/views/website_customer.xml
index b1949f5ccbc..793c2469165 100644
--- a/addons/website_customer_crm_partner_assign/views/website_customer.xml
+++ b/addons/website_customer_crm_partner_assign/views/website_customer.xml
@@ -2,30 +2,46 @@
 <openerp>
 <data>
 
-    <template id="partner_assign" inherit_id="website_customer.index" name="Partner Assignation">
-        <xpath expr="//div[@t-field='partner.website_short_description']" position="after">
+    <template id="partner_assign" inherit_option_id="website_customer.details" inherit_id="website_customer.details" name="Implemented By">
+        <xpath expr="//div[@id='ref_right_column']" position="inside">
             <t t-if="partner.assigned_partner_id">
-                <small>Implemented by 
-                    <a t-href="/customers/#{ partner.assigned_partner_id.id }">
-                        <t t-esc="partner.assigned_partner_id.name"/>
-                    </a>
-                </small>
-            </t>
-            <t t-if="partner.implemented_partner_ids">
-                <small>
-                    <a t-href="/customers/#{ partner.id }#references">
-                        <t t-esc="len(partner.implemented_partner_ids)"/> references
-                    </a>
-                </small>
+                <div class="panel panel-default">
+                    <div class="panel-heading">
+                        <h4>Implemented By</h4>
+                    </div>
+                    <div class="panel-body">
+                        <div class="text-center">
+                            <img t-att-src="partner.assigned_partner_id.img('image')" class="img img-shadow"/>
+                        </div>
+                        <address class="mt16 mb8">
+                            <strong t-field="partner.assigned_partner_id.name"/>
+                            <p t-field="partner.assigned_partner_id"/>
+                            <div t-if="partner.assigned_partner_id.phone">
+                                <span class="icon-phone"/> <span t-field="partner.assigned_partner_id.phone"/>
+                            </div>
+                            <div t-if="partner.assigned_partner_id.email">
+                                <span class="icon-envelope"/>
+                                <a t-att-href="'mailto:'+partner.assigned_partner_id.email">
+                                  <span t-field="partner.assigned_partner_id.email"/>
+                                </a>
+                            </div>
+                        </address>
+                        <div>
+                            <a t-href="/customers/#{ partner.id }#references" t-if="partner.implemented_partner_ids">
+                                <t t-esc="len(partner.implemented_partner_ids)"/> references
+                            </a>
+                        </div>
+                    </div>
+                </div>
             </t>
         </xpath>
     </template>
 
     <template id="references" inherit_id="website_customer.details" name="Partner References">
-        <xpath expr="//div[@t-field='partner_id.website_description']" position="after">
+        <xpath expr="//div[@t-field='partner.website_description']" position="after">
             <h3 id="references">References</h3>
             <div>
-                <div t-foreach="partner_id.implemented_partner_ids" t-as="partner" class="media thumbnail" data-publish="">
+                <div t-foreach="partner.implemented_partner_ids" t-as="partner" class="media thumbnail" data-publish="">
                     <t t-call="website.publish_management"><t t-set="object" t-value="partner"/></t>
                     <a class="pull-left" t-attf-href="/customers/#{ partner.id }/">
                         <img class="media-object" t-att-src="partner.img('image_small')"/>