diff --git a/addons/website_crm_partner_assign/controllers/main.py b/addons/website_crm_partner_assign/controllers/main.py
index c9621b7a0e9..3dd96798d09 100644
--- a/addons/website_crm_partner_assign/controllers/main.py
+++ b/addons/website_crm_partner_assign/controllers/main.py
@@ -100,11 +100,14 @@ class WebsiteCrmPartnerAssign(http.Controller):
         # search partners matching current search parameters
         partner_ids = partner_obj.search(
             request.cr, SUPERUSER_ID, base_partner_domain,
-            offset=pager['offset'], limit=self._references_per_page,
-            order="grade_id DESC, partner_weight DESC",
-            context=request.context)
-        google_map_partner_ids = ','.join(map(str, partner_ids))
+            order="grade_id DESC",
+            context=request.context)  # todo in trunk: order="grade_id DESC, implemented_count DESC", offset=pager['offset'], limit=self._references_per_page
         partners = partner_obj.browse(request.cr, SUPERUSER_ID, partner_ids, request.context)
+        # remove me in trunk
+        partners.sort(key=lambda x: (-1 * (x.grade_id and x.grade_id.id or 0), len(x.implemented_partner_ids)), reverse=True)
+        partners = partners[pager['offset']:pager['offset'] + self._references_per_page]
+
+        google_map_partner_ids = ','.join(map(str, [p.id for p in partners]))
 
         values = {
             'countries': countries,
diff --git a/addons/website_crm_partner_assign/views/website_crm_partner_assign.xml b/addons/website_crm_partner_assign/views/website_crm_partner_assign.xml
index b43f7c1538a..b215a14e6cb 100644
--- a/addons/website_crm_partner_assign/views/website_crm_partner_assign.xml
+++ b/addons/website_crm_partner_assign/views/website_crm_partner_assign.xml
@@ -64,13 +64,16 @@
 
             </div>
             
-            <div class="col-md-9" id="ref_content">
-                <div class="pull-right">
-                    <form action="" method="get" class="navbar-search pull-right pagination form-inline">
-                        <div class="form-group">
-                            <input type="text" name="search" class="search-query col-md-2 mt4 form-control" placeholder="Search" t-att-value="searches.get('search', '')"/>
-                        </div>
-                    </form>
+            <div class="col-md-8 col-md-offset-1" id="ref_content">
+                <div class='navbar'>
+                    <div>
+                        <t t-call="website.pager"/>
+                        <form action="" method="get" class="navbar-search pull-right pagination form-inline">
+                            <div class="form-group pull-right">
+                                <input type="text" name="search" class="search-query col-md-2 mt4 form-control" placeholder="Search" t-att-value="searches.get('search', '')"/>
+                            </div>
+                        </form>
+                    </div>
                 </div>
                 <div>
                     <p t-if="not partners">No result found</p>
@@ -91,6 +94,11 @@
                                     <span t-field="partner.display_name"/>
                                 </a>
                                 <div t-field="partner.website_short_description"/>
+                                <t t-if="any([p.website_published for p in partner.implemented_partner_ids])">
+                                    <small><a t-attf-href="/partners/#{slug(partner)}#right_column">
+                                        <t t-raw="len([p for p in partner.implemented_partner_ids if p.website_published])"/> reference(s)
+                                    </a></small>
+                                </t>
                             </div>
                         </div>
                     </t>
@@ -118,7 +126,11 @@
 <template id="partner" name="Partner Detail">
     <t t-call="website_crm_partner_assign.layout">
         <t t-set="ref_content">
-            <t t-call="website_partner.partner_detail"/>
+            <t t-call="website_partner.partner_detail">
+                <t t-set="right_column">
+                    <div id="right_column" class="mb16"><t t-call="website_customer.references_block"/></div>
+                </t>
+            </t>
         </t>
     </t>
 </template>
@@ -130,5 +142,24 @@
   </xpath>
 </template>
 
+<template id="references_block" name="Partner References Block">
+    <t t-if="any([p.website_published for p in partner.implemented_partner_ids])">
+        <h3 id="references">References</h3>
+        <div t-foreach="partner.implemented_partner_ids" t-as="reference" class="media">
+          <t t-if="reference.website_published">
+            <a class="pull-left" t-attf-href="/customers/#{slug(reference)}">
+                <span t-field="reference.image_small" t-field-options='{"widget": "image", "class": "center-block"}'/>
+            </a>
+            <div class="media-body" style="min-height: 64px;">
+                <a class="media-heading" t-attf-href="/customers/#{slug(reference)}">
+                    <span t-field="reference.self"/>
+                </a>
+                <div t-field='reference.website_short_description'/>
+            </div>
+          </t>
+        </div>
+    </t>
+</template>
+
 </data>
 </openerp>
diff --git a/addons/website_customer/__openerp__.py b/addons/website_customer/__openerp__.py
index c0b620f78e1..c6d26dad04a 100644
--- a/addons/website_customer/__openerp__.py
+++ b/addons/website_customer/__openerp__.py
@@ -30,8 +30,9 @@ OpenERP Customer References
 """,
     'author': 'OpenERP SA',
     'depends': [
+        'crm_partner_assign',
         'website_partner',
-        'website_google_map'
+        'website_google_map',
     ],
     'demo': [
         'website_customer_demo.xml',
diff --git a/addons/website_customer/views/website_customer.xml b/addons/website_customer/views/website_customer.xml
index a2a5fc99c16..a41d5b77f5a 100644
--- a/addons/website_customer/views/website_customer.xml
+++ b/addons/website_customer/views/website_customer.xml
@@ -25,7 +25,7 @@
                 <div class="row">
                     <div class="col-md-3 mb32" id="ref_left_column">
                     </div>
-                    <div class="col-md-9" id="ref_content">
+                    <div class="col-md-8 col-md-offset-1" id="ref_content">
                         <div class='navbar mb0'>
                             <t t-call="website.pager">
                                <t t-set="classname" t-value="'pull-left'"/>
diff --git a/addons/website_partner/views/website_partner_view.xml b/addons/website_partner/views/website_partner_view.xml
index 3a2466fb00b..32c1aa63bd3 100644
--- a/addons/website_partner/views/website_partner_view.xml
+++ b/addons/website_partner/views/website_partner_view.xml
@@ -23,7 +23,7 @@
     </t>
     <h1 class="col-md-12 text-center" id="partner_name" t-field="partner.display_name"/>
     <div class="col-md-4">
-        <div t-field="partner.image" t-field-options='{"widget": "image", "class": "center-block"}'/>
+        <div t-field="partner.image" t-field-options='{"widget": "image", "class": "center-block mb16"}'/>
         <address class="well">
              <div t-field="partner.self" t-field-options='{
                  "widget": "contact",