diff --git a/addons/website_event_track/controllers/event.py b/addons/website_event_track/controllers/event.py
index dad04cb6d29..0da067fc733 100644
--- a/addons/website_event_track/controllers/event.py
+++ b/addons/website_event_track/controllers/event.py
@@ -69,12 +69,6 @@ class website_event(http.Controller):
         }
         return request.website.render("website_event_track.tracks", values)
 
-    @website.route(['/event/detail/<model("event.event"):event>'], type='http', auth="public", multilang=True)
-    def event_detail(self, event, **post):
-        website.preload_records(event, on_error="website_event.404")
-        values = { 'event': event, 'main_object': event }
-        return request.website.render("website_event_track.event_home", values)
-
     @website.route(['/event/<model("event.event"):event>/track_proposal/'], type='http', auth="public", multilang=True)
     def event_track_proposal(self, event, **post):
         website.preload_records(event, on_error="website_event.404")
diff --git a/addons/website_event_track/data/event_demo.xml b/addons/website_event_track/data/event_demo.xml
index 3b4690a08e6..a7fa71d5978 100644
--- a/addons/website_event_track/data/event_demo.xml
+++ b/addons/website_event_track/data/event_demo.xml
@@ -86,8 +86,43 @@
             <field name="event_id" ref="event.event_0"/>
             <field name="website_published" eval="True"/>
             <field name="duration" eval="60"/>
-            <field name="date">2014-12-01 10:00:00</field>
-            <field name="speaker_ids" eval="[(6, 0, [ref('base.res_partner_address_12')])]"/>
+            <field eval="(DateTime.now() + timedelta(days=2)).strftime('%Y-%m-%d 10:00:00')" name="date_begin"/>
+            <field name="speaker_ids" eval="[(6, 0, [ref('base.res_partner_address_4')])]"/>
+            <field name="location_id" ref="website_event_track.event_track_location2"/>
+            <field name="stage_id" ref="website_event_track.event_track_stage3"/>
+            <field name="tag_ids" eval="[(6, 0, [ref('website_event_track.event_track_tag1')])]"/>
+            <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>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
+                                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>
+                    </div>
+                </section>
+            </field>
+        </record>
+
+        <record id="track_2" model="event.track">
+            <field name="name">How To Drive Sales With OpenERP CRM</field>
+            <field name="event_id" ref="event.event_0"/>
+            <field name="website_published" eval="True"/>
+            <field name="duration" eval="60"/>
+            <field name="priority">1</field>
+            <field eval="(DateTime.now() + timedelta(days=2)).strftime('%Y-%m-%d 11:00:00')" name="date_begin"/>
+            <field name="speaker_ids" eval="[(6, 0, [ref('base.res_partner_address_13')])]"/>
             <field name="location_id" ref="website_event_track.event_track_location2"/>
             <field name="stage_id" ref="website_event_track.event_track_stage3"/>
             <field name="tag_ids" eval="[(6, 0, [ref('website_event_track.event_track_tag2'), ref('website_event_track.event_track_tag3')])]"/>
@@ -109,6 +144,41 @@
                                 recruitments, social media marketing, etc.
                                 </p>
                             </div>
+                        </div>
+                    </div>
+                </section>
+            </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"/>
+            <field name="website_published" eval="True"/>
+            <field name="duration" eval="40"/>
+            <field name="priority">0</field>
+            <field eval="(DateTime.now() + timedelta(days=2)).strftime('%Y-%m-%d 14:00:00')" name="date_begin"/>
+            <field name="speaker_ids" eval="[(6, 0, [ref('base.res_partner_address_16')])]"/>
+            <field name="location_id" ref="website_event_track.event_track_location1"/>
+            <field name="stage_id" ref="website_event_track.event_track_stage4"/>
+            <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>
diff --git a/addons/website_event_track/models/event.py b/addons/website_event_track/models/event.py
index d6895b3c70f..75dd3e8588b 100644
--- a/addons/website_event_track/models/event.py
+++ b/addons/website_event_track/models/event.py
@@ -58,7 +58,7 @@ class event_track_location(osv.osv):
 
 class event_track(osv.osv):
     _name = "event.track"
-    _order = 'date'
+    _order = 'priority, date'
     _inherit = ['mail.thread', 'ir.needaction_mixin', 'website.seo.metadata']
 
     def _website_url(self, cr, uid, ids, field_name, arg, context=None):
diff --git a/addons/website_event_track/views/event_backend.xml b/addons/website_event_track/views/event_backend.xml
index b2f31cf5459..5ef9401f00c 100644
--- a/addons/website_event_track/views/event_backend.xml
+++ b/addons/website_event_track/views/event_backend.xml
@@ -314,7 +314,7 @@
                                 <field name="date"/>
                                 <label for="duration"/>
                                 <div>
-                                    <field name="duration"/> minutes
+                                    <field name="duration" class="oe_inline"/> minutes
                                 </div>
                                 <field name="tag_ids" widget="many2many_tags"/>
                             </group>
diff --git a/addons/website_event_track/views/website_event.xml b/addons/website_event_track/views/website_event.xml
index 9790a5d5652..3d162ad7d41 100644
--- a/addons/website_event_track/views/website_event.xml
+++ b/addons/website_event_track/views/website_event.xml
@@ -2,39 +2,6 @@
 <openerp>
 <data>
 
-<template id="event_home">
-    <t t-call="website.layout">
-      <div id="wrap">
-        <div class="oe_structure"/>
-        <div class="container">
-            <div class="row">
-                <div class="col-sm-5">
-                    <h1 t-field="event.name" class="mt16"></h1>
-                </div>
-                <div class="col-sm-2">
-                    <div class="mt16">
-                        <t t-call="website.publish_management">
-                            <t t-set="object" t-value="event"/>
-                            <t t-set="publish_edit" t-value="True"/>
-                            <t t-set="publish_controller">/event/publish</t>
-                        </t>
-                    </div>
-                </div>
-                <div class="col-sm-5">
-                    <ul class="nav nav-pills pull-right mt16">
-                        <li class="active"><a href="#">Event</a></li>
-                        <li><a href="#">Agenda</a></li>
-                        <li><a href="#">Location</a></li>
-                        <li><a href="#">Registration</a></li>
-                    </ul>
-                </div>
-            </div>
-        </div>
-        <div class="oe_structure"/>
-      </div>
-    </t>
-</template>
-
 <template name="Sponsors" id="event_sponsor" inherit_option_id="website_event.layout" inherit_id="website_event.layout">
     <xpath expr="//t[@t-call='website.layout']" position="inside">
         <t t-set="head">
@@ -64,42 +31,65 @@
 
 <template id="tracks">
     <t t-call="website_event.event_details">
-        <div class="col-md-3 css_noprint">
-
-            <ul class="nav nav-pills nav-stacked">
-                <li t-att-class="'' if searches.get('tag') else 'active'"><a t-href="/event/#{ slug(event) }/track/">All</a></li>
-                <t t-foreach="tags" t-as="tag">
-                    <li t-att-class="searches.get('tag') == tag.id and 'active' or ''">
-                        <a t-href="/event/#{ slug(event) }/track/tag/#{ slug(tag) }">
-                            <t t-esc="tag.name"/>
-                        </a>
-                    </li>
-                </t>
-            </ul>
+        <div name="left_column">
         </div>
         <div class="col-md-9">
-
-            <ul class="media-list">
-                <li t-foreach="tracks" t-as="track" class="media">
-                    <div class="media-body">
-                        <h4 class="media-heading">
-                            <a t-href="/event/#{ slug(event) }/track/#{ slug(track) }"><span t-field="track.name"> </span></a>
-                            <span t-field="track.date"/>
-                            <!-- <small t-if="not track.website_published" class="label label-danger">not published</small> -->
-                        </h4>
-                        <div><span t-esc="html2text(track.description)[0:400]"/>...</div>
-                        <div>
-                            <t t-foreach="track.tag_ids" t-as="tag_id">
-                                <span class="label label-default" t-field="tag_id.name"/>
-                            </t>
-                        </div>
+            <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>
-                </li>
-            </ul>
+                    <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>
         </div>
     </t>
 </template>
 
+<template id="tracks_filter" inherit_id="website_event_track.tracks" inherit_option_id="website_event_track.tracks" name="Filter on Tags">
+    <xpath expr="//div[@name='left_column']" position="inside">
+        <ul class="nav nav-pills nav-stacked">
+            <li t-att-class="'' if searches.get('tag') else 'active'"><a t-href="/event/#{ slug(event) }/track/">All Tags</a></li>
+            <t t-foreach="tags" t-as="tag">
+                <li t-att-class="searches.get('tag') == tag.id and 'active' or ''">
+                    <a t-href="/event/#{ slug(event) }/track/tag/#{ slug(tag) }">
+                        <t t-esc="tag.name"/>
+                    </a>
+                </li>
+            </t>
+        </ul>
+    </xpath>
+    <xpath expr="//div[@name='left_column']" position="attributes">
+        <attribute name="class">col-md-3 css_no_print</attribute>
+    </xpath>
+</template>
+
+
 
 <template id="track_view">
     <t t-call="website_event.event_details">