diff --git a/addons/website_account/views/account_templates.xml b/addons/website_account/views/account_templates.xml
index ad9cd8c46b6..0d0a1b98daa 100644
--- a/addons/website_account/views/account_templates.xml
+++ b/addons/website_account/views/account_templates.xml
@@ -1,19 +1,17 @@
 <odoo>
 	<template id="portal_my_home_menu_invoice" name="Portal layout : invoice menu entries" inherit_id="website_portal.portal_layout" priority="30">
-        <xpath expr="//ul[contains(@class,'o_portal_submenu')]" position="inside">
-            <li t-if="invoice_count" t-att-class="page_name == 'invoice' and 'active'">
-                <a href="/my/invoices">Invoices</a>		
-            </li>		
-        </xpath>		
+        <xpath expr="//ol[contains(@class,'o_portal_submenu')]" position="inside">
+            <li t-if="page_name == 'invoice'" class="active">
+                Invoices
+            </li>
+        </xpath>
     </template>
 
     <template id="portal_my_home_invoice" name="Portal My Home : invoice entries" inherit_id="website_portal.portal_my_home" priority="30">
         <xpath expr="//div[contains(@class,'o_my_home_content')]" position="inside">
             <h3 t-if="invoice_count" class="page-header">
-              <a href="/my/invoices">Your Invoices and Payments
-                <small class="ml8">
-                  <span class='badge'><t t-esc="invoice_count"/></span>
-                </small>
+              <a href="/my/invoices">My Invoices
+                <span class="badge ml8" t-esc="invoice_count"/>
               </a>
             </h3>
         </xpath>
@@ -22,7 +20,7 @@
     <template id="portal_my_invoices" name="My Invoices and Payments">
       <t t-call="website_portal.portal_layout">
         <div class="page-header">
-            <span class="h3">Your Invoices</span>
+            <span class="h3">My Invoices</span>
             <t t-call="website_portal.portal_searchbar"/>
         </div>
         <t t-if="not invoices">
diff --git a/addons/website_crm_partner_assign/views/website_crm_partner_assign_templates.xml b/addons/website_crm_partner_assign/views/website_crm_partner_assign_templates.xml
index c5db1490a02..8b92d401113 100644
--- a/addons/website_crm_partner_assign/views/website_crm_partner_assign_templates.xml
+++ b/addons/website_crm_partner_assign/views/website_crm_partner_assign_templates.xml
@@ -193,17 +193,29 @@
         </xpath>
     </template>
     <template id="portal_my_home_menu_lead" name="Portal layout : lead menu entry" inherit_id="website_portal.portal_layout" priority="15">
-        <xpath expr="//ul[contains(@class,'o_portal_submenu')]" position="inside">
-            <t t-if="user.commercial_partner_id.grade_id and lead_count">
-                <li t-att-class="page_name == 'lead' and 'active'">
-                     <a href="/my/leads">Leads</a>
-                </li>
-            </t>
-            <t t-if="user.commercial_partner_id.grade_id">
-                <li t-att-class="page_name == 'opportunity' and 'active'">
-                     <a href="/my/opportunities">Opportunities</a>
-                </li>
-            </t>
+        <xpath expr="//ol[contains(@class,'o_portal_submenu')]" position="inside">
+            <li t-if="page_name == 'lead' or lead">
+                <a t-if="lead" t-attf-href="/my/leads?{{ keep_query() }}">
+                    My Leads
+                </a>
+                <t t-else="">
+                    My Leads
+                </t>
+            </li>
+            <li t-if="lead">
+                <span t-field="lead.name"/>
+            </li>
+            <li t-if="page_name == 'opportunity' or opportunity">
+                <a t-if="opportunity" t-attf-href="/my/opportunities?{{ keep_query() }}">
+                    My Opportunities
+                </a>
+                <t t-else="">
+                    My Opportunities
+                </t>
+            </li>
+            <li t-if="opportunity">
+                <span t-field="opportunity.name"/>
+            </li>
         </xpath>
     </template>
 
@@ -211,21 +223,15 @@
         <xpath expr="//div[contains(@class,'o_my_home_content')]" position="inside">
             <t t-if="user.commercial_partner_id.grade_id">
                 <h3 t-if="lead_count" class="page-header">
-                    <a href="/my/leads">Your Leads
-                        <small class="ml8">
-                            <span class='badge'><t t-esc="lead_count"/></span>
-                        </small>
+                    <a href="/my/leads">My Leads
+                        <span class="badge ml8" t-esc="lead_count"/>
                     </a>
                 </h3>
                 <h3 class="page-header">
-                    <a href="/my/opportunities">Your Opportunities
-                        <small class="ml8">
-                            <t t-if="opp_count">
-                                <span class='badge'><t t-esc="opp_count"/></span>
-                            </t>
-                            <t t-if="not opp_count">
-                                There are currently no opportunities.
-                            </t>
+                    <a href="/my/opportunities">My Opportunities
+                        <span t-if="opp_count" class="badge ml8" t-esc="opp_count"/>
+                        <small t-if="not opp_count" class="ml8">
+                            There are currently no opportunities.
                         </small>
                     </a>
                 </h3>
@@ -236,7 +242,7 @@
     <template id="portal_my_leads" name="My Leads">
         <t t-call="website_portal.portal_layout">
             <h3 class="page-header">
-                Your Leads
+                My Leads
                 <t t-call="website_portal.portal_searchbar"/>
             </h3>
             <div t-if="not leads" class="alert alert-warning mt8" role="alert">
@@ -271,7 +277,7 @@
     <template id="portal_my_opportunities" name="My Opportunities">
         <t t-call="website_portal.portal_layout">
             <h3 class="page-header">
-                Your Opportunities
+                My Opportunities
                 <t t-call="website_portal.portal_searchbar"/>
                 <button name='new_opp' data-toggle="modal" data-target=".modal_new_opp" class="btn btn-default pull-right mr8"><i class="fa fa-plus fa-lg" /></button>
             </h3>
@@ -344,465 +350,431 @@
     </template>
 
     <template id="portal_my_lead" name="My Lead">
-        <t t-call="website.layout">
-            <div id="wrap">
-                <div class="container">
-                    <div class="oe_structure">
-                        <div class="row">
-                            <div class="col-sm-6">
-                                <ol class="breadcrumb mt8">
-                                    <li><a href="/my/home"><i class="fa fa-home"/></a></li>
-                                    <li><a t-attf-href="/my/leads?#{keep_query()}">My Leads</a></li>
-                                    <li><span t-field="lead.name"/></li>
-                                </ol>
-                            </div>
-                        </div>
-                    </div>
-                    <div class="container">
-                        <div class="panel panel-default">
-                            <div class="panel-heading">
-                                <div class="row">
-                                    <div class="col-md-12">
-                                        <span class="pull-right" title="Rating">
-                                            <t t-foreach="range(1, 4)" t-as="i">
-                                                <span t-attf-class="fa fa-lg fa-star#{'' if i &lt;= int(lead.priority) else '-o'}"/>
-                                            </t>
-                                        </span>
-                                        <h4>
-                                            Lead - <span t-field="lead.name"/>
-                                        </h4>
-                                    </div>
-                                </div>
-                            </div>
-                            <div class="panel-body row">
-                                <div class="col-md-6">
-                                    <div class="row" t-if="lead.partner_name or lead.email_from or lead.partner_id">
-                                        <label class="col-xs-4">Customer</label>
-                                        <address class="col-xs-8">
-                                            <div>
-                                                <span t-if="lead.partner_name" itemprop="name" t-field="lead.partner_name" />
-                                                <span t-if="not lead.partner_name" itemprop="name" t-field="lead.contact_name"/>
-                                            </div>
-                                            <div t-if="lead.phone">
-                                                <span class="fa fa-phone" /> <span itemprop="telephone" t-field="lead.phone" />
-                                            </div>
-                                            <div t-if="lead.mobile">
-                                                <span class="fa fa-mobile" /> <span itemprop="telephone" t-field="lead.mobile" />
-                                            </div>
-                                            <div t-if="lead.email_from">
-                                                <span class="fa fa-envelope"/> <span itemprop="email" t-field="lead.email_from" />
-                                            </div>
-                                        </address>
-                                    </div>
-                                    <div class="row" t-if="lead.street or lead.street2 or lead.city or lead.state_id or lead.country_id">
-                                        <label class="col-xs-4">Address</label>
-                                        <address class="col-xs-8">
-                                            <div t-if="lead.street"><span t-field="lead.street"/></div>
-                                            <div t-if="lead.street2"><span t-field="lead.street2"/></div>
-                                            <div t-if="lead.city or lead.zip">
-                                                <span t-field="lead.city"/> <span t-field="lead.zip"/>
-                                            </div>
-                                            <div t-if="lead.state_id or country_id">
-                                                <span t-field="lead.state_id"/> <span t-field="lead.country_id"/>
-                                            </div>
-                                        </address>
-                                    </div>
-                                    <div class="row" t-if="lead.user_id">
-                                        <label class="col-xs-4">Salesperson</label>
-                                        <span class="col-xs-8" t-field="lead.user_id" />
-                                    </div>
-                                    <div class="row" t-if="lead.team_id">
-                                        <label class="col-xs-4">Sales Channel</label>
-                                        <span class="col-xs-8" t-field="lead.team_id" />
-                                    </div>
-                                </div>
-                                <div class="col-md-6">
-                                    <div class="row" t-if="lead.date_deadline">
-                                        <label class="col-xs-4">Expected Closing</label>
-                                        <span class="col-xs-8" t-field="lead.date_deadline" />
-                                    </div>
-                                    <div class="row" groups="!base.group_portal" t-if="lead.tag_ids">
-                                        <label class="col-xs-4">Tags</label>
-                                        <span class="col-xs-8">
-                                            <t t-foreach="lead.tag_ids" t-as="tag">
-                                                <span class="label label-info" t-esc="tag.name" />
-                                            </t>
-                                        </span>
-                                    </div>
-                                    <div class="row mt16" t-if="lead.partner_assigned_id">
-                                        <label class="col-xs-4">Assigned Partner</label>
-                                        <address class="col-xs-8" t-field="lead.partner_assigned_id" t-options='{"widget": "contact", "fields": ["name", "email", "phone"], "no_marker": True}'/>
-                                    </div>
-                                    <div class="row mt16" t-if="lead.campaign_id">
-                                        <label class="col-xs-4">Campaign</label>
-                                        <span class="col-xs-8" t-field="lead.campaign_id" />
-                                    </div>
-                                    <div class="row" t-if="lead.medium_id">
-                                        <label class="col-xs-4">Medium</label>
-                                        <span class="col-xs-8" t-field="lead.medium_id" />
-                                    </div>
-                                </div>
-                            </div>
-                        </div>
-                        <div>
-                            <a class="btn btn-primary btn" data-toggle="modal" data-target=".modal_partner_assign_interested"><i class="fa fa-file-text-o"/> I'm interested</a>
-                            <a class="btn btn-primary btn" data-toggle="modal" data-target=".modal_partner_assign_desinterested"><i class="fa fa-fw fa-times"/> I'm not interested</a>
-                            <div class="modal fade modal_partner_assign_interested" role="form" aria-hidden="true">
-                                <div class="modal-dialog">
-                                    <form method="POST" class="js_accept_json modal-content js_website_submit_form interested_partner_assign_form">
-                                        <input type="hidden" name="csrf_token" t-att-value="request.csrf_token()"/>
-                                        <input type="hidden" name="lead_id" class="assign_lead_id" t-att-value="lead.id"/>
-                                        <div class="modal-header">
-                                            <button type="button" class="close" data-dismiss="modal" aria-hidden="true">&amp;times;</button>
-                                            <h4 class="modal-title">Lead Feedback</h4>
-                                        </div>
-                                        <div class="modal-body" id="sign-dialog">
-                                            <div class="form-group">
-                                                <label class="control-label" for="comment">What is the next action? When? What is the expected revenue?</label>
-                                                <input type="text" name="comment" id="comment" class="form-control comment_interested"/>
-                                            </div>
-                                            <div class="form-group">
-                                                <label class="control-label" for="customer_contacted">Do you have contacted the customer?</label>
-                                                <input type="checkbox" name="customer_contacted" id="customer_contacted" class="contacted_interested"/>
-                                            </div>
-                                            <div>
-                                                <span class="text-danger error_partner_assign_interested" style="display:none;">You need to fill up the next action and contact the customer before accepting the lead</span>
-                                            </div>
-                                        </div>
-                                        <div class="modal-footer">
-                                            <button t-attf-class="btn btn-primary interested_partner_assign_confirm">Confirm</button>
-                                            <button type="button" class="btn btn-default" data-dismiss="modal">Cancel</button>
-                                        </div>
-                                    </form>
-                                </div>
-                            </div>
-                            <div class="modal fade modal_partner_assign_desinterested" role="form" aria-hidden="true">
-                                <div class="modal-dialog">
-                                    <form method="POST" class="js_accept_json modal-content js_website_submit_form desinterested_partner_assign_form">
-                                        <input type="hidden" name="csrf_token" t-att-value="request.csrf_token()"/>
-                                        <input type="hidden" name="lead_id" class="assign_lead_id" t-att-value="lead.id"/>
-                                        <div class="modal-header">
-                                            <button type="button" class="close" data-dismiss="modal" aria-hidden="true">&amp;times;</button>
-                                            <h4 class="modal-title">Lead Feedback</h4>
-                                        </div>
-                                        <div class="modal-body" id="sign-dialog">
-                                            <div class="form-group">
-                                                <label class="control-label" for="comment">Why aren't you interested by this lead?</label>
-                                                <input type="text" name="comment" id="comment" class="form-control comment_desinterested"/>
-                                            </div>
-                                            <div class="form-group">
-                                                <label class="control-label" for="contacted_desinterested">Do you have contacted the customer?</label>
-                                                <input type="checkbox" name="contacted_desinterested" id="contacted_desinterested" class="contacted_desinterested"/>
-                                            </div>
-                                            <div class="form-group">
-                                                <label class="control-label" for="customer_mark_spam">This lead is a spam</label>
-                                                <input type="checkbox" name="customer_mark_spam" id="customer_mark_spam" class="customer_mark_spam"/>
-                                            </div>
-                                            <div>
-                                                <span class="text-danger error_partner_assign_desinterested" style="display:none;">You need to fill up the next action and contact the customer before accepting the lead</span>
-                                            </div>
-                                        </div>
-                                        <div class="modal-footer">
-                                            <button t-attf-class="btn btn-primary desinterested_partner_assign_confirm">Confirm</button>
-                                            <button type="button" class="btn btn-default" data-dismiss="modal">Cancel</button>
-                                        </div>
-                                    </form>
-                                </div>
-                            </div>
-                        </div>
-                        <div class="row mt32">
-                            <div class="col-md-12">
-                                <h4><strong>Message and communication history</strong></h4>
-                            </div>
-                            <div class="col-md-10 col-md-offset-1 mt16">
-                                <t t-call="website_mail.message_thread">
-                                    <t t-set="object" t-value="lead"/>
+        <t t-call="website_portal.portal_layout">
+            <div class="panel panel-default">
+                <div class="panel-heading">
+                    <div class="row">
+                        <div class="col-md-12">
+                            <span class="pull-right" title="Rating">
+                                <t t-foreach="range(1, 4)" t-as="i">
+                                    <span t-attf-class="fa fa-lg fa-star#{'' if i &lt;= int(lead.priority) else '-o'}"/>
                                 </t>
-                            </div>
+                            </span>
+                            <h4>
+                                Lead - <span t-field="lead.name"/>
+                            </h4>
                         </div>
                     </div>
                 </div>
+                <div class="panel-body row">
+                    <div class="col-md-6">
+                        <div class="row" t-if="lead.partner_name or lead.email_from or lead.partner_id">
+                            <label class="col-xs-4">Customer</label>
+                            <address class="col-xs-8">
+                                <div>
+                                    <span t-if="lead.partner_name" itemprop="name" t-field="lead.partner_name" />
+                                    <span t-if="not lead.partner_name" itemprop="name" t-field="lead.contact_name"/>
+                                </div>
+                                <div t-if="lead.phone">
+                                    <span class="fa fa-phone" /> <span itemprop="telephone" t-field="lead.phone" />
+                                </div>
+                                <div t-if="lead.mobile">
+                                    <span class="fa fa-mobile" /> <span itemprop="telephone" t-field="lead.mobile" />
+                                </div>
+                                <div t-if="lead.email_from">
+                                    <span class="fa fa-envelope"/> <span itemprop="email" t-field="lead.email_from" />
+                                </div>
+                            </address>
+                        </div>
+                        <div class="row" t-if="lead.street or lead.street2 or lead.city or lead.state_id or lead.country_id">
+                            <label class="col-xs-4">Address</label>
+                            <address class="col-xs-8">
+                                <div t-if="lead.street"><span t-field="lead.street"/></div>
+                                <div t-if="lead.street2"><span t-field="lead.street2"/></div>
+                                <div t-if="lead.city or lead.zip">
+                                    <span t-field="lead.city"/> <span t-field="lead.zip"/>
+                                </div>
+                                <div t-if="lead.state_id or country_id">
+                                    <span t-field="lead.state_id"/> <span t-field="lead.country_id"/>
+                                </div>
+                            </address>
+                        </div>
+                        <div class="row" t-if="lead.user_id">
+                            <label class="col-xs-4">Salesperson</label>
+                            <span class="col-xs-8" t-field="lead.user_id" />
+                        </div>
+                        <div class="row" t-if="lead.team_id">
+                            <label class="col-xs-4">Sales Channel</label>
+                            <span class="col-xs-8" t-field="lead.team_id" />
+                        </div>
+                    </div>
+                    <div class="col-md-6">
+                        <div class="row" t-if="lead.date_deadline">
+                            <label class="col-xs-4">Expected Closing</label>
+                            <span class="col-xs-8" t-field="lead.date_deadline" />
+                        </div>
+                        <div class="row" groups="!base.group_portal" t-if="lead.tag_ids">
+                            <label class="col-xs-4">Tags</label>
+                            <span class="col-xs-8">
+                                <t t-foreach="lead.tag_ids" t-as="tag">
+                                    <span class="label label-info" t-esc="tag.name" />
+                                </t>
+                            </span>
+                        </div>
+                        <div class="row mt16" t-if="lead.partner_assigned_id">
+                            <label class="col-xs-4">Assigned Partner</label>
+                            <address class="col-xs-8" t-field="lead.partner_assigned_id" t-options='{"widget": "contact", "fields": ["name", "email", "phone"], "no_marker": True}'/>
+                        </div>
+                        <div class="row mt16" t-if="lead.campaign_id">
+                            <label class="col-xs-4">Campaign</label>
+                            <span class="col-xs-8" t-field="lead.campaign_id" />
+                        </div>
+                        <div class="row" t-if="lead.medium_id">
+                            <label class="col-xs-4">Medium</label>
+                            <span class="col-xs-8" t-field="lead.medium_id" />
+                        </div>
+                    </div>
+                </div>
+            </div>
+            <div>
+                <a class="btn btn-primary btn" data-toggle="modal" data-target=".modal_partner_assign_interested"><i class="fa fa-file-text-o"/> I'm interested</a>
+                <a class="btn btn-primary btn" data-toggle="modal" data-target=".modal_partner_assign_desinterested"><i class="fa fa-fw fa-times"/> I'm not interested</a>
+                <div class="modal fade modal_partner_assign_interested" role="form" aria-hidden="true">
+                    <div class="modal-dialog">
+                        <form method="POST" class="js_accept_json modal-content js_website_submit_form interested_partner_assign_form">
+                            <input type="hidden" name="csrf_token" t-att-value="request.csrf_token()"/>
+                            <input type="hidden" name="lead_id" class="assign_lead_id" t-att-value="lead.id"/>
+                            <div class="modal-header">
+                                <button type="button" class="close" data-dismiss="modal" aria-hidden="true">&amp;times;</button>
+                                <h4 class="modal-title">Lead Feedback</h4>
+                            </div>
+                            <div class="modal-body" id="sign-dialog">
+                                <div class="form-group">
+                                    <label class="control-label" for="comment">What is the next action? When? What is the expected revenue?</label>
+                                    <input type="text" name="comment" id="comment" class="form-control comment_interested"/>
+                                </div>
+                                <div class="form-group">
+                                    <label class="control-label" for="customer_contacted">Do you have contacted the customer?</label>
+                                    <input type="checkbox" name="customer_contacted" id="customer_contacted" class="contacted_interested"/>
+                                </div>
+                                <div>
+                                    <span class="text-danger error_partner_assign_interested" style="display:none;">You need to fill up the next action and contact the customer before accepting the lead</span>
+                                </div>
+                            </div>
+                            <div class="modal-footer">
+                                <button t-attf-class="btn btn-primary interested_partner_assign_confirm">Confirm</button>
+                                <button type="button" class="btn btn-default" data-dismiss="modal">Cancel</button>
+                            </div>
+                        </form>
+                    </div>
+                </div>
+                <div class="modal fade modal_partner_assign_desinterested" role="form" aria-hidden="true">
+                    <div class="modal-dialog">
+                        <form method="POST" class="js_accept_json modal-content js_website_submit_form desinterested_partner_assign_form">
+                            <input type="hidden" name="csrf_token" t-att-value="request.csrf_token()"/>
+                            <input type="hidden" name="lead_id" class="assign_lead_id" t-att-value="lead.id"/>
+                            <div class="modal-header">
+                                <button type="button" class="close" data-dismiss="modal" aria-hidden="true">&amp;times;</button>
+                                <h4 class="modal-title">Lead Feedback</h4>
+                            </div>
+                            <div class="modal-body" id="sign-dialog">
+                                <div class="form-group">
+                                    <label class="control-label" for="comment">Why aren't you interested by this lead?</label>
+                                    <input type="text" name="comment" id="comment" class="form-control comment_desinterested"/>
+                                </div>
+                                <div class="form-group">
+                                    <label class="control-label" for="contacted_desinterested">Do you have contacted the customer?</label>
+                                    <input type="checkbox" name="contacted_desinterested" id="contacted_desinterested" class="contacted_desinterested"/>
+                                </div>
+                                <div class="form-group">
+                                    <label class="control-label" for="customer_mark_spam">This lead is a spam</label>
+                                    <input type="checkbox" name="customer_mark_spam" id="customer_mark_spam" class="customer_mark_spam"/>
+                                </div>
+                                <div>
+                                    <span class="text-danger error_partner_assign_desinterested" style="display:none;">You need to fill up the next action and contact the customer before accepting the lead</span>
+                                </div>
+                            </div>
+                            <div class="modal-footer">
+                                <button t-attf-class="btn btn-primary desinterested_partner_assign_confirm">Confirm</button>
+                                <button type="button" class="btn btn-default" data-dismiss="modal">Cancel</button>
+                            </div>
+                        </form>
+                    </div>
+                </div>
+            </div>
+            <div class="row mt32">
+                <div class="col-md-12">
+                    <h4><strong>Message and communication history</strong></h4>
+                </div>
+                <div class="col-md-10 col-md-offset-1 mt16">
+                    <t t-call="website_mail.message_thread">
+                        <t t-set="object" t-value="lead"/>
+                    </t>
+                </div>
             </div>
         </t>
     </template>
 
     <template id="portal_my_opportunity" name="My Opportunity">
-        <t t-call="website.layout">
-            <div id="wrap">
-                <div class="container">
-                    <div class="oe_structure">
-                        <div class="row">
-                            <div class="col-sm-6">
-                                <ol class="breadcrumb mt8">
-                                    <li><a href="/my/home"><i class="fa fa-home"/></a></li>
-                                    <li><a t-attf-href="/my/opportunities?#{keep_query()}">My Opportunities</a></li>
-                                    <li><span t-field="opportunity.name"/></li>
-                                </ol>
-                            </div>
-                        </div>
-                    </div>
-                    <div class="container">
-                        <div class="panel panel-default">
-                            <div class="panel-heading">
-                                <div class="row">
-                                    <div class="col-md-12">
-                                        <h4 style="display:inline-block">
-                                            Opportunity - <span t-field="opportunity.name"/>
-                                        </h4>
-                                        <span class="btn-group pull-right" role="group">
-                                            <t t-foreach="stages" t-as="stage">
-                                                <button type="button" t-att-data="stage.id" t-att-opp="opportunity.id" t-attf-class="pull-right btn btn-sm opp-stage-button #{'btn-default' if opportunity.stage_id.name != stage.name else 'disabled btn-primary'}">
-                                                    <span t-field="stage.name"/>
-                                                </button>
-                                            </t>
-                                        </span>
-                                    </div>
-                                </div>
-                                <div class="row">
-                                    <div class="col-md-4">
-                                            <strong><span class="text-nowrap" t-esc="opportunity.planned_revenue" t-options="{'widget': 'monetary', 'display_currency': opportunity.company_currency}"/> at <span t-field="opportunity.probability"/>%</strong>
-                                    </div>
-                                    <div class="col-md-4">
-                                            <strong>Expected Closing: <span t-field="opportunity.date_deadline" /></strong>
-                                    </div>
-                                    <div class="col-md-4">
-                                        <span class="pull-right" title="Rating">
-                                            <t t-foreach="range(1, 4)" t-as="i">
-                                                <span t-attf-class="fa fa-lg fa-star#{'' if i &lt;= int(opportunity.priority) else '-o'}"/>
-                                            </t>
-                                        </span>
-                                    </div>
-                                </div>
-                            </div>
-                            <div class="panel-body">
-                                <div class="col-md-6">
-                                    <div>
-                                        <button type="button" data-toggle="modal" data-target=".modal_edit_contact" class="btn btn-sm btn-primary" style="margin-bottom: 10px;">Edit Contact</button>
-                                        <div class="modal fade modal_edit_contact" role="form" aria-hidden="true">
-                                            <div class="modal-dialog">
-                                                <form method="POST" class="js_accept_json modal-content js_website_submit_form edit_contact_form">
-                                                    <input type="hidden" name="csrf_token" t-att-value="request.csrf_token()"/>
-                                                    <input type="hidden" name="opportunity_id" class="opportunity_id" t-att-value="opportunity.id"/>
-                                                    <div class="modal-header">
-                                                        <button type="button" class="close" data-dismiss="modal" aria-hidden="true">&amp;times;</button>
-                                                        <h4 class="modal-title">Edit Contact</h4>
-                                                    </div>
-                                                    <div class="modal-body" id="sign-dialog">
-                                                        <t t-if="opportunity.partner_name">
-                                                            <div class="form-group">
-                                                                <label class="control-label" for="partner_name">Customer Name</label>
-                                                                <input type="text" name="partner_name" class="form-control partner_name" t-att-value="opportunity.partner_name"/>
-                                                            </div>
-                                                        </t>
-                                                        <t t-if="not opportunity.partner_name">
-                                                            <div class="form-group">
-                                                                <label class="control-label" for="partner_name">Customer Name</label>
-                                                                <input type="text" name="partner_name" class="form-control partner_name" t-att-value="opportunity.contact_name"/>
-                                                            </div>
-                                                        </t>
-                                                        <div class="form-group">
-                                                            <label class="control-label" for="phone">Phone</label>
-                                                            <input type="text" name="phone" class="form-control phone" t-att-value="opportunity.phone"/>
-                                                        </div>
-                                                        <div class="form-group">
-                                                            <label class="control-label" for="mobile">Mobile</label>
-                                                            <input type="text" name="mobile" class="form-control mobile" t-att-value="opportunity.mobile"/>
-                                                        </div>
-                                                        <div class="form-group">
-                                                            <label class="control-label" for="email_from">Email</label>
-                                                            <input type="text" name="email_from" class="form-control email_from" t-att-value="opportunity.email_from"/>
-                                                        </div>
-                                                        <div class="form-group">
-                                                            <label class="control-label" for="street">Address</label>
-                                                            <input type="text" name="street" class="form-control street" t-att-value="opportunity.street" placeholder="Street"/>
-                                                        </div>
-                                                        <div class="form-group">
-                                                            <input type="text" name="street2" class="form-control street2" t-att-value="opportunity.street2" placeholder="Street2"/>
-                                                        </div>
-                                                        <div class="form-group">
-                                                            <div class="row">
-                                                                <div class="col-sm-5">
-                                                                    <input type="text" name="city" class="form-control city" t-att-value="opportunity.city" placeholder="City"/>
-                                                                </div>
-                                                                <div class="col-sm-5">
-                                                                    <select name="state_id" class="form-control state_id">
-                                                                        <option>States...</option>
-                                                                        <t t-foreach="states or []" t-as="state">
-                                                                            <option class="state" t-att-value="state.id" t-att-country="state.country_id.id" t-att-selected="state.id == opportunity.state_id.id">
-                                                                                <t t-esc="state.name" />
-                                                                            </option>
-                                                                        </t>
-                                                                    </select>
-                                                                </div>
-                                                                <div class="col-sm-2">
-                                                                    <input type="text" name="zip" class="form-control zip" t-att-value="opportunity.zip" placeholder="ZIP"/>
-                                                                </div>
-                                                            </div>
-                                                        </div>
-                                                        <div class="form-group">
-                                                            <select name="country_id" class="form-control country_id">
-                                                                <option>Countries...</option>
-                                                                <t t-foreach="countries or []" t-as="country">
-                                                                    <option t-att-value="country.id" t-att-selected="country.id == opportunity.country_id.id">
-                                                                        <t t-esc="country.name" />
-                                                                    </option>
-                                                                </t>
-                                                            </select>
-                                                        </div>
-                                                    </div>
-                                                    <div class="modal-footer">
-                                                        <button t-attf-class="btn btn-primary edit_contact_confirm">Confirm</button>
-                                                        <button type="button" class="btn btn-default" data-dismiss="modal">Cancel</button>
-                                                    </div>
-                                                </form>
-                                            </div>
-                                        </div>
-                                    </div>
-                                    <div class="row" t-if="opportunity.partner_name or opportunity.email_from or opportunity.contact_name">
-                                        <label class="col-xs-4">Customer</label>
-                                        <address class="col-xs-8">
-                                            <div>
-                                                <span t-if="opportunity.partner_name" itemprop="name" t-field="opportunity.partner_name" />
-                                                <span t-if="not opportunity.partner_name" itemprop="name" t-field="opportunity.contact_name" />
-                                            </div>
-                                            <div t-if="opportunity.phone">
-                                                <span class="fa fa-phone" /> <span itemprop="telephone" t-field="opportunity.phone" />
-                                            </div>
-                                            <div t-if="opportunity.mobile">
-                                                <span class="fa fa-mobile" /> <span itemprop="mobile" t-field="opportunity.mobile" />
-                                            </div>
-                                            <div t-if="opportunity.email_from">
-                                                <span class="fa fa-envelope"/> <span itemprop="email" t-field="opportunity.email_from" />
-                                            </div>
-                                        </address>
-                                    </div>
-                                    <div class="row" t-if="opportunity.street or opportunity.street2 or opportunity.city or opportunity.state_id or opportunity.country_id">
-                                        <label class="col-xs-4">Address</label>
-                                        <address class="col-xs-8">
-                                            <div t-if="opportunity.street"><span t-field="opportunity.street"/></div>
-                                            <div t-if="opportunity.street2"><span t-field="opportunity.street2"/></div>
-                                            <div t-if="opportunity.city or opportunity.zip">
-                                                <span t-field="opportunity.city"/> <span t-field="opportunity.zip"/>
-                                            </div>
-                                            <div t-if="opportunity.state_id or country_id">
-                                                <span t-field="opportunity.state_id"/> <span t-field="opportunity.country_id"/>
-                                            </div>
-                                        </address>
-                                    </div>
-                                </div>
-                                <div class="col-md-6">
-                                    <div>
-                                        <button type="button" data-toggle="modal" data-target=".modal_edit_opp" class="btn btn-sm btn-primary" style="margin-bottom: 10px;">Edit Opportunity</button>
-                                        <div class="modal fade modal_edit_opp" role="form" aria-hidden="true">
-                                            <div class="modal-dialog">
-                                                <form method="POST" class="js_accept_json modal-content js_website_submit_form edit_opp_form">
-                                                    <input type="hidden" name="csrf_token" t-att-value="request.csrf_token()"/>
-                                                    <input type="hidden" name="opportunity_id" class="opportunity_id" t-att-value="opportunity.id"/>
-                                                    <div class="modal-header">
-                                                        <button type="button" class="close" data-dismiss="modal" aria-hidden="true">&amp;times;</button>
-                                                        <h4 class="modal-title">Edit Opportunity</h4>
-                                                    </div>
-                                                    <div class="modal-body" id="sign-dialog">
-                                                        <div class="form-group">
-                                                            <div class="row">
-                                                                <div class="col-sm-6">
-                                                                    <div class="input-group">
-                                                                        <div class="input-group-addon"><span class="text-nowrap" t-esc="opportunity.company_currency.symbol"/></div>
-                                                                        <input type="text" name="planned_revenue" class="form-control planned_revenue" t-att-value="opportunity.planned_revenue" placeholder="Planned Revenue"/>
-                                                                    </div>
-                                                                </div>
-                                                                <div class="col-sm-1">
-                                                                    <span>at </span>
-                                                                </div>
-                                                                <div class="col-sm-5">
-                                                                    <div class="input-group">
-                                                                        <input type="text" name="probability" class="form-control probability" t-att-value="opportunity.probability" placeholder="Probability"/>
-                                                                        <div class="input-group-addon">%</div>
-                                                                    </div>
-                                                                </div>
-                                                            </div>
-                                                        </div>
-                                                        <div class="form-group">
-                                                            <div class="row">
-                                                                <div class="col-sm-6">
-                                                                  <label>Priority: </label>
-                                                                  <div class="input-group">
-                                                                    <label class="radio-inline">
-                                                                      <input type="radio" name="PriorityRadioOptions" value="0" t-att-checked="opportunity.priority not in ['1','2','3']"/><i class="fa fa-star-o"></i>
-                                                                    </label>
-                                                                    <label class="radio-inline">
-                                                                      <input type="radio" name="PriorityRadioOptions" value="1" t-att-checked="opportunity.priority == '1'"/><i class="fa fa-star"></i>
-                                                                    </label>
-                                                                    <label class="radio-inline">
-                                                                      <input type="radio" name="PriorityRadioOptions" value="2" t-att-checked="opportunity.priority == '2'"/><i class="fa fa-star"></i><i class="fa fa-star"></i>
-                                                                    </label>
-                                                                    <label class="radio-inline">
-                                                                      <input type="radio" name="PriorityRadioOptions" value="3" t-att-checked="opportunity.priority == '3'"/><i class="fa fa-star"></i><i class="fa fa-star"></i><i class="fa fa-star"></i>
-                                                                    </label>
-                                                                  </div>
-                                                                </div>
-                                                                <div class="col-sm-6">
-                                                                    <label>Deadline: </label>
-                                                                    <div class='input-group date'>
-                                                                        <input type="text" name="date_deadline" t-att-value="opportunity.date_deadline" class="form-control date_deadline" data-date-format="YYYY-MM-DD" t-att-name="prefix" placeholder="YYYY-MM-DD" />
-                                                                        <span class="input-group-addon"><span class="fa fa-calendar"></span></span>
-                                                                    </div>
-                                                                </div>
-                                                            </div>
-                                                        </div>
-                                                        <div class="form-group">
-                                                            <label class="control-label" for="next_activity">Next Activity</label>
-                                                            <select class="form-control next_activity" name="next_activity">
-                                                                <t t-foreach="activity_types" t-as="activity_type">
-                                                                    <option t-att-data="activity_type.id" t-att-selected="activity_type.id == user_activity.activity_type_id.id" t-att-name="activity_type.name" t-att-days="activity_type.days" t-att-summary="activity_type.summary"><t t-esc="activity_type.name"/></option>
-                                                                </t>
-                                                            </select>
-                                                        </div>
-                                                        <div class="form-group">
-                                                            <label class="control-label" for="activity_summary">Details Next Activity</label>
-                                                            <textarea row="3" name="activity_summary" class="form-control activity_summary"><t t-esc="user_activity.summary"/></textarea>
-                                                        </div>
-                                                        <div class="form-group">
-                                                            <label class="control-label" for="activity_date_deadline">Next Activity Date</label>
-                                                            <div class='input-group date'>
-                                                                <input type="text" name="activity_date_deadline" t-att-value="user_activity.date_deadline" class="form-control activity_date_deadline" data-date-format="YYYY-MM-DD" t-att-name="prefix" placeholder="YYYY-MM-DD" />
-                                                                <span class="input-group-addon"><span class="fa fa-calendar"></span></span>
-                                                            </div>
-                                                        </div>
-                                                    </div>
-                                                    <div class="modal-footer">
-                                                        <button t-attf-class="btn btn-primary edit_opp_confirm">Confirm</button>
-                                                        <button type="button" class="btn btn-default" data-dismiss="modal">Cancel</button>
-                                                    </div>
-                                                </form>
-                                            </div>
-                                        </div>
-                                    </div>
-                                    <div class="row" t-if="user_activity">
-                                        <label class="col-xs-4">Next Activity</label>
-                                        <span class="col-xs-8">
-                                            <span t-field="user_activity.activity_type_id"/>
-                                            <span t-if="user_activity.date_deadline">&#160;on&#160;</span>
-                                            <span t-field="user_activity.date_deadline"/>
-                                        </span>
-                                    </div>
-                                    <div class="row" t-if="user_activity">
-                                        <span class="col-xs-8 col-xs-offset-4" t-field="user_activity.summary"/>
-                                    </div>
-                                </div>
-                            </div>
-                        </div>
-                        <div class="row mt32">
-                            <div class="col-md-12">
-                                <h4><strong>Message and communication history</strong></h4>
-                            </div>
-                            <div class="col-md-10 col-md-offset-1 mt16">
-                                <t t-call="website_mail.message_thread">
-                                    <t t-set="object" t-value="opportunity"/>
+        <t t-call="website_portal.portal_layout">
+            <div class="panel panel-default">
+                <div class="panel-heading">
+                    <div class="row">
+                        <div class="col-md-12">
+                            <h4 style="display:inline-block">
+                                Opportunity - <span t-field="opportunity.name"/>
+                            </h4>
+                            <span class="btn-group pull-right" role="group">
+                                <t t-foreach="stages" t-as="stage">
+                                    <button type="button" t-att-data="stage.id" t-att-opp="opportunity.id" t-attf-class="pull-right btn btn-sm opp-stage-button #{'btn-default' if opportunity.stage_id.name != stage.name else 'disabled btn-primary'}">
+                                        <span t-field="stage.name"/>
+                                    </button>
                                 </t>
-                            </div>
+                            </span>
                         </div>
                     </div>
+                    <div class="row">
+                        <div class="col-md-4">
+                                <strong><span class="text-nowrap" t-esc="opportunity.planned_revenue" t-options="{'widget': 'monetary', 'display_currency': opportunity.company_currency}"/> at <span t-field="opportunity.probability"/>%</strong>
+                        </div>
+                        <div class="col-md-4">
+                                <strong>Expected Closing: <span t-field="opportunity.date_deadline" /></strong>
+                        </div>
+                        <div class="col-md-4">
+                            <span class="pull-right" title="Rating">
+                                <t t-foreach="range(1, 4)" t-as="i">
+                                    <span t-attf-class="fa fa-lg fa-star#{'' if i &lt;= int(opportunity.priority) else '-o'}"/>
+                                </t>
+                            </span>
+                        </div>
+                    </div>
+                </div>
+                <div class="panel-body">
+                    <div class="col-md-6">
+                        <div>
+                            <button type="button" data-toggle="modal" data-target=".modal_edit_contact" class="btn btn-sm btn-primary" style="margin-bottom: 10px;">Edit Contact</button>
+                            <div class="modal fade modal_edit_contact" role="form" aria-hidden="true">
+                                <div class="modal-dialog">
+                                    <form method="POST" class="js_accept_json modal-content js_website_submit_form edit_contact_form">
+                                        <input type="hidden" name="csrf_token" t-att-value="request.csrf_token()"/>
+                                        <input type="hidden" name="opportunity_id" class="opportunity_id" t-att-value="opportunity.id"/>
+                                        <div class="modal-header">
+                                            <button type="button" class="close" data-dismiss="modal" aria-hidden="true">&amp;times;</button>
+                                            <h4 class="modal-title">Edit Contact</h4>
+                                        </div>
+                                        <div class="modal-body" id="sign-dialog">
+                                            <t t-if="opportunity.partner_name">
+                                                <div class="form-group">
+                                                    <label class="control-label" for="partner_name">Customer Name</label>
+                                                    <input type="text" name="partner_name" class="form-control partner_name" t-att-value="opportunity.partner_name"/>
+                                                </div>
+                                            </t>
+                                            <t t-if="not opportunity.partner_name">
+                                                <div class="form-group">
+                                                    <label class="control-label" for="partner_name">Customer Name</label>
+                                                    <input type="text" name="partner_name" class="form-control partner_name" t-att-value="opportunity.contact_name"/>
+                                                </div>
+                                            </t>
+                                            <div class="form-group">
+                                                <label class="control-label" for="phone">Phone</label>
+                                                <input type="text" name="phone" class="form-control phone" t-att-value="opportunity.phone"/>
+                                            </div>
+                                            <div class="form-group">
+                                                <label class="control-label" for="mobile">Mobile</label>
+                                                <input type="text" name="mobile" class="form-control mobile" t-att-value="opportunity.mobile"/>
+                                            </div>
+                                            <div class="form-group">
+                                                <label class="control-label" for="email_from">Email</label>
+                                                <input type="text" name="email_from" class="form-control email_from" t-att-value="opportunity.email_from"/>
+                                            </div>
+                                            <div class="form-group">
+                                                <label class="control-label" for="street">Address</label>
+                                                <input type="text" name="street" class="form-control street" t-att-value="opportunity.street" placeholder="Street"/>
+                                            </div>
+                                            <div class="form-group">
+                                                <input type="text" name="street2" class="form-control street2" t-att-value="opportunity.street2" placeholder="Street2"/>
+                                            </div>
+                                            <div class="form-group">
+                                                <div class="row">
+                                                    <div class="col-sm-5">
+                                                        <input type="text" name="city" class="form-control city" t-att-value="opportunity.city" placeholder="City"/>
+                                                    </div>
+                                                    <div class="col-sm-5">
+                                                        <select name="state_id" class="form-control state_id">
+                                                            <option>States...</option>
+                                                            <t t-foreach="states or []" t-as="state">
+                                                                <option class="state" t-att-value="state.id" t-att-country="state.country_id.id" t-att-selected="state.id == opportunity.state_id.id">
+                                                                    <t t-esc="state.name" />
+                                                                </option>
+                                                            </t>
+                                                        </select>
+                                                    </div>
+                                                    <div class="col-sm-2">
+                                                        <input type="text" name="zip" class="form-control zip" t-att-value="opportunity.zip" placeholder="ZIP"/>
+                                                    </div>
+                                                </div>
+                                            </div>
+                                            <div class="form-group">
+                                                <select name="country_id" class="form-control country_id">
+                                                    <option>Countries...</option>
+                                                    <t t-foreach="countries or []" t-as="country">
+                                                        <option t-att-value="country.id" t-att-selected="country.id == opportunity.country_id.id">
+                                                            <t t-esc="country.name" />
+                                                        </option>
+                                                    </t>
+                                                </select>
+                                            </div>
+                                        </div>
+                                        <div class="modal-footer">
+                                            <button t-attf-class="btn btn-primary edit_contact_confirm">Confirm</button>
+                                            <button type="button" class="btn btn-default" data-dismiss="modal">Cancel</button>
+                                        </div>
+                                    </form>
+                                </div>
+                            </div>
+                        </div>
+                        <div class="row" t-if="opportunity.partner_name or opportunity.email_from or opportunity.contact_name">
+                            <label class="col-xs-4">Customer</label>
+                            <address class="col-xs-8">
+                                <div>
+                                    <span t-if="opportunity.partner_name" itemprop="name" t-field="opportunity.partner_name" />
+                                    <span t-if="not opportunity.partner_name" itemprop="name" t-field="opportunity.contact_name" />
+                                </div>
+                                <div t-if="opportunity.phone">
+                                    <span class="fa fa-phone" /> <span itemprop="telephone" t-field="opportunity.phone" />
+                                </div>
+                                <div t-if="opportunity.mobile">
+                                    <span class="fa fa-mobile" /> <span itemprop="mobile" t-field="opportunity.mobile" />
+                                </div>
+                                <div t-if="opportunity.email_from">
+                                    <span class="fa fa-envelope"/> <span itemprop="email" t-field="opportunity.email_from" />
+                                </div>
+                            </address>
+                        </div>
+                        <div class="row" t-if="opportunity.street or opportunity.street2 or opportunity.city or opportunity.state_id or opportunity.country_id">
+                            <label class="col-xs-4">Address</label>
+                            <address class="col-xs-8">
+                                <div t-if="opportunity.street"><span t-field="opportunity.street"/></div>
+                                <div t-if="opportunity.street2"><span t-field="opportunity.street2"/></div>
+                                <div t-if="opportunity.city or opportunity.zip">
+                                    <span t-field="opportunity.city"/> <span t-field="opportunity.zip"/>
+                                </div>
+                                <div t-if="opportunity.state_id or country_id">
+                                    <span t-field="opportunity.state_id"/> <span t-field="opportunity.country_id"/>
+                                </div>
+                            </address>
+                        </div>
+                    </div>
+                    <div class="col-md-6">
+                        <div>
+                            <button type="button" data-toggle="modal" data-target=".modal_edit_opp" class="btn btn-sm btn-primary" style="margin-bottom: 10px;">Edit Opportunity</button>
+                            <div class="modal fade modal_edit_opp" role="form" aria-hidden="true">
+                                <div class="modal-dialog">
+                                    <form method="POST" class="js_accept_json modal-content js_website_submit_form edit_opp_form">
+                                        <input type="hidden" name="csrf_token" t-att-value="request.csrf_token()"/>
+                                        <input type="hidden" name="opportunity_id" class="opportunity_id" t-att-value="opportunity.id"/>
+                                        <div class="modal-header">
+                                            <button type="button" class="close" data-dismiss="modal" aria-hidden="true">&amp;times;</button>
+                                            <h4 class="modal-title">Edit Opportunity</h4>
+                                        </div>
+                                        <div class="modal-body" id="sign-dialog">
+                                            <div class="form-group">
+                                                <div class="row">
+                                                    <div class="col-sm-6">
+                                                        <div class="input-group">
+                                                            <div class="input-group-addon"><span class="text-nowrap" t-esc="opportunity.company_currency.symbol"/></div>
+                                                            <input type="text" name="planned_revenue" class="form-control planned_revenue" t-att-value="opportunity.planned_revenue" placeholder="Planned Revenue"/>
+                                                        </div>
+                                                    </div>
+                                                    <div class="col-sm-1">
+                                                        <span>at </span>
+                                                    </div>
+                                                    <div class="col-sm-5">
+                                                        <div class="input-group">
+                                                            <input type="text" name="probability" class="form-control probability" t-att-value="opportunity.probability" placeholder="Probability"/>
+                                                            <div class="input-group-addon">%</div>
+                                                        </div>
+                                                    </div>
+                                                </div>
+                                            </div>
+                                            <div class="form-group">
+                                                <div class="row">
+                                                    <div class="col-sm-6">
+                                                      <label>Priority: </label>
+                                                      <div class="input-group">
+                                                        <label class="radio-inline">
+                                                          <input type="radio" name="PriorityRadioOptions" value="0" t-att-checked="opportunity.priority not in ['1','2','3']"/><i class="fa fa-star-o"></i>
+                                                        </label>
+                                                        <label class="radio-inline">
+                                                          <input type="radio" name="PriorityRadioOptions" value="1" t-att-checked="opportunity.priority == '1'"/><i class="fa fa-star"></i>
+                                                        </label>
+                                                        <label class="radio-inline">
+                                                          <input type="radio" name="PriorityRadioOptions" value="2" t-att-checked="opportunity.priority == '2'"/><i class="fa fa-star"></i><i class="fa fa-star"></i>
+                                                        </label>
+                                                        <label class="radio-inline">
+                                                          <input type="radio" name="PriorityRadioOptions" value="3" t-att-checked="opportunity.priority == '3'"/><i class="fa fa-star"></i><i class="fa fa-star"></i><i class="fa fa-star"></i>
+                                                        </label>
+                                                      </div>
+                                                    </div>
+                                                    <div class="col-sm-6">
+                                                        <label>Deadline: </label>
+                                                        <div class='input-group date'>
+                                                            <input type="text" name="date_deadline" t-att-value="opportunity.date_deadline" class="form-control date_deadline" data-date-format="YYYY-MM-DD" t-att-name="prefix" placeholder="YYYY-MM-DD" />
+                                                            <span class="input-group-addon"><span class="fa fa-calendar"></span></span>
+                                                        </div>
+                                                    </div>
+                                                </div>
+                                            </div>
+                                            <div class="form-group">
+                                                <label class="control-label" for="next_activity">Next Activity</label>
+                                                <select class="form-control next_activity" name="next_activity">
+                                                    <t t-foreach="activity_types" t-as="activity_type">
+                                                        <option t-att-data="activity_type.id" t-att-selected="activity_type.id == user_activity.activity_type_id.id" t-att-name="activity_type.name" t-att-days="activity_type.days" t-att-summary="activity_type.summary"><t t-esc="activity_type.name"/></option>
+                                                    </t>
+                                                </select>
+                                            </div>
+                                            <div class="form-group">
+                                                <label class="control-label" for="activity_summary">Details Next Activity</label>
+                                                <textarea row="3" name="activity_summary" class="form-control activity_summary"><t t-esc="user_activity.summary"/></textarea>
+                                            </div>
+                                            <div class="form-group">
+                                                <label class="control-label" for="activity_date_deadline">Next Activity Date</label>
+                                                <div class='input-group date'>
+                                                    <input type="text" name="activity_date_deadline" t-att-value="user_activity.date_deadline" class="form-control activity_date_deadline" data-date-format="YYYY-MM-DD" t-att-name="prefix" placeholder="YYYY-MM-DD" />
+                                                    <span class="input-group-addon"><span class="fa fa-calendar"></span></span>
+                                                </div>
+                                            </div>
+                                        </div>
+                                        <div class="modal-footer">
+                                            <button t-attf-class="btn btn-primary edit_opp_confirm">Confirm</button>
+                                            <button type="button" class="btn btn-default" data-dismiss="modal">Cancel</button>
+                                        </div>
+                                    </form>
+                                </div>
+                            </div>
+                        </div>
+                        <div class="row" t-if="user_activity">
+                            <label class="col-xs-4">Next Activity</label>
+                            <span class="col-xs-8">
+                                <span t-field="user_activity.activity_type_id"/>
+                                <span t-if="user_activity.date_deadline">&#160;on&#160;</span>
+                                <span t-field="user_activity.date_deadline"/>
+                            </span>
+                        </div>
+                        <div class="row" t-if="user_activity">
+                            <span class="col-xs-8 col-xs-offset-4" t-field="user_activity.summary"/>
+                        </div>
+                    </div>
+                </div>
+            </div>
+            <div class="row mt32">
+                <div class="col-md-12">
+                    <h4><strong>Message and communication history</strong></h4>
+                </div>
+                <div class="col-md-10 col-md-offset-1 mt16">
+                    <t t-call="website_mail.message_thread">
+                        <t t-set="object" t-value="opportunity"/>
+                    </t>
                 </div>
             </div>
         </t>
diff --git a/addons/website_portal/static/src/less/website_portal.less b/addons/website_portal/static/src/less/website_portal.less
index 3db190771f3..e3d3accac6c 100644
--- a/addons/website_portal/static/src/less/website_portal.less
+++ b/addons/website_portal/static/src/less/website_portal.less
@@ -28,3 +28,7 @@
     height: 40px;
     width: 50px;
 }
+
+.breadcrumb {
+  display: inline-block;
+}
diff --git a/addons/website_portal/views/website_portal_templates.xml b/addons/website_portal/views/website_portal_templates.xml
index 1209ed1841e..58834f52eb6 100644
--- a/addons/website_portal/views/website_portal_templates.xml
+++ b/addons/website_portal/views/website_portal_templates.xml
@@ -99,42 +99,40 @@
     <template id="portal_layout" name="Portal Layout">
         <t t-call="website.layout">
             <div class="container mt16 o_website_portal">
-                <div class="navbar navbar-default">
-                    <div class="navbar-header">
-                        <button type="button" class="navbar-toggle" data-toggle="collapse" data-target="#oe-help-navbar-collapse">
-                            <span class="sr-only">Toggle navigation</span>
-                            <span class="icon-bar"></span>
-                            <span class="icon-bar"></span>
-                        </button>
-                        <a class="navbar-brand" href="/my/home">
-                            My Account
-                        </a>
-                    </div>
-                    <div class="collapse navbar-collapse" id="oe-help-navbar-collapse">
-                        <ul class="nav navbar-nav o_portal_submenu">
-                        </ul>
+                <div class="oe_structure">
+                    <div t-if="not no_breadcrumbs" class="row">
+                        <div class="col-sm-12">
+                            <ol class="breadcrumb mt8 o_portal_submenu">
+                                <li><a href="/my/home"><i class="fa fa-home"/></a></li>
+                            </ol>
+                        </div>
                     </div>
                 </div>
             </div>
             <div id="wrap" class='portal-wrap'>
                 <div class="container mb64">
-                    <div class="row">
-                        <div class="col-md-9 col-lg-8">
-                            <t t-raw="0"/>
-                        </div>
-                        <div id="o_my_sidebar" class="col-md-3 col-lg-offset-1 o_my_sidebar">
-                            <div class="o_my_contact" t-if="sales_rep">
-                                <t t-call="website_portal.contact"/>
+                    <t t-if="my_details">
+                        <div class="row">
+                            <div t-attf-class="col-md-9 col-lg-8">
+                                <t t-raw="0"/>
                             </div>
-                            <div class="o_my_details">
-                                <h3 class="page-header">Your Details <a href="/my/account" class="btn btn-default btn-xs">Change</a></h3>
-                                <div t-field="user.partner_id" t-options='{"widget": "contact", "fields": ["email", "phone", "address", "name"]}'/>
-                            </div>
-                            <div class="o_my_archives" t-if="archive_groups">
-                                <t t-call="website_portal.portal_archive_groups"/>
+                            <div id="o_my_sidebar" class="col-md-3 col-lg-offset-1 o_my_sidebar">
+                                <div class="o_my_contact" t-if="sales_rep">
+                                    <t t-call="website_portal.contact"/>
+                                </div>
+                                <div class="o_my_details">
+                                    <h3 class="page-header">Your Details <a href="/my/account" class="btn btn-default btn-xs">Change</a></h3>
+                                    <div t-field="user.partner_id" t-options='{"widget": "contact", "fields": ["email", "phone", "address", "name"]}'/>
+                                </div>
+                                <div class="o_my_archives" t-if="archive_groups">
+                                    <t t-call="website_portal.portal_archive_groups"/>
+                                </div>
                             </div>
                         </div>
-                    </div>
+                    </t>
+                    <t t-else="">
+                        <t t-raw="0"/>
+                    </t>
                 </div>
             </div>
         </t>
@@ -142,6 +140,7 @@
 
     <template id="portal_my_home" name="My Portal">
         <t t-call="website_portal.portal_layout">
+            <t t-set="my_details" t-value="True"/>
             <div class="o_my_home_content">
                 <div class="oe_structure"></div>
             </div>
diff --git a/addons/website_portal_purchase/views/website_portal_purchase_templates.xml b/addons/website_portal_purchase/views/website_portal_purchase_templates.xml
index 861e1b84892..28701a47dde 100644
--- a/addons/website_portal_purchase/views/website_portal_purchase_templates.xml
+++ b/addons/website_portal_purchase/views/website_portal_purchase_templates.xml
@@ -2,22 +2,26 @@
 <odoo>
 
   <template id="portal_my_home_menu_purchase" name="Portal layout : purchase menu entries" inherit_id="website_portal.portal_layout" priority="25">
-    <xpath expr="//ul[contains(@class,'o_portal_submenu')]" position="inside">
-      <t t-if="purchase_count">
-        <li t-att-class="page_name == 'purchase' and 'active'">
-          <a href="/my/purchase">Purchase Orders</a>
-        </li>
-      </t>
+    <xpath expr="//ol[contains(@class,'o_portal_submenu')]" position="inside">
+      <li t-if="page_name == 'purchase' or purchase_order">
+        <a t-if="purchase_order" t-attf-href="/my/purchase?{{ keep_query() }}">
+          My Purchase Orders
+        </a>
+        <t t-else="">
+          My Purchase Orders
+        </t>
+      </li>
+      <li t-if="purchase_order">
+        <t t-esc="purchase_order.name"/>
+      </li>
     </xpath>
   </template>
 
   <template id="portal_my_home_purchase" name="Portal My Home : purchase entry" inherit_id="website_portal.portal_my_home" priority="25">
     <xpath expr="//div[contains(@class,'o_my_home_content')]" position="inside">
         <h3 t-if="purchase_count" class="page-header">
-          <a href="/my/purchase">Your Purchase Orders
-            <small class="ml8">
-              <span class='badge'><t t-esc="purchase_count"/></span>
-            </small>
+          <a href="/my/purchase">My Purchase Orders
+            <span class="badge ml8" t-esc="purchase_count"/>
           </a>
         </h3>
     </xpath>
@@ -26,7 +30,7 @@
   <template id="portal_my_purchase_orders" name="Portal: My Purchase Orders">
     <t t-call="website_portal.portal_layout">
       <h3 class="page-header">
-        Your Purchase Orders
+        My Purchase Orders
         <t t-call="website_portal.portal_searchbar"/>
       </h3>
       <table class="table table-hover o_my_status_table">
@@ -61,114 +65,94 @@
   </template>
 
   <template id="portal_my_purchase_order" name="Portal: My Purchase Order">
-    <t t-call="website.layout">
-      <div id="wrap">
-        <div class="container">
-          <div class="oe_structure">
-            <div class="row">
-                <div class="col-sm-4">
-                    <ol class="breadcrumb mt8">
-                        <li><a href="/my/home"><i class="fa fa-home"/></a></li>
-                        <li>
-                          <a t-attf-href="/my/purchase?{{ keep_query()}}">
-                            My Purchase Orders
-                          </a>
-                        </li>
-                        <li>
-                          <t t-esc="order.name"/>
-                        </li>
-                    </ol>
+    <t t-call="website_portal.portal_layout">
+      <t t-set="purchase_order" t-value="order"/>
+      <div id="optional_placeholder"></div>
+      <div class="container">
+          <div class="panel panel-default">
+            <div class="panel-heading">
+              <div class="row">
+                <div class="col-md-12">
+                  <h4>
+                    <t t-call='website_portal.record_pager'/>
+                    Purchase Order
+                    <span t-esc="order.name"/>
+                  </h4>
                 </div>
+              </div>
             </div>
-          </div>
-          <div id="optional_placeholder"></div>
-          <div class="container">
-              <div class="panel panel-default">
-                <div class="panel-heading">
-                  <div class="row">
-                    <div class="col-md-12">
-                      <h4>
-                        <t t-call='website_portal.record_pager'/>
-                        Purchase Order
-                        <span t-esc="order.name"/>
-                      </h4>
-                    </div>
+            <div class="panel-body">
+              <div class="mb8">
+                  <strong>Date:</strong> <span t-field="order.date_order" t-options='{"widget": "date"}'/>
+              </div>
+              <div class="row">
+                <div class="col-md-6">
+                  <strong>Product</strong>
+                </div>
+                <div class="col-md-2 text-right">
+                  <strong>Unit Price</strong>
+                </div>
+                <div class="col-md-2 text-right">
+                  <strong>Quantity</strong>
+                </div>
+                <div class="col-md-2 text-right">
+                  <strong>Subtotal</strong>
+                </div>
+              </div>
+              <t t-foreach="order.order_line" t-as="ol">
+                <div class="row purchases_vertical_align">
+                  <div class="col-md-1 text-center">
+                      <img t-att-src="'/web/image/purchase.order.line/%s/product_image/48x48' % ol.id"/>
+                  </div>
+                  <div id='product_name' class="col-md-5">
+                    <span t-esc="ol.product_id.name"/>
+                  </div>
+                  <div class="col-md-2 text-right">
+                    <span t-field="ol.price_unit" t-options='{"widget": "monetary", "display_currency": order.currency_id}'/>
+                  </div>
+                  <div class="col-md-2 text-right">
+                      <span t-esc="ol.product_qty"/>
+                  </div>
+                  <div class="col-md-2 text-right">
+                    <span t-field="ol.price_subtotal" t-options='{"widget": "monetary", "display_currency": order.currency_id}'/>
                   </div>
                 </div>
-                <div class="panel-body">
-                  <div class="mb8">
-                      <strong>Date:</strong> <span t-field="order.date_order" t-options='{"widget": "date"}'/>
+              </t>
+
+              <hr/>
+
+              <div class="row">
+                <div class="col-md-12 text-right">
+                  <div class="row">
+                    <div class="col-md-10 text-right">
+                      Untaxed Amount:
+                    </div>
+                    <div class="col-md-2 text-right">
+                      <span t-field="order.amount_untaxed" t-options='{"widget": "monetary", "display_currency": order.currency_id}'/>
+                    </div>
                   </div>
                   <div class="row">
-                    <div class="col-md-6">
-                      <strong>Product</strong>
+                    <div class="col-md-10 text-right">
+                      Taxes:
                     </div>
                     <div class="col-md-2 text-right">
-                      <strong>Unit Price</strong>
-                    </div>
-                    <div class="col-md-2 text-right">
-                      <strong>Quantity</strong>
-                    </div>
-                    <div class="col-md-2 text-right">
-                      <strong>Subtotal</strong>
+                      <span t-field="order.amount_tax" t-options='{"widget": "monetary", "display_currency": order.currency_id}'/>
                     </div>
                   </div>
-                  <t t-foreach="order.order_line" t-as="ol">
-                    <div class="row purchases_vertical_align">
-                      <div class="col-md-1 text-center">
-                          <img t-att-src="'/web/image/purchase.order.line/%s/product_image/48x48' % ol.id"/>
-                      </div>
-                      <div id='product_name' class="col-md-5">
-                        <span t-esc="ol.product_id.name"/>
-                      </div>
-                      <div class="col-md-2 text-right">
-                        <span t-field="ol.price_unit" t-options='{"widget": "monetary", "display_currency": order.currency_id}'/>
-                      </div>
-                      <div class="col-md-2 text-right">
-                          <span t-esc="ol.product_qty"/>
-                      </div>
-                      <div class="col-md-2 text-right">
-                        <span t-field="ol.price_subtotal" t-options='{"widget": "monetary", "display_currency": order.currency_id}'/>
-                      </div>
-                    </div>
-                  </t>
-
-                  <hr/>
-
                   <div class="row">
-                    <div class="col-md-12 text-right">
-                      <div class="row">
-                        <div class="col-md-10 text-right">
-                          Untaxed Amount:
-                        </div>
-                        <div class="col-md-2 text-right">
-                          <span t-field="order.amount_untaxed" t-options='{"widget": "monetary", "display_currency": order.currency_id}'/>
-                        </div>
-                      </div>
-                      <div class="row">
-                        <div class="col-md-10 text-right">
-                          Taxes:
-                        </div>
-                        <div class="col-md-2 text-right">
-                          <span t-field="order.amount_tax" t-options='{"widget": "monetary", "display_currency": order.currency_id}'/>
-                        </div>
-                      </div>
-                      <div class="row">
-                        <div class="col-md-10 text-right">
-                          <strong>Total:</strong>
-                        </div>
-                        <div class="col-md-2 text-right">
-                          <strong><span t-field="order.amount_total" t-options='{"widget": "monetary", "display_currency": order.currency_id}'/></strong>
-                        </div>
-                      </div>
+                    <div class="col-md-10 text-right">
+                      <strong>Total:</strong>
+                    </div>
+                    <div class="col-md-2 text-right">
+                      <strong><span t-field="order.amount_total" t-options='{"widget": "monetary", "display_currency": order.currency_id}'/></strong>
                     </div>
                   </div>
                 </div>
               </div>
+            </div>
           </div>
-          <div class="oe_structure mb32"/>
-        </div>
       </div>
+      <div class="oe_structure mb32"/>
     </t>
   </template>
 
diff --git a/addons/website_portal_sale/controllers/main.py b/addons/website_portal_sale/controllers/main.py
index 9778b4a4c94..88e211bccfd 100644
--- a/addons/website_portal_sale/controllers/main.py
+++ b/addons/website_portal_sale/controllers/main.py
@@ -140,19 +140,21 @@ class website_account(website_account):
     def orders_followup(self, order=None, access_token=None, **kw):
         order = request.env['sale.order'].browse([order])
         order_sudo = order.sudo()
+        values = {}
         try:
             order.check_access_rights('read')
             order.check_access_rule('read')
         except AccessError:
             if not access_token or not consteq(order_sudo.access_token, access_token):
                 return request.render("website.403")
+            values.update({'no_breadcrumbs': True})
 
         order_invoice_lines = {il.product_id.id: il.invoice_id for il in order_sudo.invoice_ids.mapped('invoice_line_ids')}
         history = request.session.get('my_orders_history', [])
 
-        values = {
+        values.update({
             'order': order_sudo,
             'order_invoice_lines': order_invoice_lines,
-        }
+        })
         values.update(get_records_pager(history, order_sudo))
         return request.render("website_portal_sale.orders_followup", values)
diff --git a/addons/website_portal_sale/views/website_portal_sale_templates.xml b/addons/website_portal_sale/views/website_portal_sale_templates.xml
index 8a67a279532..2e3598c3f55 100644
--- a/addons/website_portal_sale/views/website_portal_sale_templates.xml
+++ b/addons/website_portal_sale/views/website_portal_sale_templates.xml
@@ -7,12 +7,31 @@
     </template>
 
     <template id="portal_my_home_menu_sale" name="Portal layout : sales menu entries" inherit_id="website_portal.portal_layout" priority="20">
-        <xpath expr="//ul[contains(@class,'o_portal_submenu')]" position="inside">
-            <li t-if="quotation_count" t-att-class="page_name == 'quote' and 'active'">
-                <a href="/my/quotes">Quotations</a>
+        <xpath expr="//ol[contains(@class,'o_portal_submenu')]" position="inside">
+            <li t-if="page_name == 'quote' or sales_order and sales_order.state == 'sent'">
+                <a t-if="sales_order" t-attf-href="/my/quotes?{{ keep_query() }}">
+                    My Quotations
+                </a>
+                <t t-else="">
+                    My Quotations
+                </t>
             </li>
-            <li t-att-class="page_name == 'order' and 'active'">
-                <a href="/my/orders">Sales Orders</a>
+            <li t-if="page_name == 'order' or sales_order and sales_order.state != 'sent'">
+                <a t-if="sales_order" t-attf-href="/my/orders?{{ keep_query() }}">
+                    My Sales Orders
+                </a>
+                <t t-else="">
+                    My Sales Orders
+                </t>
+            </li>
+            <li t-if="sales_order">
+                <t t-if="sales_order.state == 'sent'">
+                      Quotation
+                </t>
+                <t t-if="sales_order.state != 'sent'">
+                      Order
+                </t>
+                <t t-esc="sales_order.name"/>
             </li>
         </xpath>
     </template>
@@ -20,21 +39,15 @@
     <template id="portal_my_home_sale" name="Portal My Home : sales entries" inherit_id="website_portal.portal_my_home" priority="20">
         <xpath expr="//div[contains(@class,'o_my_home_content')]" position="inside">
             <h3 t-if="quotation_count" class="page-header">
-              <a href="/my/quotes">Your Quotations
-                <small class="ml8">
-                  <span class='badge'><t t-esc="quotation_count"/></span>
-                </small>
+              <a href="/my/quotes">My Quotations
+                <span class="badge ml8" t-esc="quotation_count"/>
               </a>
             </h3>
             <h3 class="page-header">
-                <a href="/my/orders">Your Sales Orders
-                    <small class="ml8">
-                        <t t-if="order_count">
-                            <span class='badge'><t t-esc="order_count"/></span>
-                        </t>
-                        <t t-if="not order_count">
-                            There are currently no orders.
-                        </t>
+                <a href="/my/orders">My Sales Orders
+                    <span t-if="order_count" class="badge ml8" t-esc="order_count"/>
+                    <small t-if="not order_count" class="ml8">
+                        There are currently no orders.
                     </small>
                 </a>
             </h3>
@@ -44,7 +57,7 @@
     <template id="portal_my_quotations" name="My Quotations">
       <t t-call="website_portal.portal_layout">
         <div class="page-header">
-            <span class="h3">Your Quotations</span>
+            <span class="h3">My Quotations</span>
             <t t-call="website_portal.portal_searchbar"/>
         </div>
         <t t-if="not quotations">
@@ -91,7 +104,7 @@
     <template id="portal_my_orders" name="My Sales Orders">
       <t t-call="website_portal.portal_layout">
         <div class="page-header">
-            <span class="h3">Your Sales Orders</span>
+            <span class="h3">My Sales Orders</span>
             <t t-call="website_portal.portal_searchbar"/>
         </div>
         <t t-if="not orders">
@@ -142,188 +155,157 @@
     </template>
 
     <template id="orders_followup" name="Sales Order">
-      <t t-call="website.layout">
-        <div id="wrap">
-            <div class="container">
-              <div class="oe_structure">
-                <div class="row">
-                    <div class="col-sm-4">
-                        <ol class="breadcrumb mt8">
-                            <li><a href="/my/home"><i class="fa fa-home"/></a></li>
-                            <li>
-                              <a t-attf-href="/my/#{'quotes' if order.state == 'sent' else 'orders'}?{{ keep_query()}}">
-                                <t t-if="order.state == 'sent'">
-                                    My Quotations
-                                </t>
-                                <t t-if="order.state != 'sent'">
-                                    My Sales Orders
-                                </t>
-                              </a>
-                            </li>
-                            <li>
-                              <t t-if="order.state == 'sent'">
-                                  Quotation
-                              </t>
-                              <t t-if="order.state != 'sent'">
-                                  Order
-                              </t>
-                              <t t-esc="order.name"/>
-                            </li>
-                        </ol>
-                    </div>
+      <t t-call="website_portal.portal_layout">
+        <t t-set="sales_order" t-value="order"/> <!-- rename to ensure breadcrumb compatibility (differentiate with purchase orders) -->
+        <div id="optional_placeholder"></div>
+        <div class="container">
+
+          <div class="panel panel-default">
+            <div class="panel-heading">
+              <div class="row">
+                <div class="col-md-12">
+                  <h4>
+                    <t t-call='website_portal.record_pager'/>
+                    <t t-if="order.state == 'sent'">
+                      Quotation
+                    </t>
+                    <t t-if="order.state != 'sent'">
+                      Order
+                    </t>
+                    <span t-esc="order.name"/>
+                  </h4>
                 </div>
               </div>
-              <div id="optional_placeholder"></div>
-              <div class="container">
-
-                  <div class="panel panel-default">
-                    <div class="panel-heading">
-                      <div class="row">
-                        <div class="col-md-12">
-                          <h4>
-                            <t t-call='website_portal.record_pager'/>
-                            <t t-if="order.state == 'sent'">
-                              Quotation
-                            </t>
-                            <t t-if="order.state != 'sent'">
-                              Order
-                            </t>
-                            <span t-esc="order.name"/>
-                          </h4>
-                        </div>
-                      </div>
+            </div>
+            <div class="panel-body">
+              <!-- <hr/> -->
+              <div class="mb8">
+                  <strong>Date:</strong> <span t-field="order.create_date" t-options='{"widget": "date"}'/>
+              </div>
+              <div class='row'>
+                <div class="col-md-6">
+                  <div>
+                    <strong>Invoicing Address</strong>
+                  </div>
+                  <div>
+                    <address t-field="order.partner_invoice_id" t-options='{"widget": "contact", "fields": ["address", "name"], "no_marker": True}'/>
+                  </div>
+                  <t t-set="invoices" t-value="[i for i in order.invoice_ids if i.state not in ['draft', 'cancel']]"/>
+                  <t t-if="invoices">
+                    <div>
+                      <strong>Invoices</strong>
                     </div>
-                    <div class="panel-body">
-                      <!-- <hr/> -->
-                      <div class="mb8">
-                          <strong>Date:</strong> <span t-field="order.create_date" t-options='{"widget": "date"}'/>
-                      </div>
-                      <div class='row'>
-                        <div class="col-md-6">
-                          <div>
-                            <strong>Invoicing Address</strong>
-                          </div>
-                          <div>
-                            <address t-field="order.partner_invoice_id" t-options='{"widget": "contact", "fields": ["address", "name"], "no_marker": True}'/>
-                          </div>
-                          <t t-set="invoices" t-value="[i for i in order.invoice_ids if i.state not in ['draft', 'cancel']]"/>
-                          <t t-if="invoices">
-                            <div>
-                              <strong>Invoices</strong>
-                            </div>
-                            <div>
-                              <t t-foreach="invoices" t-as="i">
-                                <t t-set="report_url" t-value="'/my/invoices/%s' % i.id"/>
-                                <div>
-                                  <a t-att-href="report_url"><span class="fa fa-download"/></a>
-                                  <a t-att-href="report_url"><span t-esc="i.number"/></a>
-                                  <span class="text-muted" t-field="i.date_invoice"/>
-                                  <t t-if="i.state == 'paid'">
-                                    <span class="label label-success orders_label_text_align"><i class="fa fa-fw fa-check"/> Paid</span>
-                                  </t>
-                                  <t t-if="i.state != 'paid'">
-                                    <span class="label label-info orders_label_text_align"><i class="fa fa-fw fa-clock-o"/> Waiting</span>
-                                  </t>
-                                </div>
-                              </t>
-                            </div>
+                    <div>
+                      <t t-foreach="invoices" t-as="i">
+                        <t t-set="report_url" t-value="'/my/invoices/%s' % i.id"/>
+                        <div>
+                          <a t-att-href="report_url"><span class="fa fa-download"/></a>
+                          <a t-att-href="report_url"><span t-esc="i.number"/></a>
+                          <span class="text-muted" t-field="i.date_invoice"/>
+                          <t t-if="i.state == 'paid'">
+                            <span class="label label-success orders_label_text_align"><i class="fa fa-fw fa-check"/> Paid</span>
+                          </t>
+                          <t t-if="i.state != 'paid'">
+                            <span class="label label-info orders_label_text_align"><i class="fa fa-fw fa-clock-o"/> Waiting</span>
                           </t>
                         </div>
-                        <div id="shipping_address" class="col-md-6">
-                          <div>
-                            <strong>Shipping Address</strong>
-                          </div>
-                          <div>
-                            <address t-field="order.partner_shipping_id" t-options='{"widget": "contact", "fields": ["address", "name"], "no_marker": True}'/>
-                          </div>
-                        </div>
-                      </div>
-
-                      <hr/>
-
-                      <div class="row">
-                        <div class="col-md-6">
-                          <strong>Product</strong>
-                        </div>
-                        <div class="hidden-sm hidden-xs col-md-2 text-right">
-                          <strong>Unit Price</strong>
-                        </div>
-                        <div class="hidden-sm hidden-xs col-md-2 text-right">
-                          <strong>Quantity</strong>
-                        </div>
-                        <div class="hidden-sm hidden-xs col-md-2 text-right">
-                          <strong>Subtotal</strong>
-                        </div>
-                      </div>
-                      <t t-foreach="order.order_line" t-as="ol">
-                        <div class="row orders_vertical_align">
-                            <div class="visible-lg col-lg-1 text-center">
-                              <span t-field="ol.product_image" t-options="{'widget': 'image', 'class': 'img-rounded', 'style':'width: 48px;height:48px'}" />
-                            </div>
-                            <div id='product_name' class="col-lg-4 col-sm-6 col-xs-4">
-                              <span t-esc="ol.product_id.name"/>
-                            </div>
-                          <div class="col-xs-3 text-right">
-                            <span t-field="ol.price_unit" t-options='{"widget": "monetary", "display_currency": order.pricelist_id.currency_id}'/>
-                          </div>
-                          <div class="col-xs-2 text-right">
-                            <t t-if="ol._name == 'sale.order.line'">
-                              <span t-esc="ol.product_uom_qty"/>
-                            </t>
-                            <t t-if="ol._name == 'account.invoice.line'">
-                              <span t-esc="ol.quantity"/>
-                            </t>
-                          </div>
-                          <div class="col-sm-2 col-xs-3 text-right">
-                            <span t-field="ol.price_subtotal" t-options='{"widget": "monetary", "display_currency": order.pricelist_id.currency_id}'/>
-                          </div>
-                        </div>
                       </t>
+                    </div>
+                  </t>
+                </div>
+                <div id="shipping_address" class="col-md-6">
+                  <div>
+                    <strong>Shipping Address</strong>
+                  </div>
+                  <div>
+                    <address t-field="order.partner_shipping_id" t-options='{"widget": "contact", "fields": ["address", "name"], "no_marker": True}'/>
+                  </div>
+                </div>
+              </div>
 
-                      <hr/>
+              <hr/>
 
-                      <div class="row">
-                        <div class="col-md-6">
-                          <div>
-                            <strong>Contact</strong>
-                          </div>
-                          <div t-field="order.user_id.partner_id" t-options='{"widget": "contact", "fields": ["email", "phone"]}'/>
-                          <br/>
-                        </div>
-                        <div class="col-md-6">
-                          <div class="row">
-                            <div class="col-md-9 col-xs-8 text-right">
-                              Untaxed Amount:
-                            </div>
-                            <div class="col-md-3 col-xs-4 text-right">
-                              <span t-field="order.amount_untaxed" t-options='{"widget": "monetary", "display_currency": order.pricelist_id.currency_id}'/>
-                            </div>
-                          </div>
-                          <div class="row">
-                            <div class="col-md-9 col-xs-8 text-right">
-                              Taxes:
-                            </div>
-                            <div class="col-md-3 col-xs-4 text-right">
-                              <span t-field="order.amount_tax" t-options='{"widget": "monetary", "display_currency": order.pricelist_id.currency_id}'/>
-                            </div>
-                          </div>
-                          <div class="row">
-                            <div class="col-md-9 col-xs-8 text-right">
-                              <strong>Total:</strong>
-                            </div>
-                            <div class="col-md-3 col-xs-4 text-right">
-                              <strong><span t-field="order.amount_total" t-options='{"widget": "monetary", "display_currency": order.pricelist_id.currency_id}'/></strong>
-                            </div>
-                          </div>
-                        </div>
-                      </div>
+              <div class="row">
+                <div class="col-md-6">
+                  <strong>Product</strong>
+                </div>
+                <div class="hidden-sm hidden-xs col-md-2 text-right">
+                  <strong>Unit Price</strong>
+                </div>
+                <div class="hidden-sm hidden-xs col-md-2 text-right">
+                  <strong>Quantity</strong>
+                </div>
+                <div class="hidden-sm hidden-xs col-md-2 text-right">
+                  <strong>Subtotal</strong>
+                </div>
+              </div>
+              <t t-foreach="order.order_line" t-as="ol">
+                <div class="row orders_vertical_align">
+                    <div class="visible-lg col-lg-1 text-center">
+                      <span t-field="ol.product_image" t-options="{'widget': 'image', 'class': 'img-rounded', 'style':'width: 48px;height:48px'}" />
+                    </div>
+                    <div id='product_name' class="col-lg-4 col-sm-6 col-xs-4">
+                      <span t-esc="ol.product_id.name"/>
+                    </div>
+                  <div class="col-xs-3 text-right">
+                    <span t-field="ol.price_unit" t-options='{"widget": "monetary", "display_currency": order.pricelist_id.currency_id}'/>
+                  </div>
+                  <div class="col-xs-2 text-right">
+                    <t t-if="ol._name == 'sale.order.line'">
+                      <span t-esc="ol.product_uom_qty"/>
+                    </t>
+                    <t t-if="ol._name == 'account.invoice.line'">
+                      <span t-esc="ol.quantity"/>
+                    </t>
+                  </div>
+                  <div class="col-sm-2 col-xs-3 text-right">
+                    <span t-field="ol.price_subtotal" t-options='{"widget": "monetary", "display_currency": order.pricelist_id.currency_id}'/>
+                  </div>
+                </div>
+              </t>
+
+              <hr/>
+
+              <div class="row">
+                <div class="col-md-6">
+                  <div>
+                    <strong>Contact</strong>
+                  </div>
+                  <div t-field="order.user_id.partner_id" t-options='{"widget": "contact", "fields": ["email", "phone"]}'/>
+                  <br/>
+                </div>
+                <div class="col-md-6">
+                  <div class="row">
+                    <div class="col-md-9 col-xs-8 text-right">
+                      Untaxed Amount:
+                    </div>
+                    <div class="col-md-3 col-xs-4 text-right">
+                      <span t-field="order.amount_untaxed" t-options='{"widget": "monetary", "display_currency": order.pricelist_id.currency_id}'/>
                     </div>
                   </div>
-
+                  <div class="row">
+                    <div class="col-md-9 col-xs-8 text-right">
+                      Taxes:
+                    </div>
+                    <div class="col-md-3 col-xs-4 text-right">
+                      <span t-field="order.amount_tax" t-options='{"widget": "monetary", "display_currency": order.pricelist_id.currency_id}'/>
+                    </div>
+                  </div>
+                  <div class="row">
+                    <div class="col-md-9 col-xs-8 text-right">
+                      <strong>Total:</strong>
+                    </div>
+                    <div class="col-md-3 col-xs-4 text-right">
+                      <strong><span t-field="order.amount_total" t-options='{"widget": "monetary", "display_currency": order.pricelist_id.currency_id}'/></strong>
+                    </div>
+                  </div>
+                </div>
               </div>
-              <div class="oe_structure mb32"/>
+            </div>
           </div>
+
         </div>
+        <div class="oe_structure mb32"/>
       </t>
     </template>
 
diff --git a/addons/website_project/views/project_templates.xml b/addons/website_project/views/project_templates.xml
index 0a4f7622795..441905cf9f5 100644
--- a/addons/website_project/views/project_templates.xml
+++ b/addons/website_project/views/project_templates.xml
@@ -1,12 +1,28 @@
 <?xml version="1.0" encoding="utf-8"?>
 <odoo>
     <template id="portal_layout" name="Portal layout: project menu entry" inherit_id="website_portal.portal_layout" priority="40">
-        <xpath expr="//ul[contains(@class,'o_portal_submenu')]" position="inside">
-            <li t-if="project_count" t-att-class="page_name == 'project' and 'active'">
-                <a href="/my/projects">Projects</a>
+        <xpath expr="//ol[contains(@class,'o_portal_submenu')]" position="inside">
+            <li t-if="page_name == 'project' or project">
+                <a t-if="project" t-attf-href="/my/projects?{{ keep_query() }}">
+                    Projects
+                </a>
+                <t t-else="">
+                    Projects
+                </t>
             </li>
-            <li t-if="task_count" t-att-class="page_name == 'task' and 'active'">
-                <a href="/my/tasks">Tasks</a>
+            <li t-if="project">
+                <t t-esc="project.name"/>
+            </li>
+            <li t-if="page_name == 'task' or task">
+                <a t-if="task" t-attf-href="/my/tasks?{{ keep_query() }}">
+                    My Tasks
+                </a>
+                <t t-else="">
+                    My Tasks
+                </t>
+            </li>
+            <li t-if="task">
+                <span t-field="task.name"/>
             </li>
         </xpath>
     </template>
@@ -14,17 +30,13 @@
     <template id="portal_my_home" name="Portal My Home: project entries" inherit_id="website_portal.portal_my_home" priority="40">
         <xpath expr="//div[contains(@class,'o_my_home_content')]" position="inside">
             <h3 t-if="project_count" class="page-header">
-                <a href="/my/projects">Your Projects
-                    <small class="ml8">
-                        <span class='badge'><t t-esc="project_count"/></span>
-                    </small>
+                <a href="/my/projects">My Projects
+                    <span class="badge ml8" t-esc="project_count"/>
                 </a>
             </h3>
             <h3 t-if="task_count" class="page-header">
-                <a href="/my/tasks">Your Tasks
-                    <small class="ml8">
-                        <span class='badge'><t t-esc="task_count"/></span>
-                    </small>
+                <a href="/my/tasks">My Tasks
+                    <span class="badge ml8" t-esc="task_count"/>
                 </a>
             </h3>
         </xpath>
@@ -34,7 +46,7 @@
         <t t-call="website_portal.portal_layout">
             <div class="row">
                 <h3 class="page-header">
-                    Your Projects
+                    My Projects
                     <t t-call="website_portal.portal_searchbar"/>
                 </h3>
             </div>
@@ -73,80 +85,63 @@
     </template>
 
     <template id="my_project" name="My Project">
-        <t t-call="website.layout">
-            <div id="wrap">
-                <div class="container">
-                    <div class="oe_structure">
-                        <div class="row">
-                            <div class="col-sm-4">
-                                <ol class="breadcrumb mt8">
-                                    <li><a href="/my/home"><i class="fa fa-home"/></a></li>
-                                    <li><a t-attf-href="/my/projects?#{keep_query()}">My Projects</a></li>
-                                    <li><span t-field="project.name"/></li>
-                                </ol>
-                            </div>
-                        </div>
-                    </div>
-                    <div class="container">
-                        <div class="panel panel-default">
-                            <div class="panel-heading">
-                                <div class="row">
-                                    <div class="col-md-12">
-                                        <h4>
-                                            <t t-call='website_portal.record_pager'/>
-                                            Project - <span t-field="project.name"/>
-                                        </h4>
-                                    </div>
-                                </div>
-                            </div>
-                            <div class="panel-body">
-                                <div class='row'>
-                                    <div class="col-md-6">
-                                        <t t-if="project.partner_id">
-                                            <strong>Customer</strong>
-                                            <div t-if="project.partner_id">
-                                                <address t-field="project.partner_id" t-field-options='{"widget": "contact", "fields": ["name", "email"]}'/>
-                                            </div>
-                                        </t>
-                                        <t t-if="project.user_id">
-                                            <strong>Project Manager</strong>
-                                            <div>
-                                                <address t-field="project.user_id" t-field-options='{"widget": "contact", "fields": ["name", "email", "phone"]}'/>
-                                            </div>
-                                        </t>
-                                    </div>
-                                    <div class="col-md-6">
-                                        <div class="pull-right">
-                                            <a t-attf-href="/my/tasks?filterby=#{project.id}" class="btn btn-default btn-lg">
-                                                <span class="fa fa-tasks" />
-                                                <span t-esc="project.task_count" />
-                                                <span t-field="project.label_tasks" />
-                                            </a>
-                                        </div>
-                                    </div>
-                                </div>
-                            </div>
-                        </div>
-                        <div class="row mt32">
-                            <div class="col-md-12">
-                                <h4><strong>Message and communication history</strong></h4>
-                            </div>
-                            <div class="col-md-10 col-md-offset-1 mt16">
-                                <t t-call="website_mail.message_thread">
-                                    <t t-set="object" t-value="project"/>
-                                </t>
+        <t t-call="website_portal.portal_layout">
+            <div class="panel panel-default">
+                <div class="panel-heading">
+                    <div class="row">
+                        <div class="col-md-12">
+                            <h4>
+                                <t t-call='website_portal.record_pager'/>
+                                Project - <span t-field="project.name"/>
+                            </h4>
+                        </div>
+                    </div>
+                </div>
+                <div class="panel-body">
+                    <div class='row'>
+                        <div class="col-md-6">
+                            <t t-if="project.partner_id">
+                                <strong>Customer</strong>
+                                <div t-if="project.partner_id">
+                                    <address t-field="project.partner_id" t-field-options='{"widget": "contact", "fields": ["name", "email"]}'/>
+                                </div>
+                            </t>
+                            <t t-if="project.user_id">
+                                <strong>Project Manager</strong>
+                                <div>
+                                    <address t-field="project.user_id" t-field-options='{"widget": "contact", "fields": ["name", "email", "phone"]}'/>
+                                </div>
+                            </t>
+                        </div>
+                        <div class="col-md-6">
+                            <div class="pull-right">
+                                <a t-attf-href="/my/tasks?filterby=#{project.id}" class="btn btn-default btn-lg">
+                                    <span class="fa fa-tasks" />
+                                    <span t-esc="project.task_count" />
+                                    <span t-field="project.label_tasks" />
+                                </a>
                             </div>
                         </div>
                     </div>
                 </div>
             </div>
+            <div class="row mt32">
+                <div class="col-md-12">
+                    <h4><strong>Message and communication history</strong></h4>
+                </div>
+                <div class="col-md-10 col-md-offset-1 mt16">
+                    <t t-call="website_mail.message_thread">
+                        <t t-set="object" t-value="project"/>
+                    </t>
+                </div>
+            </div>
         </t>
     </template>
 
     <template id="my_tasks" name="My Tasks">
         <t t-call="website_portal.portal_layout">
             <h3 class="page-header">
-                Your Tasks
+                My Tasks
                 <t t-call="website_portal.portal_searchbar"/>
             </h3>
             <t t-if="not tasks">
@@ -183,82 +178,65 @@
     </template>
 
     <template id="my_task" name="My Task">
-        <t t-call="website.layout">
-            <div id="wrap">
-                <div class="container">
-                    <div class="oe_structure">
-                        <div class="row">
-                            <div class="col-sm-6">
-                                <ol class="breadcrumb mt8">
-                                    <li><a href="/my/home"><i class="fa fa-home"/></a></li>
-                                    <li><a t-attf-href="/my/tasks?#{keep_query()}">My Tasks</a></li>
-                                    <li><span t-field="task.name"/></li>
-                                </ol>
+        <t t-call="website_portal.portal_layout">
+            <div class="panel panel-default">
+                <div class="panel-heading">
+                    <div class="row">
+                        <div class="col-md-12">
+                            <h4>
+                                <t t-call='website_portal.record_pager'/>
+                                Task - <span t-field="task.name"/>
+                                <span t-field="task.stage_id.name" class="pull-right label label-info" title="Current stage of this task"/>
+                                <a class="btn btn-info" t-att-href="'/web#return_label=Website&amp;model=project.task&amp;id=%s&amp;view_type=form' % (task.id)" groups="project.group_project_user">Edit Task</a>
+                            </h4>
+                        </div>
+                    </div>
+                </div>
+                <div class="panel-body">
+                    <div class="mb8" t-if="user.partner_id.id in task.sudo().project_id.message_partner_ids.ids">
+                        <strong>Project:</strong> <a t-attf-href="/my/project/#{task.project_id.id}" t-field="task.project_id.name"/>
+                    </div>
+
+                    <div class='row'>
+                        <div class="col-md-6">
+                            <div class="mb8">
+                                <strong>Date:</strong> <span t-field="task.create_date" t-field-options='{"widget": "date"}'/>
+                            </div>
+
+                            <div t-if="task.user_id">
+                                <strong>Assigned to</strong>
+                                <div>
+                                    <address t-field="task.user_id" t-field-options='{"widget": "contact", "fields": ["name", "email", "phone"]}'/>
+                                </div>
+                            </div>
+                        </div>
+                        <div class="col-md-6">
+                            <div class="mb8" t-if="task.date_deadline">
+                                <strong>Deadline:</strong> <span t-field="task.date_deadline" t-field-options='{"widget": "date"}'/>
+                            </div>
+                            <div t-if="task.partner_id">
+                                <strong>Reported by</strong>
+                                <div>
+                                    <address t-field="task.partner_id" t-field-options='{"widget": "contact", "fields": ["name", "email"]}'/>
+                                </div>
                             </div>
                         </div>
                     </div>
-                    <div class="container">
-                        <div class="panel panel-default">
-                            <div class="panel-heading">
-                                <div class="row">
-                                    <div class="col-md-12">
-                                        <h4>
-                                            <t t-call='website_portal.record_pager'/>
-                                            Task - <span t-field="task.name"/>
-                                            <span t-field="task.stage_id.name" class="pull-right label label-info" title="Current stage of this task"/>
-                                            <a class="btn btn-info" t-att-href="'/web#return_label=Website&amp;model=project.task&amp;id=%s&amp;view_type=form' % (task.id)" groups="project.group_project_user">Edit Task</a>
-                                        </h4>
-                                    </div>
-                                </div>
-                            </div>
-                            <div class="panel-body">
-                                <div class="mb8" t-if="user.partner_id.id in task.sudo().project_id.message_partner_ids.ids">
-                                    <strong>Project:</strong> <a t-attf-href="/my/project/#{task.project_id.id}" t-field="task.project_id.name"/>
-                                </div>
-
-                                <div class='row'>
-                                    <div class="col-md-6">
-                                        <div class="mb8">
-                                            <strong>Date:</strong> <span t-field="task.create_date" t-field-options='{"widget": "date"}'/>
-                                        </div>
-
-                                        <div t-if="task.user_id">
-                                            <strong>Assigned to</strong>
-                                            <div>
-                                                <address t-field="task.user_id" t-field-options='{"widget": "contact", "fields": ["name", "email", "phone"]}'/>
-                                            </div>
-                                        </div>
-                                    </div>
-                                    <div class="col-md-6">
-                                        <div class="mb8" t-if="task.date_deadline">
-                                            <strong>Deadline:</strong> <span t-field="task.date_deadline" t-field-options='{"widget": "date"}'/>
-                                        </div>
-                                        <div t-if="task.partner_id">
-                                            <strong>Reported by</strong>
-                                            <div>
-                                                <address t-field="task.partner_id" t-field-options='{"widget": "contact", "fields": ["name", "email"]}'/>
-                                            </div>
-                                        </div>
-                                    </div>
-                                </div>
-                                <div class="container" t-if="task.description">
-                                    <p t-field="task.description" />
-                                </div>
-                            </div>
-                        </div>
-                        <div class="row mt32">
-                            <div class="col-md-12">
-                                <h4><strong>Message and communication history</strong></h4>
-                            </div>
-                            <div class="col-md-10 col-md-offset-1 mt16">
-                                <t t-call="website_mail.message_thread">
-                                    <t t-set="object" t-value="task"/>
-                                </t>
-                            </div>
-                        </div>
+                    <div class="container" t-if="task.description">
+                        <p t-field="task.description" />
                     </div>
                 </div>
             </div>
+            <div class="row mt32">
+                <div class="col-md-12">
+                    <h4><strong>Message and communication history</strong></h4>
+                </div>
+                <div class="col-md-10 col-md-offset-1 mt16">
+                    <t t-call="website_mail.message_thread">
+                        <t t-set="object" t-value="task"/>
+                    </t>
+                </div>
+            </div>
         </t>
     </template>
 </odoo>
diff --git a/addons/website_project_issue/views/project_issue_templates.xml b/addons/website_project_issue/views/project_issue_templates.xml
index 686d7f5f428..55eb6be5590 100644
--- a/addons/website_project_issue/views/project_issue_templates.xml
+++ b/addons/website_project_issue/views/project_issue_templates.xml
@@ -2,9 +2,17 @@
 <odoo>
 
     <template id="portal_layout" name="Portal layout: Issues menu entry" inherit_id="website_portal.portal_layout" priority="45">
-        <xpath expr="//ul[contains(@class,'o_portal_submenu')]" position="inside">
-            <li t-if="issue_count" t-att-class="page_name == 'issue' and 'active'">
-                <a href="/my/issues">Issues</a>
+        <xpath expr="//ol[contains(@class,'o_portal_submenu')]" position="inside">
+            <li t-if="page_name == 'issue' or issue">
+                <a t-if="issue" t-attf-href="/my/issues?{{ keep_query() }}">
+                    My Issues
+                </a>
+                <t t-else="">
+                    My Issues
+                </t>
+            </li>
+            <li t-if="issue">
+                Issue <span t-esc="issue.id"/>
             </li>
         </xpath>
     </template>
@@ -12,10 +20,8 @@
     <template id="portal_my_home" name="Portal My Home: Issue entries" inherit_id="website_portal.portal_my_home" priority="45">
         <xpath expr="//div[contains(@class,'o_my_home_content')]" position="inside">
             <h3 t-if="issue_count" class="page-header">
-                <a href="/my/issues">Your Issues
-                    <small class="ml8">
-                        <span class='badge'><t t-esc="issue_count"/></span>
-                    </small>
+                <a href="/my/issues">My Issues
+                    <span class="badge ml8" t-esc="issue_count"/>
                 </a>
             </h3>
         </xpath>
@@ -24,7 +30,7 @@
     <template id="my_issues" name="My Issues">
         <t t-call="website_portal.portal_layout">
             <h3 class="page-header">
-                Your Issues
+                My Issues
                 <t t-call="website_portal.portal_searchbar"/>
             </h3>
             <t t-if="not issues">
@@ -61,87 +67,70 @@
     </template>
 
     <template id="my_issues_issue" name="My Issue">
-        <t t-call="website.layout">
-            <div id="wrap">
-                <div class="container">
-                    <div class="oe_structure">
-                        <div class="row">
-                            <div class="col-sm-4">
-                                <ol class="breadcrumb mt8">
-                                    <li><a href="/my/home"><i class="fa fa-home"/></a></li>
-                                    <li><a t-attf-href="/my/issues?#{keep_query()}">My Issues</a></li>
-                                    <li>Issue <span t-esc="issue.id"/></li>
-                                </ol>
-                            </div>
+        <t t-call="website_portal.portal_layout">
+            <div class="panel panel-default">
+                <div class="panel-heading">
+                    <div class="row">
+                        <div class="col-md-12">
+                            <h4>
+                                <t t-call='website_portal.record_pager'/>
+                                Issue <span t-esc="issue.id"/> - <span t-field="issue.name"/>
+                                <a class="btn btn-info" t-att-href="'/web#return_label=Website&amp;model=project.issue&amp;id=%s&amp;view_type=form' % (issue.id)" groups="project.group_project_user">Edit Issue</a>
+                                <span t-field="issue.stage_id.name" class="pull-right label label-info" title="Current stage of this issue"/>
+                            </h4>
                         </div>
                     </div>
-                    <div class="container">
-                        <div class="panel panel-default">
-                            <div class="panel-heading">
-                                <div class="row">
-                                    <div class="col-md-12">
-                                        <h4>
-                                            <t t-call='website_portal.record_pager'/>
-                                            Issue <span t-esc="issue.id"/> - <span t-field="issue.name"/>
-                                            <a class="btn btn-info" t-att-href="'/web#return_label=Website&amp;model=project.issue&amp;id=%s&amp;view_type=form' % (issue.id)" groups="project.group_project_user">Edit Issue</a>
-                                            <span t-field="issue.stage_id.name" class="pull-right label label-info" title="Current stage of this issue"/>
-                                        </h4>
-                                    </div>
-                                </div>
-                            </div>
-                            <div class="panel-body">
-                                <div class="mb8">
-                                    <strong>Date:</strong> <span t-field="issue.create_date" t-options='{"widget": "date"}'/>
-                                </div>
-                                <div class='row'>
-                                    <div class="col-md-6" t-if="issue.user_id">
-                                        <strong>Assigned to</strong>
-                                        <div>
-                                            <address t-field="issue.user_id" t-options='{"widget": "contact", "fields": ["name", "email", "phone"], "no_marker": True}'/>
-                                        </div>
-                                    </div>
-                                    <div class="col-md-6">
-                                        <strong>Reported by</strong>
-                                        <div t-if="issue.partner_id">
-                                            <address t-field="issue.partner_id" t-options='{"widget": "contact", "fields": ["name", "email"], "no_marker": True}'/>
-                                        </div>
-                                    </div>
-                                    <t t-if="issue.description">
-                                        <div class="col-md-12">
-                                            <strong>Description</strong>
-                                            <div t-field="issue.description"/>
-                                        </div>
-                                    </t>
-                                </div>
-                            </div>
-                            <div t-if="issue.attachment_ids" class='panel-footer'>
-                                <strong>
-                                    <t t-if='len(issue.attachment_ids)&gt;1'>Attachments</t>
-                                    <t t-else="">Attachment</t>
-                                </strong>
-                                <div class='row'>
-                                    <div class="col-md-2 col-sm-3 text-center oe_attachments" t-foreach='issue.attachment_ids' t-as='attachment'>
-                                        <a t-attf-href="/web/content/#{attachment.id}?download=true" target="_blank">
-                                            <div class='oe_attachment_embedded o_image o_image_small' t-att-title="attachment.name" t-att-data-mimetype="attachment.mimetype" t-attf-data-src="/web/image/#{attachment.id}/50x40"/>
-                                            <div class='oe_attachment_name'><t t-esc='attachment.name' /></div>
-                                        </a>
-                                    </div>
-                                </div>
+                </div>
+                <div class="panel-body">
+                    <div class="mb8">
+                        <strong>Date:</strong> <span t-field="issue.create_date" t-options='{"widget": "date"}'/>
+                    </div>
+                    <div class='row'>
+                        <div class="col-md-6" t-if="issue.user_id">
+                            <strong>Assigned to</strong>
+                            <div>
+                                <address t-field="issue.user_id" t-options='{"widget": "contact", "fields": ["name", "email", "phone"], "no_marker": True}'/>
                             </div>
                         </div>
-                        <div class="row mt32">
+                        <div class="col-md-6">
+                            <strong>Reported by</strong>
+                            <div t-if="issue.partner_id">
+                                <address t-field="issue.partner_id" t-options='{"widget": "contact", "fields": ["name", "email"], "no_marker": True}'/>
+                            </div>
+                        </div>
+                        <t t-if="issue.description">
                             <div class="col-md-12">
-                                <h4><strong>Message and communication history</strong></h4>
-                            </div>
-                            <div class="col-md-10 col-md-offset-1 mt16">
-                                <t t-call="website_mail.message_thread">
-                                    <t t-set="object" t-value="issue"/>
-                                </t>
+                                <strong>Description</strong>
+                                <div t-field="issue.description"/>
                             </div>
+                        </t>
+                    </div>
+                </div>
+                <div t-if="issue.attachment_ids" class='panel-footer'>
+                    <strong>
+                        <t t-if='len(issue.attachment_ids)&gt;1'>Attachments</t>
+                        <t t-else="">Attachment</t>
+                    </strong>
+                    <div class='row'>
+                        <div class="col-md-2 col-sm-3 text-center oe_attachments" t-foreach='issue.attachment_ids' t-as='attachment'>
+                            <a t-attf-href="/web/content/#{attachment.id}?download=true" target="_blank">
+                                <div class='oe_attachment_embedded o_image o_image_small' t-att-title="attachment.name" t-att-data-mimetype="attachment.mimetype" t-attf-data-src="/web/image/#{attachment.id}/50x40"/>
+                                <div class='oe_attachment_name'><t t-esc='attachment.name' /></div>
+                            </a>
                         </div>
                     </div>
                 </div>
             </div>
+            <div class="row mt32">
+                <div class="col-md-12">
+                    <h4><strong>Message and communication history</strong></h4>
+                </div>
+                <div class="col-md-10 col-md-offset-1 mt16">
+                    <t t-call="website_mail.message_thread">
+                        <t t-set="object" t-value="issue"/>
+                    </t>
+                </div>
+            </div>
         </t>
     </template>
 
diff --git a/addons/website_quote/controllers/main.py b/addons/website_quote/controllers/main.py
index b91bd0023a7..8e4359ecbec 100644
--- a/addons/website_quote/controllers/main.py
+++ b/addons/website_quote/controllers/main.py
@@ -54,7 +54,7 @@ class sale_quote(http.Controller):
             'order_valid': (not order_sudo.validity_date) or (now <= order_sudo.validity_date),
             'days_valid': days,
             'action': request.env.ref('sale.action_quotations').id,
-            'breadcrumb': request.env.user.partner_id == order_sudo.partner_id,
+            'no_breadcrumbs': request.env.user.partner_id.commercial_partner_id not in order_sudo.message_partner_ids,
             'tx_id': Transaction.id if Transaction else False,
             'tx_state': Transaction.state if Transaction else False,
             'tx_post_msg': Transaction.acquirer_id.post_msg if Transaction else False,
diff --git a/addons/website_quote/views/website_quote_templates.xml b/addons/website_quote/views/website_quote_templates.xml
index d9ffd6a5da4..e9cd619ad69 100644
--- a/addons/website_quote/views/website_quote_templates.xml
+++ b/addons/website_quote/views/website_quote_templates.xml
@@ -166,20 +166,10 @@
 
   <!-- Complete page of the quotation -->
   <template id="so_quotation" name="Product Quotation">
-      <t t-call="website.layout">
+      <t t-call="website_portal.portal_layout">
+        <t t-set="sales_order" t-value="quotation"/> <!-- rename to ensure breadcrumb compatibility with website_portal_sale's portal_layout inheritance -->
         <body data-spy="scroll" data-target=".navspy" data-offset="50">
             <div class="container o_website_quote">
-              <div t-if="breadcrumb" class="row">
-                  <div class="col-sm-4">
-                      <ol class="breadcrumb mt8">
-                          <li><a href="/my/home"><i class="fa fa-home"/></a></li>
-                          <li><a t-attf-href="/my/quotes?#{keep_query()}">My Quotations</a></li>
-                          <li>
-                              Quotation <t t-esc="quotation.name"/>
-                          </li>
-                      </ol>
-                  </div>
-              </div>
               <div class="row mt16">
                 <!-- Sidebar -->
                   <div class="col-md-3 hidden-print">