diff --git a/addons/website_event/__manifest__.py b/addons/website_event/__manifest__.py
index 87840ad78fe..e857daa823b 100644
--- a/addons/website_event/__manifest__.py
+++ b/addons/website_event/__manifest__.py
@@ -15,6 +15,7 @@
         'views/event_snippets.xml',
         'views/event_templates.xml',
         'views/event_templates_misc_pages.xml',
+        'views/event_templates_registration.xml',
         'views/event_views.xml',
         'security/ir.model.access.csv',
         'security/event_security.xml',
diff --git a/addons/website_event/views/event_templates.xml b/addons/website_event/views/event_templates.xml
index 638738526b8..812df267bbc 100644
--- a/addons/website_event/views/event_templates.xml
+++ b/addons/website_event/views/event_templates.xml
@@ -397,31 +397,6 @@
     </t>
 </template>
 
-<template id="event_details" name="Event Header">
-    <t t-call="website_event.layout">
-        <div name="event" itemscope="itemscope" itemtype="http://schema.org/Event">
-            <t t-call="website.record_cover">
-                <t t-set="_record" t-value="event"/>
-                <t t-set="use_filters" t-value="True"/>
-                <t t-set="use_size" t-value="True"/>
-                <t t-set="use_text_align" t-value="True"/>
-
-                <div class="container d-flex flex-column flex-grow-1 justify-content-around">
-                    <div class="o_wevent_event_title">
-                        <span t-if="event.is_participating" class="badge badge-success o_wevent_badge"><i class="fa fa-check mr-2"/>Registered</span>
-                        <h1 t-field="event.name" class="o_wevent_event_name" itemprop="name" placeholder="Event Title"/>
-                        <h2 t-field="event.subtitle" class="o_wevent_event_subtitle" placeholder="Event Subtitle"/>
-                    </div>
-                </div>
-                <div class="container">
-                    <t t-call="website_event.registration_template"/>
-                </div>
-            </t>
-            <t t-raw="0"/>
-        </div>
-    </t>
-</template>
-
 <!-- Event - Description -->
 <template id="event_description_full" name="Event Description" track="1">
     <t t-call="website_event.event_details">
@@ -509,257 +484,6 @@
     </t>
 </template>
 
-<!-- Event - Registration -->
-<template id="registration_template" name="Registration">
-    <div t-if="request.env.user.has_group('event.group_event_manager')" class="alert alert-info rounded-0 o_website_event_configuration o_not_editable" role="status">
-        <a t-attf-href="/web#id=#{event.id}&amp;view_type=form&amp;model=event.event">
-            <i class="fa fa-pencil mr-2" role="img" aria-label="Edit" title="Edit event registration in backend"/><em>Configure Event Tickets</em>
-        </a>
-    </div>
-    <div t-if="not event.event_registrations_open" class="bg-white mb-5">
-        <div class="alert alert-info mb-0 d-flex justify-content-between align-items-center" role="status">
-            <t t-if="event.start_sale_date and event.start_sale_date &gt; datetime.date.today()">
-                <em class="col-md-8">Ticket Sales starting on <t t-esc="event.start_sale_date"/></em>
-                <button class="btn btn-danger mr-1 ml-3 col-md-4"  disabled="1">Registrations not yet open</button>
-            </t>
-            <t t-else="">
-                <div class="col-md-8">
-                    <em t-if="event.event_registrations_sold_out">Tickets for this Event are <b>Sold Out</b></em>
-                    <em t-else="">Registrations are <b>closed</b></em>
-                </div>
-                <button class="btn btn-danger ml-3 col-md-4 py-2" disabled="1">
-                    <span t-if="event.event_registrations_sold_out">Sold Out</span>
-                    <span t-else="">Registrations Closed</span>
-                </button>
-            </t>
-        </div>
-    </div>
-    <form t-if="event.event_registrations_open and (not event.event_ticket_ids or not all([ticket.is_expired for ticket in event.event_ticket_ids]))"
-        id="registration_form"
-        class="mb-5"
-        t-attf-action="/event/#{slug(event)}/registration/new" method="post"
-        itemscope="itemscope" itemprop="offers" itemtype="http://schema.org/AggregateOffer">
-        <input type="hidden" name="csrf_token" t-att-value="request.csrf_token()"/>
-        <div id="o_wevent_tickets" class="bg-white shadow-sm o_wevent_js_ticket_details" data-folded-by-default="0">
-            <t t-set="tickets" t-value="event.event_ticket_ids.filtered(lambda ticket: not ticket.is_expired)"/>
-            <!-- If some tickets expired and there is only one type left, we keep the same layout -->
-            <t t-if="len(event.event_ticket_ids) &gt; 1">
-                <div class="d-flex justify-content-between align-items-center py-2 pl-3 pr-2 border-bottom">
-                    <div id="price-range" class="pr-3 d-none"/>
-                    <span t-if="not event.event_registrations_open" class="text-danger">
-                        <i class="fa fa-ban mr-2"/>Sold Out
-                    </span>
-                    <div t-if="event.is_participating" id="registered" class="ml-auto pr-3 d-none">
-                        <span  class="text-success ml-3">
-                            <i class="fa fa-check mr-2"/>Registered
-                        </span>
-                    </div>
-                    <a href="#" role="button" class="btn o_wevent_registration_btn text-left" data-target="#o_wevent_tickets_collapse">
-                        <span class="py-2">Tickets</span>
-                        <span class="close d-none">×</span>
-                    </a>
-                </div>
-                <div id="o_wevent_tickets_collapse" class="collapse show">
-                    <div t-foreach="tickets" t-as="ticket" class="row px-3 py-3 mx-0 bg-light border-bottom">
-                        <div class="col-md-8 col-xs-12 p-0" itemscope="itemscope" itemtype="http://schema.org/Offer">
-                            <h5 itemprop="name" t-field="ticket.name" class="my-0"/>
-                            <t t-if="ticket.description">
-                                <small t-field="ticket.description" class="text-muted py-2"/>
-                                <br/>
-                            </t>
-                            <small t-if="ticket.end_sale_date and ticket.sale_available and not ticket.is_expired" class="text-muted mr-3" itemprop="availabilityEnds">Sales end on <span itemprop="priceValidUntil" t-field="ticket.end_sale_date"/></small>
-                            <small t-if="ticket.start_sale_date and not ticket.sale_available and not ticket.is_expired" class="text-muted mr-3" itemprop="availabilityEnds">Sales start on <span itemprop="priceValidUntil" t-field="ticket.start_sale_date"/></small>
-                        </div>
-                        <div class="col-md-4 col-xs-12 p-0 d-flex align-items-center justify-content-between">
-                            <div class="o_wevent_registration_multi_select"/>
-                            <div class="w-auto ml-auto">
-                                <select t-if="not ticket.is_expired and ticket.sale_available"
-                                    t-attf-name="nb_register-#{ticket.id}"
-                                    class="custom-select">
-                                    <t t-set="seats_max_ticket" t-value="(not ticket.seats_limited or ticket.seats_available &gt; 9) and 10 or ticket.seats_available + 1"/>
-                                    <t t-set="seats_max_event" t-value="(not event.seats_limited or event.seats_available &gt; 9) and 10 or event.seats_available + 1"/>
-                                    <t t-set="seats_max" t-value="min(seats_max_ticket, seats_max_event)"/>
-                                    <t t-foreach="range(0, seats_max)" t-as="nb">
-                                        <option t-esc="nb" t-att-selected="len(ticket) == 0 and nb == 0 and 'selected'"/>
-                                    </t>
-                                </select>
-                                <div t-else="" class="text-danger">
-                                    <span t-if="not ticket.sale_available and not ticket.is_expired and ticket.is_launched()" >Sold Out</span>
-                                    <span t-if="ticket.is_expired">Expired</span>
-                                </div>
-                            </div>
-                        </div>
-                    </div>
-                    <div class="row no-gutters">
-                        <div class="col-md-4 offset-md-8 py-2 pl-md-0 pr-md-2">
-                            <button type="submit" class="btn btn-primary o_wait_lazy_js btn-block a-submit" disabled="" t-attf-id="#{event.id}">
-                                Register
-                                <t t-if="event.seats_limited and event.seats_max and event.seats_available &lt;= (event.seats_max * 0.2)">
-                                    (only <t t-esc="event.seats_available"/> available)
-                                </t>
-                            </button>
-                        </div>
-                    </div>
-                </div>
-            </t>
-            <div t-else="" class="o_wevent_registration_single">
-                <div class="row p-2 pl-3">
-                    <div class="col-lg-8 d-flex flex-columns align-items-center" itemscope="itemscope" itemtype="http://schema.org/Offer">
-                        <h6 itemprop="name" class="my-0 pr-3 border-right text-dark">
-                            <span t-if="tickets" t-field="tickets.name"/>
-                            <span t-else="">Registration</span>
-                        </h6>
-                        <div class="ml-auto">
-                            <t t-if="event.event_registrations_open">
-                                <span class="text-dark font-weight-bold align-middle pr-2">Qty</span>
-                                <link itemprop="availability" content="http://schema.org/InStock"/>
-                                <select t-att-name="'nb_register-%s' % (tickets.id if tickets else 0)" class="w-auto custom-select">
-                                    <t t-set="seats_max_ticket" t-value="(not tickets or not tickets.seats_limited or tickets.seats_available &gt; 9) and 10 or tickets.seats_available + 1"/>
-                                    <t t-set="seats_max_event" t-value="(not event.seats_limited or event.seats_available &gt; 9) and 10 or event.seats_available + 1"/>
-                                    <t t-set="seats_max" t-value="min(seats_max_ticket, seats_max_event) if tickets else seats_max_event"/>
-                                    <t t-foreach="range(0, seats_max)" t-as="nb">
-                                        <option t-esc="nb" t-att-selected="nb == 1 and 'selected'"/>
-                                    </t>
-                                </select>
-                            </t>
-                            <t t-else="">
-                                <span itemprop="availability" content="http://schema.org/SoldOut" class="text-danger">
-                                    <i class="fa fa-ban mr-2"/>Sold Out
-                                </span>
-                            </t>
-                        </div>
-                    </div>
-                    <div class="col-lg-4 pt-3 pt-lg-0 pl-2 pl-lg-0">
-                        <button type="submit" class="btn btn-primary o_wait_lazy_js btn-block a-submit" t-attf-id="#{event.id}">
-                            Register
-                            <t t-if="event.seats_limited and event.seats_max and event.seats_available &lt;= (event.seats_max * 0.2)">
-                                (only <t t-esc="event.seats_available"/> available)
-                            </t>
-                        </button>
-                    </div>
-                </div>
-            </div>
-        </div>
-    </form>
-</template>
-
-<template id="registration_attendee_details" name="Registration Attendee Details">
-    <div id="modal_attendees_registration" class="modal fade" tabindex="-1" role="dialog">
-        <div class="modal-dialog modal-lg" role="document">
-            <form id="attendee_registration" t-attf-action="/event/#{slug(event)}/registration/confirm" method="post" class="js_website_submit_form">
-                <input type="hidden" name="csrf_token" t-att-value="request.csrf_token()"/>
-                <div class="modal-content">
-                    <div class="modal-header align-items-center">
-                        <h4 class="modal-title">Attendees</h4>
-                        <button type="button" class="close" data-dismiss="modal" aria-label="Close"><span>&amp;times;</span></button>
-                    </div>
-                    <t t-set="counter_type" t-value="1"/>
-                    <t t-set="counter" t-value="0"/>
-                    <t t-foreach="tickets" t-as="ticket" t-if="availability_check">
-                        <t t-foreach="range(1, ticket['quantity'] + 1)" t-as="att_counter" name="attendee_loop">
-                            <t t-set="counter" t-value="counter + 1"/>
-                            <div class="modal-body bg-light border-bottom">
-                                <h5 class="mt-1 pb-2 border-bottom">Ticket #<span t-esc="counter"/> <small class="text-muted">- <span t-esc="ticket['name']"/></small></h5>
-                                <div class="row">
-                                    <div class="col-lg my-2">
-                                        <label>Name</label>
-                                        <input class="form-control" type="text" t-attf-name="#{counter}-name" required="This field is required"/>
-                                    </div>
-                                    <div class="col-lg my-2">
-                                        <label>Email</label>
-                                        <input class="form-control" type="email" t-attf-name="#{counter}-email" required="This field is required"/>
-                                    </div>
-                                    <div class="col-lg my-2">
-                                        <label>Phone <small>(Optional)</small></label>
-                                        <input class="form-control" type="tel" t-attf-name="#{counter}-phone"/>
-                                    </div>
-                                    <input class="d-none" type="text" t-attf-name="#{counter}-event_ticket_id" t-attf-value="#{ticket['id']}"/>
-                                </div>
-                            </div>
-                        </t>
-                        <t t-set="counter_type" t-value="counter_type + 1"/>
-                    </t>
-                    <t t-if="not availability_check">
-                        <div class="modal-body bg-light border-bottom">
-                            <strong> You ordered more tickets than available seats</strong>
-                        </div>
-                    </t>
-                    <div class="modal-footer border-0 justify-content-between">
-                        <button type="button" class="btn btn-secondary js_goto_event" data-dismiss="modal">Cancel</button>
-                        <button type="submit" class="btn btn-primary" t-if="availability_check">Continue</button>
-                    </div>
-                </div>
-            </form>
-        </div>
-    </div>
-</template>
-
-<template id="registration_complete" name="Registration Completed">
-    <t t-call="website_event.layout">
-        <div class="container my-5 o_wereg_confirmed">
-            <div class="row mb-3">
-                <div class="col-12">
-                    <h3>Registration confirmed!</h3>
-                    <span class="h4 text-muted" t-esc="event.name"/>
-                </div>
-            </div>
-            <div class="row mb-3 o_wereg_confirmed_attendees">
-                <div class="col-md-4 col-xs-12 mt-3" t-foreach="attendees" t-as="attendee">
-                    <div class="d-flex flex-column">
-                        <span class="font-weight-bold">
-                            <t t-if="attendee.name" t-esc="attendee.name"/>
-                            <t t-else="">N/A</t>
-                        </span>
-                        <span>
-                            <i class="fa fa-envelope mr-2   "></i>
-                            <t t-if="attendee.email" t-esc="attendee.email"/>
-                            <t t-else="">N/A</t>
-                        </span>
-                        <span>
-                            <i class="fa fa-phone mr-2"></i>
-                            <t t-if="attendee.phone" t-esc="attendee.phone"/>
-                            <t t-else="">N/A</t>
-                        </span>
-                        <span>
-                            <i class="fa fa-ticket mr-2"></i>
-                            <t t-if="attendee.event_ticket_id" t-esc="attendee.event_ticket_id.name"/>
-                            <t t-else="">N/A</t>
-                            (ref: <t t-esc="attendee.id"/>)
-                        </span>
-                    </div>
-                </div>
-            </div>
-            <div class="row mb-3">
-                <div class="col-lg-8">
-                    <p><b>Start</b> <span itemprop="startDate" t-esc="event.date_begin_located"/><br/> <b>End</b> <span itemprop="endDate" t-esc="event.date_end_located"/></p>
-                    <div id="add_to_calendar" class="mt-4">
-                        <a role="button" class="btn btn-primary" t-att-href="iCal_url">
-                            <i class="fa fa-fw fa-calendar"/> Add to iCal/Outlook
-                        </a>
-                        <a role="button" class="btn btn-primary" t-att-href="google_url" target='_blank'>
-                            <i class="fa fa-fw fa-calendar"/> Add to Google Calendar
-                        </a>
-                    </div>
-                </div>
-                <div class="col-lg-4">
-                    <h4 t-field="event.address_id" class="text-secondary font-weight-bold" t-options='{
-                        "widget": "contact",
-                        "fields": ["name"]
-                        }'/>
-                    <a itemprop="location" t-att-href="event.google_map_link()" target="_BLANK" temprop="location" t-field="event.address_id" t-options='{
-                        "widget": "contact",
-                        "fields": ["address"]
-                        }'/>
-                    <div itemprop="location" t-field="event.address_id" t-options='{
-                        "widget": "contact",
-                        "fields": ["phone", "mobile", "email"]
-                        }'/>
-                </div>
-            </div>
-        </div>
-    </t>
-</template>
-
 <template id="404" name="Event 404">
     <t t-call="website.layout">
         <div id="wrap">
@@ -791,26 +515,4 @@
     </xpath>
 </template>
 
-<template id="fold_register_details" inherit_id="website_event.registration_template" active="False" customize_show="True" name="Fold ticket details">
-    <xpath expr="//div[@id='o_wevent_tickets']" position="attributes">
-        <attribute name="data-folded-by-default">1</attribute>
-    </xpath>
-    <xpath expr="//div[@id='registered']" position="attributes">
-        <attribute name="class">ml-auto pr-3</attribute>
-    </xpath>
-    <xpath expr="//div[@id='price-range']" position="attributes">
-        <attribute name="class">ml-0 pr-3</attribute>
-    </xpath>
-    <xpath expr="//div[@id='o_wevent_tickets_collapse']" position="attributes">
-        <attribute name="class">collapse</attribute>
-    </xpath>
-    <xpath expr="//a[hasclass('o_wevent_registration_btn')]" position="attributes">
-        <attribute name="class">btn btn-primary o_wevent_registration_btn collapsed</attribute>
-        <attribute name="data-toggle">collapse</attribute>
-    </xpath>
-    <xpath expr="//span[hasclass('close')]" position="attributes">
-        <attribute name="class">close d-none</attribute>
-    </xpath>
-</template>
-
 </odoo>
diff --git a/addons/website_event/views/event_templates_registration.xml b/addons/website_event/views/event_templates_registration.xml
new file mode 100644
index 00000000000..e82ab8e475e
--- /dev/null
+++ b/addons/website_event/views/event_templates_registration.xml
@@ -0,0 +1,303 @@
+<?xml version="1.0" encoding="utf-8"?>
+<odoo>
+
+<template id="event_details" name="Event Header">
+    <t t-call="website_event.layout">
+        <div name="event" itemscope="itemscope" itemtype="http://schema.org/Event">
+            <t t-call="website.record_cover">
+                <t t-set="_record" t-value="event"/>
+                <t t-set="use_filters" t-value="True"/>
+                <t t-set="use_size" t-value="True"/>
+                <t t-set="use_text_align" t-value="True"/>
+
+                <div class="container d-flex flex-column flex-grow-1 justify-content-around">
+                    <div class="o_wevent_event_title">
+                        <span t-if="event.is_participating" class="badge badge-success o_wevent_badge"><i class="fa fa-check mr-2"/>Registered</span>
+                        <h1 t-field="event.name" class="o_wevent_event_name" itemprop="name" placeholder="Event Title"/>
+                        <h2 t-field="event.subtitle" class="o_wevent_event_subtitle" placeholder="Event Subtitle"/>
+                    </div>
+                </div>
+                <div class="container">
+                    <t t-call="website_event.registration_template"/>
+                </div>
+            </t>
+            <t t-raw="0"/>
+        </div>
+    </t>
+</template>
+
+<!-- Event - Registration -->
+<template id="registration_template" name="Registration">
+    <div t-if="request.env.user.has_group('event.group_event_manager')" class="alert alert-info rounded-0 o_website_event_configuration o_not_editable" role="status">
+        <a t-attf-href="/web#id=#{event.id}&amp;view_type=form&amp;model=event.event">
+            <i class="fa fa-pencil mr-2" role="img" aria-label="Edit" title="Edit event registration in backend"/><em>Configure Event Tickets</em>
+        </a>
+    </div>
+    <div t-if="not event.event_registrations_open" class="bg-white mb-5">
+        <div class="alert alert-info mb-0 d-flex justify-content-between align-items-center" role="status">
+            <t t-if="event.start_sale_date and event.start_sale_date &gt; datetime.date.today()">
+                <em class="col-md-8">Ticket Sales starting on <t t-esc="event.start_sale_date"/></em>
+                <button class="btn btn-danger mr-1 ml-3 col-md-4"  disabled="1">Registrations not yet open</button>
+            </t>
+            <t t-else="">
+                <div class="col-md-8">
+                    <em t-if="event.event_registrations_sold_out">Tickets for this Event are <b>Sold Out</b></em>
+                    <em t-else="">Registrations are <b>closed</b></em>
+                </div>
+                <button class="btn btn-danger ml-3 col-md-4 py-2" disabled="1">
+                    <span t-if="event.event_registrations_sold_out">Sold Out</span>
+                    <span t-else="">Registrations Closed</span>
+                </button>
+            </t>
+        </div>
+    </div>
+    <form t-if="event.event_registrations_open and (not event.event_ticket_ids or not all([ticket.is_expired for ticket in event.event_ticket_ids]))"
+        id="registration_form"
+        class="mb-5"
+        t-attf-action="/event/#{slug(event)}/registration/new" method="post"
+        itemscope="itemscope" itemprop="offers" itemtype="http://schema.org/AggregateOffer">
+        <input type="hidden" name="csrf_token" t-att-value="request.csrf_token()"/>
+        <div id="o_wevent_tickets" class="bg-white shadow-sm o_wevent_js_ticket_details" data-folded-by-default="0">
+            <t t-set="tickets" t-value="event.event_ticket_ids.filtered(lambda ticket: not ticket.is_expired)"/>
+            <!-- If some tickets expired and there is only one type left, we keep the same layout -->
+            <t t-if="len(event.event_ticket_ids) &gt; 1">
+                <div class="d-flex justify-content-between align-items-center py-2 pl-3 pr-2 border-bottom">
+                    <div id="price-range" class="pr-3 d-none"/>
+                    <span t-if="not event.event_registrations_open" class="text-danger">
+                        <i class="fa fa-ban mr-2"/>Sold Out
+                    </span>
+                    <div t-if="event.is_participating" id="registered" class="ml-auto pr-3 d-none">
+                        <span  class="text-success ml-3">
+                            <i class="fa fa-check mr-2"/>Registered
+                        </span>
+                    </div>
+                    <a href="#" role="button" class="btn o_wevent_registration_btn text-left" data-target="#o_wevent_tickets_collapse">
+                        <span class="py-2">Tickets</span>
+                        <span class="close d-none">×</span>
+                    </a>
+                </div>
+                <div id="o_wevent_tickets_collapse" class="collapse show">
+                    <div t-foreach="tickets" t-as="ticket" class="row px-3 py-3 mx-0 bg-light border-bottom">
+                        <div class="col-md-8 col-xs-12 p-0" itemscope="itemscope" itemtype="http://schema.org/Offer">
+                            <h5 itemprop="name" t-field="ticket.name" class="my-0"/>
+                            <t t-if="ticket.description">
+                                <small t-field="ticket.description" class="text-muted py-2"/>
+                                <br/>
+                            </t>
+                            <small t-if="ticket.end_sale_date and ticket.sale_available and not ticket.is_expired" class="text-muted mr-3" itemprop="availabilityEnds">Sales end on <span itemprop="priceValidUntil" t-field="ticket.end_sale_date"/></small>
+                            <small t-if="ticket.start_sale_date and not ticket.sale_available and not ticket.is_expired" class="text-muted mr-3" itemprop="availabilityEnds">Sales start on <span itemprop="priceValidUntil" t-field="ticket.start_sale_date"/></small>
+                        </div>
+                        <div class="col-md-4 col-xs-12 p-0 d-flex align-items-center justify-content-between">
+                            <div class="o_wevent_registration_multi_select"/>
+                            <div class="w-auto ml-auto">
+                                <select t-if="not ticket.is_expired and ticket.sale_available"
+                                    t-attf-name="nb_register-#{ticket.id}"
+                                    class="custom-select">
+                                    <t t-set="seats_max_ticket" t-value="(not ticket.seats_limited or ticket.seats_available &gt; 9) and 10 or ticket.seats_available + 1"/>
+                                    <t t-set="seats_max_event" t-value="(not event.seats_limited or event.seats_available &gt; 9) and 10 or event.seats_available + 1"/>
+                                    <t t-set="seats_max" t-value="min(seats_max_ticket, seats_max_event)"/>
+                                    <t t-foreach="range(0, seats_max)" t-as="nb">
+                                        <option t-esc="nb" t-att-selected="len(ticket) == 0 and nb == 0 and 'selected'"/>
+                                    </t>
+                                </select>
+                                <div t-else="" class="text-danger">
+                                    <span t-if="not ticket.sale_available and not ticket.is_expired and ticket.is_launched()" >Sold Out</span>
+                                    <span t-if="ticket.is_expired">Expired</span>
+                                </div>
+                            </div>
+                        </div>
+                    </div>
+                    <div class="row no-gutters">
+                        <div class="col-md-4 offset-md-8 py-2 pl-md-0 pr-md-2">
+                            <button type="submit" class="btn btn-primary o_wait_lazy_js btn-block a-submit" disabled="" t-attf-id="#{event.id}">
+                                Register
+                                <t t-if="event.seats_limited and event.seats_max and event.seats_available &lt;= (event.seats_max * 0.2)">
+                                    (only <t t-esc="event.seats_available"/> available)
+                                </t>
+                            </button>
+                        </div>
+                    </div>
+                </div>
+            </t>
+            <div t-else="" class="o_wevent_registration_single">
+                <div class="row p-2 pl-3">
+                    <div class="col-lg-8 d-flex flex-columns align-items-center" itemscope="itemscope" itemtype="http://schema.org/Offer">
+                        <h6 itemprop="name" class="my-0 pr-3 border-right text-dark">
+                            <span t-if="tickets" t-field="tickets.name"/>
+                            <span t-else="">Registration</span>
+                        </h6>
+                        <div class="ml-auto">
+                            <t t-if="event.event_registrations_open">
+                                <span class="text-dark font-weight-bold align-middle pr-2">Qty</span>
+                                <link itemprop="availability" content="http://schema.org/InStock"/>
+                                <select t-att-name="'nb_register-%s' % (tickets.id if tickets else 0)" class="w-auto custom-select">
+                                    <t t-set="seats_max_ticket" t-value="(not tickets or not tickets.seats_limited or tickets.seats_available &gt; 9) and 10 or tickets.seats_available + 1"/>
+                                    <t t-set="seats_max_event" t-value="(not event.seats_limited or event.seats_available &gt; 9) and 10 or event.seats_available + 1"/>
+                                    <t t-set="seats_max" t-value="min(seats_max_ticket, seats_max_event) if tickets else seats_max_event"/>
+                                    <t t-foreach="range(0, seats_max)" t-as="nb">
+                                        <option t-esc="nb" t-att-selected="nb == 1 and 'selected'"/>
+                                    </t>
+                                </select>
+                            </t>
+                            <t t-else="">
+                                <span itemprop="availability" content="http://schema.org/SoldOut" class="text-danger">
+                                    <i class="fa fa-ban mr-2"/>Sold Out
+                                </span>
+                            </t>
+                        </div>
+                    </div>
+                    <div class="col-lg-4 pt-3 pt-lg-0 pl-2 pl-lg-0">
+                        <button type="submit" class="btn btn-primary o_wait_lazy_js btn-block a-submit" t-attf-id="#{event.id}">
+                            Register
+                            <t t-if="event.seats_limited and event.seats_max and event.seats_available &lt;= (event.seats_max * 0.2)">
+                                (only <t t-esc="event.seats_available"/> available)
+                            </t>
+                        </button>
+                    </div>
+                </div>
+            </div>
+        </div>
+    </form>
+</template>
+
+<template id="registration_attendee_details" name="Registration Attendee Details">
+    <div id="modal_attendees_registration" class="modal fade" tabindex="-1" role="dialog">
+        <div class="modal-dialog modal-lg" role="document">
+            <form id="attendee_registration" t-attf-action="/event/#{slug(event)}/registration/confirm" method="post" class="js_website_submit_form">
+                <input type="hidden" name="csrf_token" t-att-value="request.csrf_token()"/>
+                <div class="modal-content">
+                    <div class="modal-header align-items-center">
+                        <h4 class="modal-title">Attendees</h4>
+                        <button type="button" class="close" data-dismiss="modal" aria-label="Close"><span>&amp;times;</span></button>
+                    </div>
+                    <t t-set="counter_type" t-value="1"/>
+                    <t t-set="counter" t-value="0"/>
+                    <t t-foreach="tickets" t-as="ticket" t-if="availability_check">
+                        <t t-foreach="range(1, ticket['quantity'] + 1)" t-as="att_counter" name="attendee_loop">
+                            <t t-set="counter" t-value="counter + 1"/>
+                            <div class="modal-body bg-light border-bottom">
+                                <h5 class="mt-1 pb-2 border-bottom">Ticket #<span t-esc="counter"/> <small class="text-muted">- <span t-esc="ticket['name']"/></small></h5>
+                                <div class="row">
+                                    <div class="col-lg my-2">
+                                        <label>Name</label>
+                                        <input class="form-control" type="text" t-attf-name="#{counter}-name" required="This field is required"/>
+                                    </div>
+                                    <div class="col-lg my-2">
+                                        <label>Email</label>
+                                        <input class="form-control" type="email" t-attf-name="#{counter}-email" required="This field is required"/>
+                                    </div>
+                                    <div class="col-lg my-2">
+                                        <label>Phone <small>(Optional)</small></label>
+                                        <input class="form-control" type="tel" t-attf-name="#{counter}-phone"/>
+                                    </div>
+                                    <input class="d-none" type="text" t-attf-name="#{counter}-event_ticket_id" t-attf-value="#{ticket['id']}"/>
+                                </div>
+                            </div>
+                        </t>
+                        <t t-set="counter_type" t-value="counter_type + 1"/>
+                    </t>
+                    <t t-if="not availability_check">
+                        <div class="modal-body bg-light border-bottom">
+                            <strong> You ordered more tickets than available seats</strong>
+                        </div>
+                    </t>
+                    <div class="modal-footer border-0 justify-content-between">
+                        <button type="button" class="btn btn-secondary js_goto_event" data-dismiss="modal">Cancel</button>
+                        <button type="submit" class="btn btn-primary" t-if="availability_check">Continue</button>
+                    </div>
+                </div>
+            </form>
+        </div>
+    </div>
+</template>
+
+<template id="registration_complete" name="Registration Completed">
+    <t t-call="website_event.layout">
+        <div class="container my-5 o_wereg_confirmed">
+            <div class="row mb-3">
+                <div class="col-12">
+                    <h3>Registration confirmed!</h3>
+                    <span class="h4 text-muted" t-esc="event.name"/>
+                </div>
+            </div>
+            <div class="row mb-3 o_wereg_confirmed_attendees">
+                <div class="col-md-4 col-xs-12 mt-3" t-foreach="attendees" t-as="attendee">
+                    <div class="d-flex flex-column">
+                        <span class="font-weight-bold">
+                            <t t-if="attendee.name" t-esc="attendee.name"/>
+                            <t t-else="">N/A</t>
+                        </span>
+                        <span>
+                            <i class="fa fa-envelope mr-2   "></i>
+                            <t t-if="attendee.email" t-esc="attendee.email"/>
+                            <t t-else="">N/A</t>
+                        </span>
+                        <span>
+                            <i class="fa fa-phone mr-2"></i>
+                            <t t-if="attendee.phone" t-esc="attendee.phone"/>
+                            <t t-else="">N/A</t>
+                        </span>
+                        <span>
+                            <i class="fa fa-ticket mr-2"></i>
+                            <t t-if="attendee.event_ticket_id" t-esc="attendee.event_ticket_id.name"/>
+                            <t t-else="">N/A</t>
+                            (ref: <t t-esc="attendee.id"/>)
+                        </span>
+                    </div>
+                </div>
+            </div>
+            <div class="row mb-3">
+                <div class="col-lg-8">
+                    <p><b>Start</b> <span itemprop="startDate" t-esc="event.date_begin_located"/><br/> <b>End</b> <span itemprop="endDate" t-esc="event.date_end_located"/></p>
+                    <div id="add_to_calendar" class="mt-4">
+                        <a role="button" class="btn btn-primary" t-att-href="iCal_url">
+                            <i class="fa fa-fw fa-calendar"/> Add to iCal/Outlook
+                        </a>
+                        <a role="button" class="btn btn-primary" t-att-href="google_url" target='_blank'>
+                            <i class="fa fa-fw fa-calendar"/> Add to Google Calendar
+                        </a>
+                    </div>
+                </div>
+                <div class="col-lg-4">
+                    <h4 t-field="event.address_id" class="text-secondary font-weight-bold" t-options='{
+                        "widget": "contact",
+                        "fields": ["name"]
+                        }'/>
+                    <a itemprop="location" t-att-href="event.google_map_link()" target="_BLANK" temprop="location" t-field="event.address_id" t-options='{
+                        "widget": "contact",
+                        "fields": ["address"]
+                        }'/>
+                    <div itemprop="location" t-field="event.address_id" t-options='{
+                        "widget": "contact",
+                        "fields": ["phone", "mobile", "email"]
+                        }'/>
+                </div>
+            </div>
+        </div>
+    </t>
+</template>
+
+<!-- Edit Options -->
+<template id="fold_register_details" inherit_id="website_event.registration_template" active="False" customize_show="True" name="Fold ticket details">
+    <xpath expr="//div[@id='o_wevent_tickets']" position="attributes">
+        <attribute name="data-folded-by-default">1</attribute>
+    </xpath>
+    <xpath expr="//div[@id='registered']" position="attributes">
+        <attribute name="class">ml-auto pr-3</attribute>
+    </xpath>
+    <xpath expr="//div[@id='price-range']" position="attributes">
+        <attribute name="class">ml-0 pr-3</attribute>
+    </xpath>
+    <xpath expr="//div[@id='o_wevent_tickets_collapse']" position="attributes">
+        <attribute name="class">collapse</attribute>
+    </xpath>
+    <xpath expr="//a[hasclass('o_wevent_registration_btn')]" position="attributes">
+        <attribute name="class">btn btn-primary o_wevent_registration_btn collapsed</attribute>
+        <attribute name="data-toggle">collapse</attribute>
+    </xpath>
+    <xpath expr="//span[hasclass('close')]" position="attributes">
+        <attribute name="class">close d-none</attribute>
+    </xpath>
+</template>
+
+</odoo>
diff --git a/addons/website_event_online/__manifest__.py b/addons/website_event_online/__manifest__.py
index 115bf41a466..b35d80dda85 100644
--- a/addons/website_event_online/__manifest__.py
+++ b/addons/website_event_online/__manifest__.py
@@ -22,6 +22,7 @@
         'views/event_type_views.xml',
         'views/website_visitor_views.xml',
         'views/event_templates_event.xml',
+        'views/event_templates_widgets.xml',
     ],
     'demo': [
         'data/website_visitor_demo.xml',
diff --git a/addons/website_event_online/views/event_templates_event.xml b/addons/website_event_online/views/event_templates_event.xml
index 6889a092ed1..c38a38fa32a 100644
--- a/addons/website_event_online/views/event_templates_event.xml
+++ b/addons/website_event_online/views/event_templates_event.xml
@@ -20,32 +20,6 @@
     </xpath>
 </template>
 
-<!-- TDE FIXME: move in a separate file -->
-<template id="display_timer_widget" name="Display Timer Widget">
-    <t t-set="pre_countdown_display" t-value="bool(pre_countdown_text) or pre_countdown_display"/>
-    <t t-set="pre_countdown_time" t-value="datetime.datetime.now().timestamp() + int(pre_remaining_time)"/>
-
-    <div class="o_display_timer"
-         t-att-data-display-class="display_class"
-         t-att-data-main-countdown-time="datetime.datetime.now().timestamp() + int(main_remaining_time)"
-         t-att-data-main-countdown-text="main_countdown_text"
-         t-att-data-main-countdown-display="main_countdown_display"
-         t-att-data-pre-countdown-time="pre_countdown_time"
-         t-att-data-pre-countdown-display="pre_countdown_display"
-         t-att-data-pre-countdown-text="pre_countdown_text">
-        <t t-set="remaining_time" t-value="pre_remaining_time if pre_remaining_time else main_remaining_time"/>
-        <span class="o_display_timer_countdown d-flex justify-content-center">
-            <span class="o_countdown_text pr-1" t-esc="pre_countdown_text if pre_countdown_text else main_countdown_text if not pre_countdown_display else ''"/>
-            <div t-if="int(remaining_time) > 86400"
-             class="o_countdown_metric_container"><span class="o_countdown_remaining o_timer_days pr-1">0</span><span class="o_countdown_metric pr-1">days</span></div>
-            <div t-if="int(remaining_time) > 3600"
-                 class="o_countdown_metric_container"><span class="o_countdown_remaining o_timer_hours">00</span><span class="o_countdown_metric">:</span></div>
-            <div class="o_countdown_metric_container"><span class="o_countdown_remaining o_timer_minutes">00</span><span class="o_countdown_metric">:</span></div>
-            <div class="o_countdown_metric_container"><span class="o_countdown_remaining o_timer_seconds">00</span><span class="o_countdown_metric"></span></div>
-        </span>
-    </div>
-</template>
-
 <template id="registration_template" inherit_id="website_event.registration_template">
     <xpath expr="//div" position="after">
         <div t-if="toast_message" class="o_wevent_register_toaster d-none" t-att-data-message="toast_message"/>
diff --git a/addons/website_event_online/views/event_templates_widgets.xml b/addons/website_event_online/views/event_templates_widgets.xml
new file mode 100644
index 00000000000..43c60b64545
--- /dev/null
+++ b/addons/website_event_online/views/event_templates_widgets.xml
@@ -0,0 +1,29 @@
+<?xml version="1.0" encoding="utf-8"?>
+<odoo>
+
+<template id="display_timer_widget" name="Display Timer Widget">
+    <t t-set="pre_countdown_display" t-value="bool(pre_countdown_text) or pre_countdown_display"/>
+    <t t-set="pre_countdown_time" t-value="datetime.datetime.now().timestamp() + int(pre_remaining_time)"/>
+
+    <div class="o_display_timer"
+         t-att-data-display-class="display_class"
+         t-att-data-main-countdown-time="datetime.datetime.now().timestamp() + int(main_remaining_time)"
+         t-att-data-main-countdown-text="main_countdown_text"
+         t-att-data-main-countdown-display="main_countdown_display"
+         t-att-data-pre-countdown-time="pre_countdown_time"
+         t-att-data-pre-countdown-display="pre_countdown_display"
+         t-att-data-pre-countdown-text="pre_countdown_text">
+        <t t-set="remaining_time" t-value="pre_remaining_time if pre_remaining_time else main_remaining_time"/>
+        <span class="o_display_timer_countdown d-flex justify-content-center">
+            <span class="o_countdown_text pr-1" t-esc="pre_countdown_text if pre_countdown_text else main_countdown_text if not pre_countdown_display else ''"/>
+            <div t-if="int(remaining_time) > 86400"
+             class="o_countdown_metric_container"><span class="o_countdown_remaining o_timer_days pr-1">0</span><span class="o_countdown_metric pr-1">days</span></div>
+            <div t-if="int(remaining_time) > 3600"
+                 class="o_countdown_metric_container"><span class="o_countdown_remaining o_timer_hours">00</span><span class="o_countdown_metric">:</span></div>
+            <div class="o_countdown_metric_container"><span class="o_countdown_remaining o_timer_minutes">00</span><span class="o_countdown_metric">:</span></div>
+            <div class="o_countdown_metric_container"><span class="o_countdown_remaining o_timer_seconds">00</span><span class="o_countdown_metric"></span></div>
+        </span>
+    </div>
+</template>
+
+</odoo>