diff --git a/project_task_risk_management_odoo/README.rst b/project_task_risk_management_odoo/README.rst
index 2bc5308e3..afdd5631f 100644
--- a/project_task_risk_management_odoo/README.rst
+++ b/project_task_risk_management_odoo/README.rst
@@ -3,7 +3,7 @@
     :alt: License: LGPL-3
 
 Project Task Risk Management Odoo
-======================
+=================================
 * Project Task Risk Management Odoo.
 
 Configuration
diff --git a/project_task_risk_management_odoo/__manifest__.py b/project_task_risk_management_odoo/__manifest__.py
index 2a17e02dc..8dc221477 100644
--- a/project_task_risk_management_odoo/__manifest__.py
+++ b/project_task_risk_management_odoo/__manifest__.py
@@ -25,29 +25,29 @@
     'category': 'Extra Tools',
     'summary': 'Risk Management For Project & Tasks',
     'description': """This module allows project manager and users to 
-    manage risk on the project and tasks with risk incident creation from 
-    project and tasks.""",
+    manage risk on the project and tasks with risk incident creation from
+     project and tasks.""",
     'author': 'Cybrosys Techno Solutions',
     'company': 'Cybrosys Techno Solutions',
     'maintainer': 'Cybrosys Techno Solutions',
     'website': 'https://www.cybrosys.com',
     'depends': ['project'],
     'data': [
-        'security/project_task_risk_management_odoo.xml',
+        'security/project_task_risk_management_odoo_groups.xml',
         'security/ir.model.access.csv',
-        'wizard/risk_incident_wiz.xml',
-        'views/project_risk_analysis.xml',
-        'views/task_risk_analysis.xml',
+        'views/project_risk_incident_line_views.xml',
+        'views/task_risk_incident_line_views.xml',
         'views/menu_actions.xml',
         'views/menuitems.xml',
-        'views/project_project.xml',
-        'views/risks_project.xml',
-        'views/risk_type.xml',
-        'views/risk_category.xml',
-        'views/risk_response.xml',
-        'views/risk_tags.xml',
-        'views/risk_incident.xml',
-        'views/project_task.xml',
+        'views/project_project_views.xml',
+        'views/risks_project_views.xml',
+        'views/risk_type_views.xml',
+        'views/risk_category_views.xml',
+        'views/risk_response_views.xml',
+        'views/risk_tag_views.xml',
+        'views/risk_incident_views.xml',
+        'views/project_task_views.xml',
+        'wizard/risk_incident_simplified_views.xml',
     ],
     'post_init_hook': '_post_init_hook',
     'images': ['static/description/banner.jpg'],
diff --git a/project_task_risk_management_odoo/doc/RELEASE_NOTES.md b/project_task_risk_management_odoo/doc/RELEASE_NOTES.md
index 3db1d7a15..a8215060c 100644
--- a/project_task_risk_management_odoo/doc/RELEASE_NOTES.md
+++ b/project_task_risk_management_odoo/doc/RELEASE_NOTES.md
@@ -1,6 +1,6 @@
 ## Module <project_task_risk_management_odoo>
 
-#### 22.01.2024
+#### 25.01.2024
 #### Version 17.0.1.0.0
 #### ADD
 - Initial commit for Project Task Risk Management Odoo
diff --git a/project_task_risk_management_odoo/models/project_project.py b/project_task_risk_management_odoo/models/project_project.py
index f162213ef..6ab79d6a0 100644
--- a/project_task_risk_management_odoo/models/project_project.py
+++ b/project_task_risk_management_odoo/models/project_project.py
@@ -43,4 +43,3 @@ class ProjectIncident(models.Model):
                 {'default_user_id': self.user_id.id,
                  'default_project_id': self.id})
         }
-
diff --git a/project_task_risk_management_odoo/models/risk_tags.py b/project_task_risk_management_odoo/models/risk_tags.py
index 93b7c7e05..77f7148ce 100644
--- a/project_task_risk_management_odoo/models/risk_tags.py
+++ b/project_task_risk_management_odoo/models/risk_tags.py
@@ -32,8 +32,10 @@ class RiskTags(models.Model):
         """ Selecting Color for Tags"""
         return randint(1, 11)
 
-    name = fields.Char('Tag Name', required=True, translate=True, help='Name of Risk tag')
-    color = fields.Integer('Color', default=_get_default_color, help='Select Color of Risk Tag')
+    name = fields.Char('Tag Name', required=True, translate=True,
+                       help='Name of Risk tag')
+    color = fields.Integer('Color', default=_get_default_color,
+                           help='Select Color of Risk Tag')
 
     _sql_constraints = [
         ('name_uniq', 'unique (name)', "Tag name already exists !"),
diff --git a/project_task_risk_management_odoo/security/project_task_risk_management_odoo.xml b/project_task_risk_management_odoo/security/project_task_risk_management_odoo_groups.xml
similarity index 100%
rename from project_task_risk_management_odoo/security/project_task_risk_management_odoo.xml
rename to project_task_risk_management_odoo/security/project_task_risk_management_odoo_groups.xml
diff --git a/project_task_risk_management_odoo/static/description/index.html b/project_task_risk_management_odoo/static/description/index.html
index f318d2521..5d7cfd18b 100644
--- a/project_task_risk_management_odoo/static/description/index.html
+++ b/project_task_risk_management_odoo/static/description/index.html
@@ -579,7 +579,7 @@
                                  style="font-size: 0.8rem; font-weight: 500;"><span>Version
                                         17.0.1.0.0</span><span
                                     class="px-2">|</span><span
-                                    style="color: #714B67;font-weight: 600;">Released on: 22th January 2024</span>
+                                    style="color: #714B67;font-weight: 600;">Released on: 25th January 2024</span>
                             </div>
                             <p class="m-0"
                                style=" color:#718096!important; font-size:1rem !important;line-height: 28px;">
diff --git a/project_task_risk_management_odoo/views/project_project.xml b/project_task_risk_management_odoo/views/project_project_views.xml
similarity index 100%
rename from project_task_risk_management_odoo/views/project_project.xml
rename to project_task_risk_management_odoo/views/project_project_views.xml
diff --git a/project_task_risk_management_odoo/views/project_risk_analysis.xml b/project_task_risk_management_odoo/views/project_risk_incident_line_views.xml
similarity index 100%
rename from project_task_risk_management_odoo/views/project_risk_analysis.xml
rename to project_task_risk_management_odoo/views/project_risk_incident_line_views.xml
diff --git a/project_task_risk_management_odoo/views/project_task.xml b/project_task_risk_management_odoo/views/project_task_views.xml
similarity index 100%
rename from project_task_risk_management_odoo/views/project_task.xml
rename to project_task_risk_management_odoo/views/project_task_views.xml
diff --git a/project_task_risk_management_odoo/views/risk_category.xml b/project_task_risk_management_odoo/views/risk_category_views.xml
similarity index 77%
rename from project_task_risk_management_odoo/views/risk_category.xml
rename to project_task_risk_management_odoo/views/risk_category_views.xml
index fe8ccc55a..b9ffe568f 100644
--- a/project_task_risk_management_odoo/views/risk_category.xml
+++ b/project_task_risk_management_odoo/views/risk_category_views.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <odoo>
-<!--    Risk Category Tree View -->
-        <record id="risk_category_view_tree" model="ir.ui.view">
+    <!--    Risk Category Tree View -->
+    <record id="risk_category_view_tree" model="ir.ui.view">
         <field name="name">risk.category.view.tree</field>
         <field name="model">risk.category</field>
         <field name="arch" type="xml">
diff --git a/project_task_risk_management_odoo/views/risk_incident.xml b/project_task_risk_management_odoo/views/risk_incident_views.xml
similarity index 96%
rename from project_task_risk_management_odoo/views/risk_incident.xml
rename to project_task_risk_management_odoo/views/risk_incident_views.xml
index ce7eeab26..9dd3c4f09 100644
--- a/project_task_risk_management_odoo/views/risk_incident.xml
+++ b/project_task_risk_management_odoo/views/risk_incident_views.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <odoo>
-<!--    Risk Incident Kanban View -->
+    <!--    Risk Incident Kanban View -->
     <record id="risk_incident_view_kanban" model="ir.ui.view">
         <field name="name">risk.incident.view.kanban</field>
         <field name="model">risk.incident</field>
@@ -36,7 +36,7 @@
             </kanban>
         </field>
     </record>
-<!--    Risk Incident Tree View-->
+    <!--    Risk Incident Tree View-->
     <record id="risk_incident_view_tree" model="ir.ui.view">
         <field name="name">risk.incident.view.tree</field>
         <field name="model">risk.incident</field>
@@ -52,7 +52,7 @@
             </tree>
         </field>
     </record>
-<!--    Risk Incident Pivot View-->
+    <!--    Risk Incident Pivot View-->
     <record id="risk_incident_view_pivot" model="ir.ui.view">
         <field name="name">risk.incident.view.pivot</field>
         <field name="model">risk.incident</field>
@@ -65,7 +65,7 @@
             </pivot>
         </field>
     </record>
-<!--    Risk Incident Graph View-->
+    <!--    Risk Incident Graph View-->
     <record id="risk_incident_view_graph" model="ir.ui.view">
         <field name="name">risk.incident.view.graph</field>
         <field name="model">risk.incident</field>
@@ -77,7 +77,7 @@
             </graph>
         </field>
     </record>
-<!--    Risk Incident Form View-->
+    <!--    Risk Incident Form View-->
     <record id="risk_incident_view_form" model="ir.ui.view">
         <field name="name">risk.incident.view.form</field>
         <field name="model">risk.incident</field>
diff --git a/project_task_risk_management_odoo/views/risk_response.xml b/project_task_risk_management_odoo/views/risk_response_views.xml
similarity index 90%
rename from project_task_risk_management_odoo/views/risk_response.xml
rename to project_task_risk_management_odoo/views/risk_response_views.xml
index ec5d532c7..9a8f969ae 100644
--- a/project_task_risk_management_odoo/views/risk_response.xml
+++ b/project_task_risk_management_odoo/views/risk_response_views.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <odoo>
-<!--    Risk Response Tree View-->
+    <!--    Risk Response Tree View-->
     <record id="risk_response_view_tree" model="ir.ui.view">
         <field name="name">risk.response.view.tree</field>
         <field name="model">risk.response</field>
diff --git a/project_task_risk_management_odoo/views/risk_tags.xml b/project_task_risk_management_odoo/views/risk_tag_views.xml
similarity index 91%
rename from project_task_risk_management_odoo/views/risk_tags.xml
rename to project_task_risk_management_odoo/views/risk_tag_views.xml
index a7439b299..9845bfb3d 100644
--- a/project_task_risk_management_odoo/views/risk_tags.xml
+++ b/project_task_risk_management_odoo/views/risk_tag_views.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <odoo>
-<!--    Risk Tag Tree View-->
+    <!--    Risk Tag Tree View-->
     <record id="risk_tag_view_tree" model="ir.ui.view">
         <field name="name">risk.tag.view.tree</field>
         <field name="model">risk.tag</field>
diff --git a/project_task_risk_management_odoo/views/risk_type.xml b/project_task_risk_management_odoo/views/risk_type_views.xml
similarity index 90%
rename from project_task_risk_management_odoo/views/risk_type.xml
rename to project_task_risk_management_odoo/views/risk_type_views.xml
index 4a6b67557..907d6550c 100644
--- a/project_task_risk_management_odoo/views/risk_type.xml
+++ b/project_task_risk_management_odoo/views/risk_type_views.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <odoo>
-<!--    Risk Type Tree View -->
+    <!--    Risk Type Tree View -->
     <record id="risk_type_view_tree" model="ir.ui.view">
         <field name="name">risk.type.view.tree</field>
         <field name="model">risk.type</field>
diff --git a/project_task_risk_management_odoo/views/risks_project.xml b/project_task_risk_management_odoo/views/risks_project_views.xml
similarity index 84%
rename from project_task_risk_management_odoo/views/risks_project.xml
rename to project_task_risk_management_odoo/views/risks_project_views.xml
index 37ce9157d..537eab86d 100644
--- a/project_task_risk_management_odoo/views/risks_project.xml
+++ b/project_task_risk_management_odoo/views/risks_project_views.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <odoo>
-<!--    Risk Type Tree View-->
+    <!--    Risk Type Tree View-->
     <record id="risks_project_view_tree" model="ir.ui.view">
-        <field name="name">risk.type.view.tree</field>
+        <field name="name">risks.project.view.tree</field>
         <field name="model">risks.project</field>
         <field name="arch" type="xml">
             <tree string="Risks">
@@ -12,11 +12,12 @@
                 <field name="category_id"/>
                 <field name="risk_type"/>
                 <field name="risk_response"/>
-                <field name="tag_ids" widget="many2many_tags"  options="{'color_field': 'color'}"/>
+                <field name="tag_ids" widget="many2many_tags"
+                       options="{'color_field': 'color'}"/>
             </tree>
         </field>
     </record>
-<!--    Risk Project Form View-->
+    <!--    Risk Project Form View-->
     <record id="risks_project_view_form" model="ir.ui.view">
         <field name="name">risks.project.view.form</field>
         <field name="model">risks.project</field>
@@ -28,7 +29,8 @@
                             <field name="risk_name"/>
                             <field name="code"/>
                             <field name="risk_quantification"/>
-                            <field name="tag_ids" widget="many2many_tags" options="{'color_field': 'color'}"/>
+                            <field name="tag_ids" widget="many2many_tags"
+                                   options="{'color_field': 'color'}"/>
                         </group>
                         <group>
                             <field name="category_id"/>
diff --git a/project_task_risk_management_odoo/views/task_risk_analysis.xml b/project_task_risk_management_odoo/views/task_risk_incident_line_views.xml
similarity index 91%
rename from project_task_risk_management_odoo/views/task_risk_analysis.xml
rename to project_task_risk_management_odoo/views/task_risk_incident_line_views.xml
index 72e1a482e..71f6902ab 100644
--- a/project_task_risk_management_odoo/views/task_risk_analysis.xml
+++ b/project_task_risk_management_odoo/views/task_risk_incident_line_views.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <odoo>
-<!--    Task Risk Incident Line Tree View-->
+    <!--    Task Risk Incident Line Tree View-->
     <record id="task_risk_incident_line_view_tree" model="ir.ui.view">
         <field name="name">task.risk.incident.line.view.tree</field>
         <field name="model">task.risk.incident.line</field>
@@ -18,7 +18,7 @@
             </tree>
         </field>
     </record>
-<!--    Task Risk Incident Line Pivot View -->
+    <!--    Task Risk Incident Line Pivot View -->
     <record id="task_risk_incident_line_view_pivot" model="ir.ui.view">
         <field name="name">task.risk.incident.line.view.pivot</field>
         <field name="model">task.risk.incident.line</field>
@@ -30,7 +30,7 @@
             </pivot>
         </field>
     </record>
-<!--    Task Risk Incident Line Graph View -->
+    <!--    Task Risk Incident Line Graph View -->
     <record id="task_risk_incident_line_view_graph" model="ir.ui.view">
         <field name="name">task.risk.incident.line.view.graph</field>
         <field name="model">task.risk.incident.line</field>
diff --git a/project_task_risk_management_odoo/wizard/risk_incident_wiz.xml b/project_task_risk_management_odoo/wizard/risk_incident_simplified_views.xml
similarity index 100%
rename from project_task_risk_management_odoo/wizard/risk_incident_wiz.xml
rename to project_task_risk_management_odoo/wizard/risk_incident_simplified_views.xml