diff --git a/addons/website_crm_partner_assign/controllers/main.py b/addons/website_crm_partner_assign/controllers/main.py
index c9621b7a0e9..86018ecd04d 100644
--- a/addons/website_crm_partner_assign/controllers/main.py
+++ b/addons/website_crm_partner_assign/controllers/main.py
@@ -101,7 +101,7 @@ class WebsiteCrmPartnerAssign(http.Controller):
         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",
+            order="grade_id DESC, implemented_count DESC",
             context=request.context)
         google_map_partner_ids = ','.join(map(str, partner_ids))
         partners = partner_obj.browse(request.cr, SUPERUSER_ID, partner_ids, request.context)
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 aa617c266bf..0dbfcdb15fc 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
@@ -29,12 +29,6 @@
     <t t-call="website_crm_partner_assign.layout">
         <t t-set="ref_content">
             <div class="col-md-12">
-
-                <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>
                 <h1 class="text-center">
                     Looking For a Local Store?
                 </h1><h2 class="text-center text-muted">
@@ -70,7 +64,17 @@
 
             </div>
             
-            <div class="col-md-9" id="ref_content">
+            <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>
                     <t t-foreach="partners" t-as="partner">
@@ -90,9 +94,9 @@
                                     <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])">
+                                <t t-if="partner.implemented_count">
                                     <small><a t-attf-href="/partners/#{slug(partner)}#right_column">
-                                        <t t-raw="len([p.website_published for p in partner.implemented_partner_ids])"/> reference(s)
+                                        <t t-raw="partner.implemented_count"/> reference(s)
                                     </a></small>
                                 </t>
                             </div>