diff --git a/website_project_task/__manifest__.py b/website_project_task/__manifest__.py
index 82407b3e..c90b51a5 100644
--- a/website_project_task/__manifest__.py
+++ b/website_project_task/__manifest__.py
@@ -1,11 +1,12 @@
 {
     'name': 'Website Project Tasks',
-    'version': '15.0.1.0.0',
     'author': 'Hibou Corp. <hello@hibou.io>',
     'website': 'https://hibou.io/',
+    'version': '16.0.1.0.0',
     'license': 'AGPL-3',
     'category': 'Tools',
     'complexity': 'easy',
+    'summary': 'Adds tags on tasks, classes on stages and tags for CSS hooks in Website Project.',
     'description': """
 This module adds options to Website Project:
 ============================================
diff --git a/website_project_task/views/project_task_templates.xml b/website_project_task/views/project_task_templates.xml
index 7abb7110..effc35e8 100644
--- a/website_project_task/views/project_task_templates.xml
+++ b/website_project_task/views/project_task_templates.xml
@@ -25,7 +25,8 @@
 
 
     <template id="task_tag_grid" inherit_id='project.portal_tasks_list' customize_show="True" name="Task Tags on table">
-        <xpath expr="//t/t/t/t/thead/tr/th[2]" position="after">
+        <!-- <xpath expr="//t/t/t/t/thead/tr/th[2]" position="after"> -->
+        <xpath expr="//t/t/thead/tr/th[2]" position="after">
             <th>Tags</th>
         </xpath>
         <!-- Strange number of columns -->
@@ -39,7 +40,8 @@
     </template>
 
     <template id="my_task" inherit_id='project.portal_my_task' name="Stage Colors etc.">
-        <xpath expr="//span[hasclass('badge-info')]" position="attributes">
+        <!-- <xpath expr="//span[hasclass('badge-info')]" position="attributes"> -->
+        <xpath expr="//span[hasclass('badge')]" position="attributes">
             <attribute name="t-attf-class">badge badge-pill badge-info stage stage-{{ task.stage_id.name }}</attribute>
         </xpath>
         <xpath expr="//h4" position="after">