diff --git a/addons/website_event_track/data/event_demo.xml b/addons/website_event_track/data/event_demo.xml
index a7fa71d5978..92cf6db243c 100644
--- a/addons/website_event_track/data/event_demo.xml
+++ b/addons/website_event_track/data/event_demo.xml
@@ -95,10 +95,6 @@
                 <section data-snippet-id="text-block">
                     <div class="container">
                         <div class="row">
-                            <div class="col-md-12 text-center">
-                                <h2>A Better Future With OpenERP Commerce</h2>
-                                <h3 class="text-muted mt0">by Georges Lucas, OpenCorp Director</h3>
-                            </div>
                             <div class="col-md-12">
                                 <p>
                                 Apart from being an enterprise management software, OpenERP is
@@ -130,10 +126,6 @@
                 <section data-snippet-id="text-block">
                     <div class="container">
                         <div class="row">
-                            <div class="col-md-12 text-center">
-                                <h2>A Better Future With OpenERP Commerce</h2>
-                                <h3 class="text-muted mt0">by Georges Lucas, OpenCorp Director</h3>
-                            </div>
                             <div class="col-md-12">
                                 <p>
                                 Apart from being an enterprise management software, OpenERP is
@@ -150,6 +142,22 @@
             </field>
         </record>
 
+        <record id="base.res_partner_address_16" model="res.partner">
+            <field name="website">http://facebook.com/openerp</field>
+            <field name="website_description" type="xml">
+                <p>
+                    Ayaan has in the IT sector <b>since 20 years</b>. He
+                    develops software to help develop websites.  He sold his
+                    first company at 30 years old and manage to grow OpenCorp
+                    from 1 to 55 employees mostly by reselling services on
+                    OpenERP.
+                </p><p>
+                    Ayaan is the <b>author of several books</b>, including Amazon best seller
+                    "How OpenERP will change the business world!".
+                </p>
+            </field>
+        </record>
+
         <record id="track_3" model="event.track">
             <field name="name">Social Marketing As a Source of Leads</field>
             <field name="event_id" ref="event.event_0"/>
@@ -163,35 +171,16 @@
             <field name="tag_ids" eval="[(6, 0, [ref('website_event_track.event_track_tag4')])]"/>
             <field name="description" type="xml">
                 <section data-snippet-id="text-block">
-                    <div class="container">
-                        <div class="row">
-                            <div class="col-md-12 text-center">
-                                <h2>Social Marketing As a Source of Leads</h2>
-                                <h3 class="text-muted mt0">by Georges Lucas, OpenCorp Director</h3>
-                            </div>
-                            <div class="col-md-12">
-                                <p>
-                                Apart from being an enterprise management software, OpenERP is
-                                used nowadays for a great variety of enterprise frontends.
-                                </p><p>
-                                The talk illustrates the impact of OpenERP in areas such as the
-                                company website, online events management, eCommerce, online
-                                recruitments, social media marketing, etc.
-                                </p>
-                            </div>
-                            <div class="col-md-12">
-                                <h3>About The Author</h3>
-                                <p>
-                                    Georges Lucas is <b>Director at OpenElec</b>. He develops software
-                                    since he has 13 years old. 
-                                    He sold his first company at 30 years old and manage to
-                                    grow OpenCorp from 1 to 55 employees mostly by reselling
-                                    services on OpenERP.
-                                </p><p>
-                                    Georges is the <b>author of several books</b>, including Amazon best seller
-                                    "How OpenERP will change the business world!".
-                                </p>
-                            </div>
+                    <div class="row">
+                        <div class="col-md-12">
+                            <p>
+                            Apart from being an enterprise management software, OpenERP is
+                            used nowadays for a great variety of enterprise frontends.
+                            </p><p>
+                            The talk illustrates the impact of OpenERP in areas such as the
+                            company website, online events management, eCommerce, online
+                            recruitments, social media marketing, etc.
+                            </p>
                         </div>
                     </div>
                 </section>
diff --git a/addons/website_event_track/models/event.py b/addons/website_event_track/models/event.py
index 75dd3e8588b..4aac7ea2a36 100644
--- a/addons/website_event_track/models/event.py
+++ b/addons/website_event_track/models/event.py
@@ -143,7 +143,7 @@ class event_event(osv.osv):
         context = context or {}
         result = super(event_event, self)._get_new_menu_pages(cr, uid, event, context=context)
         if event.show_tracks:
-            result.append( (_('Agenda'), '/event/%s/track/' % event.id))
+            result.append( (_('Talks'), '/event/%s/track/' % event.id))
         if event.blog_id:
             result.append( (_('News'), '/blogpost/'+str(event.blog_ig.id)))
         if event.show_track_proposal:
diff --git a/addons/website_event_track/views/website_event.xml b/addons/website_event_track/views/website_event.xml
index 3d162ad7d41..f7956b93935 100644
--- a/addons/website_event_track/views/website_event.xml
+++ b/addons/website_event_track/views/website_event.xml
@@ -34,38 +34,38 @@
         <div name="left_column">
         </div>
         <div class="col-md-9">
-            <div class="row">
-                <t t-foreach="tracks" t-as="track">
-                    <div class="col-sm-2">
-                        <t t-if="len(track.speaker_ids)">
-                            <span t-field="track.speaker_ids[0].image"
-                                t-field-options='{"widget": "image", "class": "img-circle"}'/>
-                        </t>
-                    </div>
-                    <div class="col-sm-10">
-                        <h3 class="mt0 mb0">
-                            <a t-href="/event/#{ slug(event) }/track/#{ slug(track) }"><span t-field="track.name"> </span></a>
-                            <small t-if="not track.website_published" class="label label-danger">not published</small>
-                        </h3>
-                        <ul class="list-inline mb0">
-                            <li t-if="track.speaker_ids" class="text-muted fa fa-user">
-                                <t t-foreach="track.speaker_ids" t-as="speaker">
-                                    <t t-esc="speaker.name"/>, 
-                                </t>
-                            </li>
-                            <li class="text-muted fa fa-calendar"><span t-field="track.date"/></li>
-                        </ul>
-                        <ul class="list-inline">
-                            <li t-foreach="track.tag_ids" t-as="tag_id" class="text-muted fa fa-tags">
-                                <a t-href="/event/#{ slug(event) }/track/tag/#{ slug(tag_id) }">
-                                    <span t-field="tag_id.name"/>
-                                </a>
-                            </li>
-                        </ul>
-                        <p class="mt8"><t t-esc="html2text(track.description or '')[0:500]"/>...</p>
-                    </div>
-                    <div class="clearfix mb32"/>
-                </t>
+            <div class="row mb32" t-foreach="tracks" t-as="track">
+                <div class="col-sm-2">
+                    <t t-if="len(track.speaker_ids)">
+                        <span t-field="track.speaker_ids[0].image"
+                            t-field-options='{"widget": "image", "class": "img-circle"}'/>
+                    </t>
+                </div>
+                <div class="col-sm-10">
+                    <h3 class="mt0 mb0">
+                        <a t-href="/event/#{ slug(event) }/track/#{ slug(track) }"><span t-field="track.name"> </span></a>
+                        <small t-if="not track.website_published" class="label label-danger">not published</small>
+                    </h3>
+                    <ul class="list-inline mb0">
+                        <li t-if="track.speaker_ids" class="text-muted fa fa-user">
+                            <t t-foreach="track.speaker_ids" t-as="speaker">
+                                <t t-esc="speaker.name"/>, 
+                            </t>
+                        </li>
+                        <li class="text-muted fa fa-calendar"> <span t-field="track.date"/></li>
+                        <li class="text-muted fa fa-map-marker" t-if="track.location_id">
+                            <span t-field="track.location_id"/>
+                        </li>
+                    </ul>
+                    <ul class="list-inline">
+                        <li t-foreach="track.tag_ids" t-as="tag_id" class="text-muted fa fa-tags">
+                            <a t-href="/event/#{ slug(event) }/track/tag/#{ slug(tag_id) }">
+                                <span t-field="tag_id.name"/>
+                            </a>
+                        </li>
+                    </ul>
+                    <p class="mt8"><t t-esc="html2text(track.description or '')[0:500]"/>...</p>
+                </div>
             </div>
         </div>
     </t>
@@ -92,37 +92,64 @@
 
 
 <template id="track_view">
-    <t t-call="website_event.event_details">
-        <div class="col-md-8">
-            <h2 t-field="track.name"/>
-            <div t-field="track.description"/>
-        </div>
-        <div class="col-md-4">
-            <div class="panel panel-default">
-                <div class="panel-heading">
-                    <h4>Informations</h4>
+    <t t-call="website_event.layout">
+        <div class="container">
+            <h2 t-field="track.name" class="text-center"/>
+            <h3 t-field="event.name" class="text-center text-muted"/>
+            <ul t-if="track.tag_ids" class="text-center text-muted list-inline">
+                <li t-foreach="track.tag_ids" t-as="tag_id" class="fa fa-tags">
+                    <a t-href="/event/#{ slug(event) }/track/tag/#{ slug(tag_id) }">
+                        <span t-field="tag_id.name"/>
+                    </a>
+                </li>
+            </ul>
+
+            <section class="row mt32">
+                <div class="col-md-8">
+                    <div t-field="track.description"/>
+
+                    <hr/>
+                    <div t-foreach="track.speaker_ids" t-as="speaker" class="row">
+                        <div class="col-sm-2">
+                            <span t-field="speaker.image"
+                                t-field-options='{"widget": "image", "class": "img-circle"}'/>
+                        </div><div class="col-sm-10">
+                           <h4 t-field="speaker.name" class="mb4"/>
+                           <div class="fa fa-home mb16" t-if="speaker.website">
+                               <a t-att-href="speaker.website"><span t-field="speaker.website"/></a>
+                           </div>
+                           <div t-field="speaker.website_description"/>
+                        </div>
+                    </div>
+
                 </div>
-                <div class="panel-body">
-                    <t t-foreach="track.tag_ids" t-as="tag_id">
-                        <span class="label label-default" t-field="tag_id.name"/>
-                    </t>
-                    <b>Date</b><br/>
-                    <span t-field="track.date"/><br/>
-                    <b>Duration</b><br/>
-                    <span t-field="track.duration"/> minutes<br/>
-                    <b>Location</b><br/>
-                    <span t-field="track.location_id"/><br/>
+                <div class="col-md-4">
+                    <div class="panel panel-default">
+                        <div class="panel-heading">
+                            <h4>Practical Info</h4>
+                        </div>
+                        <div class="panel-body">
+                            <b>Date</b><br/>
+                            <span t-field="track.date"/><br/>
+                            <b>Duration</b><br/>
+                            <span t-field="track.duration"/> minutes<br/>
+                            <b>Location</b><br/>
+                            <span t-field="track.location_id"/><br/>
+                        </div>
+                    </div>
+
+                    <div class="panel panel-default" t-if="False">
+                        <div class="panel-heading">
+                            <h4>Documents</h4>
+                        </div>
+                        <div class="panel-body">
+                            Put here the list of documents, like slides of
+                            the presentations. Remove the above t-if when
+                            it's implemented.
+                        </div>
+                    </div>
                 </div>
-            </div>
-            <div class="panel panel-default">
-                <div class="panel-heading">
-                    <h4>Speakers</h4>
-                </div>
-                <div class="panel-body">
-                    <b>Speakers</b><br/>
-                    <span t-field="track.speaker_ids"/>
-                </div>
-            </div>
+            </section>
         </div>
     </t>
 </template>