diff --git a/website_project_task/__init__.py b/website_project_task/__init__.py
index e69de29b..9a7e03ed 100644
--- a/website_project_task/__init__.py
+++ b/website_project_task/__init__.py
@@ -0,0 +1 @@
+from . import models
\ No newline at end of file
diff --git a/website_project_task/__manifest__.py b/website_project_task/__manifest__.py
index 064283ec..ae58c2c7 100644
--- a/website_project_task/__manifest__.py
+++ b/website_project_task/__manifest__.py
@@ -1,6 +1,6 @@
 {
     'name': 'Website Project Tasks',
-    'version': '12.0.1.0.0',
+    'version': '13.0.1.0.0',
     'author': 'Hibou Corp. <hello@hibou.io>',
     'website': 'https://hibou.io/',
     'license': 'AGPL-3',
@@ -17,7 +17,7 @@ This module adds options to Website Project:
         'project',
     ],
     'data': [
-        'project_task_templates.xml',
+        'views/project_task_templates.xml',
     ],
     'installable': True,
     'auto_install': False,
diff --git a/website_project_task/models/__init__.py b/website_project_task/models/__init__.py
new file mode 100644
index 00000000..7095229c
--- /dev/null
+++ b/website_project_task/models/__init__.py
@@ -0,0 +1 @@
+from . import project
\ No newline at end of file
diff --git a/website_project_task/models/project.py b/website_project_task/models/project.py
new file mode 100644
index 00000000..9e6f298d
--- /dev/null
+++ b/website_project_task/models/project.py
@@ -0,0 +1,14 @@
+from odoo import api, exceptions, fields, models, _
+from werkzeug.urls import url_encode
+
+class ProjectTask(models.Model):
+    _name = 'project.task'
+    _inherit = ['project.task', 'portal.mixin']
+
+    def preview_task(self):
+        self.ensure_one()
+        return {
+            'type': 'ir.actions.act_url',
+            'target': 'self',
+            'url': self.get_portal_url(),
+        }
diff --git a/website_project_task/project_task_templates.xml b/website_project_task/views/project_task_templates.xml
similarity index 74%
rename from website_project_task/project_task_templates.xml
rename to website_project_task/views/project_task_templates.xml
index 3ace2e2c..25e704e1 100644
--- a/website_project_task/project_task_templates.xml
+++ b/website_project_task/views/project_task_templates.xml
@@ -1,5 +1,21 @@
 <?xml version="1.0" encoding="utf-8"?>
 <odoo>
+    <record id="view_task_form2_inherit" model="ir.ui.view">
+        <field name="name">project.task.form.inherit</field>
+        <field name="model">project.task</field>
+        <field name="inherit_id" ref="project.view_task_form2"/>
+        <field name="arch" type="xml">
+            <xpath expr="//div[@name='button_box']" position="inside">
+                <button name="preview_task" type="object" class="oe_stat_button" icon="fa-globe icon">
+                    <div class="o_field_widget o_stat_info">
+                        <span class="o_stat_text">Task</span>
+                        <span class="o_stat_text">Preview</span>
+                    </div>
+                </button>
+            </xpath>
+        </field>
+    </record>
+
 
     <template id="my_tasks" inherit_id='project.portal_my_tasks' name="Stage Colors etc.">
         <xpath expr="//td/span[hasclass('badge-info')]" position="attributes">
@@ -9,10 +25,10 @@
 
 
     <template id="task_tag_grid" inherit_id='project.portal_my_tasks' customize_show="True" name="Task Tags on table">
-        <xpath expr="//thead/tr/th[1]" position="attributes">
+        <xpath expr="//t/t/t/t/thead/tr/th[1]" position="attributes">
             <attribute name="class">col-md-8</attribute>
         </xpath>
-        <xpath expr="//thead/tr/th[2]" position="after">
+        <xpath expr="//t/t/t/t/thead/tr/th[2]" position="after">
             <th>Tags</th>
         </xpath>
         <!-- Strange number of columns -->