diff --git a/addons/hr_timesheet/views/project_views.xml b/addons/hr_timesheet/views/project_views.xml
index f974055d5ac..6484315235d 100644
--- a/addons/hr_timesheet/views/project_views.xml
+++ b/addons/hr_timesheet/views/project_views.xml
@@ -84,8 +84,11 @@
                 <xpath expr="//div[@name='dates']" position="after">
                     <field name="allocated_hours" widget="timesheet_uom_no_toggle" attrs="{'invisible': [('allow_timesheets', '=', False)]}"/>
                 </xpath>
-                <xpath expr="//div[@id='rating_settings']" position="before">
-                    <div class="col-lg-6 o_setting_box"  id="timesheet_settings">
+                <xpath expr="//group[@name='group_time_managment']" position="attributes">
+                    <attribute name="invisible">0</attribute>
+                </xpath>
+                <xpath expr="//group[@name='group_time_managment']" position="inside">
+                    <div class="o_setting_box" id="timesheet_settings" colspan="2">
                         <div class="o_setting_left_pane">
                             <field name="allow_timesheets"/>
                         </div>
@@ -394,12 +397,12 @@
                     <attribute name="js_class">hr_timesheet_graphview</attribute>
                 </xpath>
                 <xpath expr="//field[@name='stage_id']" position='after'>
-                    <field name="planned_hours" widget="timesheet_uom" type="measure"/>
-                    <field name="remaining_hours" widget="timesheet_uom" type="measure"/>
-                    <field name="effective_hours" widget="timesheet_uom" type="measure"/>
-                    <field name="total_hours_spent" widget="timesheet_uom" type="measure"/>
-                    <field name="overtime" widget="timesheet_uom" type="measure"/>
-                    <field name="subtask_effective_hours" widget="timesheet_uom" type="measure"/>
+                    <field name="planned_hours" widget="timesheet_uom"/>
+                    <field name="remaining_hours" widget="timesheet_uom"/>
+                    <field name="effective_hours" widget="timesheet_uom"/>
+                    <field name="total_hours_spent" widget="timesheet_uom"/>
+                    <field name="overtime" widget="timesheet_uom"/>
+                    <field name="subtask_effective_hours" widget="timesheet_uom"/>
                 </xpath>
             </field>
         </record>
diff --git a/addons/project/models/project.py b/addons/project/models/project.py
index 7abffa31fa0..ab6204a2f21 100644
--- a/addons/project/models/project.py
+++ b/addons/project/models/project.py
@@ -364,6 +364,7 @@ class Project(models.Model):
     # rating fields
     rating_request_deadline = fields.Datetime(compute='_compute_rating_request_deadline', store=True)
     rating_active = fields.Boolean('Customer Ratings', default=lambda self: self.env.user.has_group('project.group_project_rating'))
+    allow_rating = fields.Boolean('Allow Customer Ratings', compute="_compute_allow_rating", default=lambda self: self.env.user.has_group('project.group_project_rating'))
     rating_status = fields.Selection(
         [('stage', 'Rating when changing stage'),
          ('periodic', 'Periodic rating')
@@ -445,6 +446,10 @@ class Project(models.Model):
             project.access_warning = _(
                 "The project cannot be shared with the recipient(s) because the privacy of the project is too restricted. Set the privacy to 'Visible by following customers' in order to make it accessible by the recipient(s).")
 
+    @api.depends_context('uid')
+    def _compute_allow_rating(self):
+        self.allow_rating = self.env.user.has_group('project.group_project_rating')
+
     @api.depends('rating_status', 'rating_status_period')
     def _compute_rating_request_deadline(self):
         periods = {'daily': 1, 'weekly': 7, 'bimonthly': 15, 'monthly': 30, 'quarterly': 90, 'yearly': 365}
@@ -1341,6 +1346,14 @@ class Task(models.Model):
         else:
             return [('project_id', '!=', False)]
 
+    @api.model
+    def _get_view(self, view_id=None, view_type='form', **options):
+        arch, view = super()._get_view(view_id, view_type, **options)
+        if view_type == 'search' and  self.env.user.notification_type == 'email':
+            for node in arch.xpath("//filter[@name='message_needaction']"):
+                node.set('invisible', '1')
+        return arch, view
+
     @api.depends('parent_id.ancestor_id')
     def _compute_ancestor_id(self):
         for task in self:
diff --git a/addons/project/report/project_report_views.xml b/addons/project/report/project_report_views.xml
index e2e57c5f0a8..ba99ba96f3d 100644
--- a/addons/project/report/project_report_views.xml
+++ b/addons/project/report/project_report_views.xml
@@ -48,10 +48,10 @@
                     <field name="user_ids" context="{'active_test': False}"/>
                     <field name="project_id"/>
                     <field name="milestone_id" groups="project.group_project_milestone"/>
+                    <field name="ancestor_id" groups="project.group_subtask_project"/>
                     <field name="stage_id"/>
                     <field name="partner_id" operator="child_of"/>
                     <field name="active"/>
-                    <field name="parent_id"/>
                     <field name="rating_last_text"/>
                     <field name="date_assign"/>
                     <field name="date_end"/>
@@ -93,7 +93,7 @@
                         <filter string="Stage" name="Stage" context="{'group_by': 'stage_id'}"/>
                         <filter string="Personal Stage" name="personal_stage" context="{'group_by': 'personal_stage_type_ids'}"/>
                         <filter string="Assignees" name="User" context="{'group_by': 'user_ids'}"/>
-                        <filter string="Project" name="project" context="{'group_by': 'project_id'}"/>
+                        <filter string="Ancestor Task" name="groupby_ancestor_task" context="{'group_by': 'ancestor_id'}" groups="project.group_subtask_project"/>
                         <filter string="Milestone" name="milestone" context="{'group_by': 'milestone_id'}" groups="project.group_project_milestone"/>
                         <filter string="Customer" name="Customer" context="{'group_by': 'partner_id'}"/>
                         <filter string="Kanban State" name="kanban_state" context="{'group_by': 'state'}"/>
diff --git a/addons/project/views/project_update_views.xml b/addons/project/views/project_update_views.xml
index cdf2206bb99..e152f750817 100644
--- a/addons/project/views/project_update_views.xml
+++ b/addons/project/views/project_update_views.xml
@@ -7,6 +7,9 @@
             <search string="Search Update">
                 <field name="name"/>
                 <field name="project_id" invisible="1"/>
+                <field name="user_id"/>
+                <field name="description"/>
+                <field name="status"/>
                 <filter string="My Updates" name="my_updates" domain="[('user_id', '=', uid)]"/>
                 <filter string="Followed Updates" name="followed_updates" domain="[('message_is_follower', '=', True)]"/>
                 <separator/>
diff --git a/addons/project/views/project_views.xml b/addons/project/views/project_views.xml
index fc61e38ac91..9f8fb12bb60 100644
--- a/addons/project/views/project_views.xml
+++ b/addons/project/views/project_views.xml
@@ -19,11 +19,10 @@
                     <field name="name" string="Task" filter_domain="['|', ('name', 'ilike', self), ('id', 'ilike', self)]"/>
                     <field name="tag_ids"/>
                     <field name="user_ids" filter_domain="[('user_ids', 'ilike', self), ('user_ids.active', 'in', [True, False])]"/>
-                    <field string="Project" name="display_project_id"/>
                     <field name="milestone_id" groups="project.group_project_milestone"/>
+                    <field name="ancestor_id" groups="project.group_subtask_project"/>
                     <field name="stage_id"/>
                     <field name="partner_id" operator="child_of"/>
-                    <field name="parent_id"/>
                     <field name="description"/>
                     <field name="rating_last_text"/>
                     <filter string="My Tasks" name="my_tasks" domain="[('user_ids', 'in', uid)]"/>
@@ -69,7 +68,7 @@
                         <filter string="Stage" name="stage" context="{'group_by': 'stage_id'}"/>
                         <filter string="Personal Stage" name="personal_stage" context="{'group_by': 'personal_stage_type_ids'}"/>
                         <filter string="Assignees" name="user" context="{'group_by': 'user_ids'}"/>
-                        <filter string="Project" name="project" context="{'group_by': 'project_id'}"/>
+                        <filter string="Ancestor Task" name="groupby_ancestor_task" context="{'group_by': 'ancestor_id'}" groups="project.group_subtask_project"/>
                         <filter string="Milestone" name="milestone" context="{'group_by': 'milestone_id'}" groups="project.group_project_milestone"/>
                         <filter string="Customer" name="customer" context="{'group_by': 'partner_id'}"/>
                         <filter string="Kanban State" name="kanban_state" context="{'group_by': 'kanban_state'}"/>
@@ -86,11 +85,20 @@
             <field name="inherit_id" ref="view_task_search_form"></field>
             <field name="mode">primary</field>
             <field name="arch" type="xml">
-               <xpath expr="//filter[@name='unassigned']" position="after">
+                <xpath expr="//field[@name='user_ids']" position='after'>
+                    <field string="Project" name="display_project_id"/>
+                </xpath>
+                <xpath expr="//filter[@name='my_tasks']" position='after'>
+                    <filter string="My Private Tasks" name="my_private_task" domain="[('project_id', '=', False), ('user_ids', 'in', uid)]"/>
+                </xpath>
+                <xpath expr="//filter[@name='unassigned']" position="after">
                     <separator/>
                     <filter string="My Projects" name="my_projects" domain="[('project_id.user_id', '=', uid)]"/>
                     <filter string="My Favorite Projects" name="my_favorite_projects" domain="[('project_id.favorite_user_ids', 'in', [uid])]"/>
                 </xpath>
+                <xpath expr="//filter[@name='user']" position='after'>
+                    <filter string="Project" name="project" context="{'group_by': 'project_id'}"/>
+                </xpath>
             </field>
         </record>
 
@@ -539,75 +547,85 @@
                                 <group name="extra_settings">
                                 </group>
                             </group>
-                            <div class="row mt16 o_settings_container">
-                                <div id="rating_settings" class="col-lg-6 o_setting_box" groups="project.group_project_rating">
-                                    <div class="o_setting_left_pane">
-                                        <field name="rating_active"/>
-                                    </div>
-                                    <div class="o_setting_right_pane">
-                                        <label for="rating_active" />
-                                        <div class="text-muted">
-                                            Get customer feedback
-                                        </div>
-                                        <div class="mt16" attrs="{'invisible':[('rating_active','==',False)]}">
-                                            <field name="rating_status" widget="radio" />
-                                            <div  attrs="{'required': [('rating_status','=','periodic')], 'invisible': [('rating_status','!=','periodic')]}">
-                                                <label for="rating_status_period"/>
-                                                <field name="rating_status_period"/>
+                            <group>
+                                <group name="group_tasks_managment" string="Tasks Managment" class="row mt16 o_settings_container" groups="project.group_subtask_project,project.group_project_task_dependencies,project.group_project_milestone,project.group_project_recurring_tasks">
+                                    <div>
+                                        <div class="o_setting_box" id="subtask_settings" groups="project.group_subtask_project">
+                                            <div class="o_setting_left_pane">
+                                                <field name="allow_subtasks"/>
                                             </div>
-                                            <div class="content-group">
-                                                    <div class="mt8">
-                                                        <button name="%(project.open_task_type_form_domain)d" context="{'project_id':id}" icon="fa-arrow-right" type="action" string="Set a Rating Email Template on Stages" class="btn-link"/>
+                                            <div class="o_setting_right_pane">
+                                                <label for="allow_subtasks"/>
+                                                <div class="text-muted">
+                                                    Split your tasks to organize your work into sub-milestones
+                                                </div>
+                                            </div>
+                                        </div>
+                                        <div class="o_setting_box mt-4" id="recurring_tasks_setting" groups="project.group_project_recurring_tasks">
+                                            <div class="o_setting_left_pane">
+                                                <field name="allow_recurring_tasks"/>
+                                            </div>
+                                            <div class="o_setting_right_pane">
+                                                <label for="allow_recurring_tasks"/>
+                                                <div class="text-muted">
+                                                    Auto-generate tasks for regular activities
+                                                </div>
+                                            </div>
+                                        </div>
+                                        <div class="o_setting_box mt-4" id="task_dependencies_setting" groups="project.group_project_task_dependencies">
+                                            <div class="o_setting_left_pane">
+                                                <field name="allow_task_dependencies"/>
+                                            </div>
+                                            <div class="o_setting_right_pane">
+                                                <label for="allow_task_dependencies"/>
+                                                <div class="text-muted">
+                                                    Determine the order in which to perform tasks
+                                                </div>
+                                            </div>
+                                        </div>
+                                        <div class="o_setting_box mt-4" id="project_milestone_setting" groups="project.group_project_milestone">
+                                            <div class="o_setting_left_pane">
+                                                <field name="allow_milestones"/>
+                                            </div>
+                                            <div class="o_setting_right_pane">
+                                                <label for="allow_milestones"/>
+                                                <div class="text-muted">
+                                                    Track major progress points that must be reached to achieve success
+                                                </div>
+                                            </div>
+                                        </div>
+                                    </div>
+                                </group>
+                                <group name="group_time_managment" string="Time Managment" invisible="1" class="row mt16 o_settings_container"/>
+                                <group name="group_documents_analytics" string="Analytics" class="row mt16 o_settings_container" attrs="{'invisible': [('allow_rating', '=', False)]}">
+                                    <div>
+                                        <field name="allow_rating" invisible="1"/>
+                                        <div class="o_setting_box" name="analytic_div" groups="project.group_project_rating">
+                                            <div class="o_setting_left_pane">
+                                                <field name="rating_active"/>
+                                            </div>
+                                            <div class="o_setting_right_pane">
+                                                <label for="rating_active" />
+                                                <div class="text-muted">
+                                                    Get customer feedback
+                                                </div>
+                                                <div class="mt16" attrs="{'invisible':[('rating_active','==',False)]}">
+                                                    <field name="rating_status" widget="radio" />
+                                                    <div  attrs="{'required': [('rating_status','=','periodic')], 'invisible': [('rating_status','!=','periodic')]}">
+                                                        <label for="rating_status_period"/>
+                                                        <field name="rating_status_period"/>
                                                     </div>
+                                                    <div class="content-group">
+                                                        <div class="mt8">
+                                                            <button name="%(project.open_task_type_form_domain)d" context="{'project_id':id}" icon="fa-arrow-right" type="action" string="Set a Rating Email Template on Stages" class="btn-link"/>
+                                                        </div>
+                                                    </div>
+                                                </div>
                                             </div>
                                         </div>
                                     </div>
-                                </div>
-                                <div class="col-lg-6 o_setting_box"  id="subtask_settings" groups="project.group_subtask_project">
-                                    <div class="o_setting_left_pane">
-                                        <field name="allow_subtasks" />
-                                    </div>
-                                    <div class="o_setting_right_pane">
-                                        <label for="allow_subtasks" />
-                                        <div class="text-muted">
-                                            Split your tasks to organize your work into sub-milestones
-                                        </div>
-                                    </div>
-                                </div>
-                                <div class="col-lg-6 o_setting_box"  id="recurring_tasks_setting" groups="project.group_project_recurring_tasks">
-                                    <div class="o_setting_left_pane">
-                                        <field name="allow_recurring_tasks" />
-                                    </div>
-                                    <div class="o_setting_right_pane">
-                                        <label for="allow_recurring_tasks" />
-                                        <div class="text-muted">
-                                            Auto-generate tasks for regular activities
-                                        </div>
-                                    </div>
-                                </div>
-                                <div class="col-lg-6 o_setting_box" id="task_dependencies_setting" groups="project.group_project_task_dependencies">
-                                    <div class="o_setting_left_pane">
-                                        <field name="allow_task_dependencies"/>
-                                    </div>
-                                    <div class="o_setting_right_pane">
-                                        <label for="allow_task_dependencies"/>
-                                        <div class="text-muted">
-                                            Determine the order in which to perform tasks
-                                        </div>
-                                    </div>
-                                </div>
-                                <div class="col-lg-6 o_setting_box" id="project_milestone_setting" groups="project.group_project_milestone">
-                                    <div class="o_setting_left_pane">
-                                        <field name="allow_milestones"/>
-                                    </div>
-                                    <div class="o_setting_right_pane">
-                                        <label for="allow_milestones"/>
-                                        <div class="text-muted">
-                                            Track major progress points that must be reached to achieve success
-                                        </div>
-                                    </div>
-                                </div>
-                            </div>
+                                </group>
+                            </group>
                         </page>
                     </notebook>
                 </sheet>
@@ -1172,7 +1190,7 @@
                                     'default_partner_id': partner_id, 'default_milestone_id': allow_milestones and milestone_id, 'search_default_display_project_id': project_id }"
                                    widget="many2many"
                                    domain="['!', ('id', 'parent_of', id)]">
-                                <tree editable="bottom">
+                                <tree editable="bottom" decoration-muted="is_closed == True">
                                     <field name="legend_normal" invisible="1"/>
                                     <field name="legend_done" invisible="1"/>
                                     <field name="legend_blocked" invisible="1"/>
@@ -1210,7 +1228,7 @@
                         </page>
                         <page name="task_dependencies" string="Blocked By" attrs="{'invisible': [('allow_task_dependencies', '=', False)]}" groups="project.group_project_task_dependencies">
                             <field name="depend_on_ids" nolabel="1" context="{'default_project_id' : project_id}">
-                                <tree editable="bottom">
+                                <tree editable="bottom" decoration-muted="is_closed == True">
                                     <field name="allow_milestones" invisible="1"/>
                                     <field name="parent_id" invisible="1" />
                                     <field name="display_project_id" invisible="1" />
@@ -1575,7 +1593,7 @@
                     <field name="stage_id"/>
                     <field name="color" invisible="1"/>
                     <field name="sequence" invisible="1"/>
-                    <field name="rating_last_value" type="measure" string="Rating (/5)"/>
+                    <field name="rating_last_value" string="Rating (/5)"/>
                 </graph>
             </field>
         </record>
diff --git a/addons/rating/static/src/scss/rating_templates.scss b/addons/rating/static/src/scss/rating_templates.scss
index 65a62162bcf..0429aea41f6 100644
--- a/addons/rating/static/src/scss/rating_templates.scss
+++ b/addons/rating/static/src/scss/rating_templates.scss
@@ -28,4 +28,4 @@
             }
         }
     }
-}
\ No newline at end of file
+}
diff --git a/addons/sale_project/views/project_task_views.xml b/addons/sale_project/views/project_task_views.xml
index f02c4296d6c..a02a01e982b 100644
--- a/addons/sale_project/views/project_task_views.xml
+++ b/addons/sale_project/views/project_task_views.xml
@@ -39,18 +39,22 @@
                 <attribute name="options">{'always_reload': True}</attribute>
                 <attribute name="context">{'res_partner_search_mode': 'customer'}</attribute>
             </xpath>
-            <xpath expr="//div[@id='rating_settings']" position="before">
-                <div class="col-lg-6 o_setting_box" id="allow_billable_container">
-                    <div class="o_setting_left_pane">
-                        <field name="allow_billable"/>
-                    </div>
-                    <div class="o_setting_right_pane">
-                        <label for="allow_billable"/>
-                        <div class="text-muted" id="allow_billable_setting">
-                            Invoice your time and material to customers
+            <xpath expr="//group[@name='group_time_managment']" position="after">
+                 <group name="group_sales_invoicing" string="Sales &amp; Invoicing" class="row mt16 o_settings_container col-lg-6">
+                    <div>
+                        <div class="o_setting_box" id="allow_billable_container">
+                            <div class="o_setting_left_pane">
+                                <field name="allow_billable"/>
+                            </div>
+                            <div class="o_setting_right_pane">
+                                <label for="allow_billable"/>
+                                <div class="text-muted" id="allow_billable_setting">
+                                    Invoice your time and material to customers
+                                </div>
+                            </div>
                         </div>
                     </div>
-                </div>
+                </group>
             </xpath>
         </field>
     </record>