diff --git a/addons/sale_loyalty/__manifest__.py b/addons/sale_loyalty/__manifest__.py
index 16f0d2cf0e7..4125f06398f 100644
--- a/addons/sale_loyalty/__manifest__.py
+++ b/addons/sale_loyalty/__manifest__.py
@@ -10,14 +10,18 @@
     'auto_install': True,
     'data': [
         'security/ir.model.access.csv',
+
         'data/sale_loyalty_data.xml',
+
         'wizard/sale_loyalty_coupon_wizard_views.xml',
         'wizard/sale_loyalty_reward_wizard_views.xml',
+
         'views/loyalty_card_views.xml',
         'views/loyalty_program_views.xml',
         'views/sale_order_views.xml',
-        'views/templates.xml',
+        'views/sale_portal_templates.xml',
         'views/res_partner_views.xml',
+        'views/sale_loyalty_menus.xml',
     ],
     'license': 'LGPL-3',
 }
diff --git a/addons/sale_loyalty/data/sale_loyalty_data.xml b/addons/sale_loyalty/data/sale_loyalty_data.xml
index aa3e3f61a48..773af100bfd 100644
--- a/addons/sale_loyalty/data/sale_loyalty_data.xml
+++ b/addons/sale_loyalty/data/sale_loyalty_data.xml
@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="utf-8"?>
-<odoo>
-    <data noupdate="1">
-        <record id="loyalty.gift_card_product_50" model="product.product">
-            <field name="taxes_id" eval="False"/>
-        </record>
-        <record id="loyalty.ewallet_product_50" model="product.product">
-            <field name="taxes_id" eval="False"/>
-        </record>
-    </data>
+<odoo noupdate="1">
+
+    <record id="loyalty.gift_card_product_50" model="product.product">
+        <field name="taxes_id" eval="False"/>
+    </record>
+    <record id="loyalty.ewallet_product_50" model="product.product">
+        <field name="taxes_id" eval="False"/>
+    </record>
+
 </odoo>
diff --git a/addons/sale_loyalty/views/loyalty_card_views.xml b/addons/sale_loyalty/views/loyalty_card_views.xml
index bb3ee12286b..052c539fafd 100644
--- a/addons/sale_loyalty/views/loyalty_card_views.xml
+++ b/addons/sale_loyalty/views/loyalty_card_views.xml
@@ -1,13 +1,15 @@
 <?xml version="1.0" encoding="utf-8"?>
 <odoo>
+
     <record id="loyalty_card_view_form_inherit_sale_loyalty" model="ir.ui.view">
         <field name="name">loyalty.card.view.form.inherit.sale.loyalty</field>
         <field name="model">loyalty.card</field>
         <field name="inherit_id" ref="loyalty.loyalty_card_view_form"/>
         <field name="arch" type="xml">
-            <xpath expr="//field[@name='partner_id']" position="after">
-                <field name="order_id" readonly="1" attrs="{'invisible': [('order_id', '=', False)]}" />
-            </xpath>
+            <field name="partner_id"  position="after">
+                <field name="order_id" attrs="{'invisible': [('order_id', '=', False)]}"/>
+            </field>
         </field>
     </record>
+
 </odoo>
diff --git a/addons/sale_loyalty/views/loyalty_program_views.xml b/addons/sale_loyalty/views/loyalty_program_views.xml
index 74b7381ac63..7ef34a0bba7 100644
--- a/addons/sale_loyalty/views/loyalty_program_views.xml
+++ b/addons/sale_loyalty/views/loyalty_program_views.xml
@@ -1,5 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <odoo>
+
     <record id="loyalty_program_view_form_inherit_sale_loyalty" model="ir.ui.view">
         <field name="name">loyalty.program.view.form.inherit.sale.loyalty</field>
         <field name="model">loyalty.program</field>
@@ -20,21 +21,4 @@
         </field>
     </record>
 
-    <menuitem
-        id="menu_discount_loyalty_type_config"
-        action="loyalty.loyalty_program_discount_loyalty_action"
-        name="Discount &amp; Loyalty"
-        parent="sale.product_menu_catalog"
-        groups="sales_team.group_sale_manager"
-        sequence="40"
-    />
-
-    <menuitem
-        id="menu_gift_ewallet_type_config"
-        action="loyalty.loyalty_program_gift_ewallet_action"
-        name="Gift cards &amp; eWallet"
-        parent="sale.product_menu_catalog"
-        groups="sales_team.group_sale_manager"
-        sequence="50"
-    />
 </odoo>
diff --git a/addons/sale_loyalty/views/sale_loyalty_menus.xml b/addons/sale_loyalty/views/sale_loyalty_menus.xml
new file mode 100644
index 00000000000..d24abd76236
--- /dev/null
+++ b/addons/sale_loyalty/views/sale_loyalty_menus.xml
@@ -0,0 +1,16 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<odoo>
+
+    <menuitem id="menu_discount_loyalty_type_config"
+        action="loyalty.loyalty_program_discount_loyalty_action"
+        parent="sale.product_menu_catalog"
+        groups="sales_team.group_sale_manager"
+        sequence="40"/>
+
+    <menuitem id="menu_gift_ewallet_type_config"
+        action="loyalty.loyalty_program_gift_ewallet_action"
+        parent="sale.product_menu_catalog"
+        groups="sales_team.group_sale_manager"
+        sequence="50"/>
+
+</odoo>
diff --git a/addons/sale_loyalty/views/sale_order_views.xml b/addons/sale_loyalty/views/sale_order_views.xml
index e2a2bdd6f57..2e88bf40dd9 100644
--- a/addons/sale_loyalty/views/sale_order_views.xml
+++ b/addons/sale_loyalty/views/sale_order_views.xml
@@ -1,20 +1,22 @@
 <?xml version="1.0" encoding="utf-8"?>
 <odoo>
+
     <record id="sale_order_view_form_inherit_sale_loyalty" model="ir.ui.view">
         <field name="name">sale.order.view.form.inherit.sale.loyalty</field>
         <field name="model">sale.order</field>
         <field name="inherit_id" ref="sale.view_order_form"/>
         <field name="priority">10</field>
         <field name="arch" type="xml">
-            <xpath expr="//group[@name='note_group']" position="before">
+            <group name="note_group" position="before">
                 <div class="oe_right">
                     <button name="%(sale_loyalty.sale_loyalty_coupon_wizard_action)d" class="btn btn-secondary"
-                        string="Coupon Code" type="action" groups="base.group_user" states="draft,sent,sale"/>
+                        string="Coupon Code" type="action" states="draft,sent,sale"/>
                     <button name="action_open_reward_wizard" class="btn btn-secondary"
-                        string="Promotions" type="object" groups="base.group_user" states="draft,sent,sale"
+                        string="Promotions" type="object" states="draft,sent,sale"
                         help="Update current promotional lines and select new rewards if applicable."/>
                 </div>
-            </xpath>
+            </group>
         </field>
     </record>
+
 </odoo>
diff --git a/addons/sale_loyalty/views/templates.xml b/addons/sale_loyalty/views/sale_portal_templates.xml
similarity index 90%
rename from addons/sale_loyalty/views/templates.xml
rename to addons/sale_loyalty/views/sale_portal_templates.xml
index bfc0ab985d8..a8e901b9250 100644
--- a/addons/sale_loyalty/views/templates.xml
+++ b/addons/sale_loyalty/views/sale_portal_templates.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" ?>
 <odoo>
 
-    <template id="sale_loyalty.used_gift_card">
+    <template id="used_gift_card">
         <div class="text-muted d-md-block small"
             t-if="line.coupon_id and line.order_id != line.coupon_id.order_id and not line.coupon_id.program_id.is_nominative">
             <span>
@@ -18,18 +18,6 @@
         </div>
     </template>
 
-    <template id="sale_order_portal_content_inherit" name="Gift Card Products Portal" inherit_id="sale.sale_order_portal_content">
-        <xpath expr="//section[@id='details']//td[@id='product_name']/*[last()]" position="after">
-            <t t-if="line.coupon_id and line.coupon_id.program_id.program_type == 'gift_card'" t-call="sale_loyalty.used_gift_card"/>
-        </xpath>
-        <xpath expr="//div[@id='total']" position="after">
-            <t t-call="sale_loyalty.sale_purchased_gift_card">
-                <t t-set="order" t-value="sale_order"/>
-                <t t-set="hide_intro" t-value="1"/>
-            </t>
-        </xpath>
-    </template>
-    
     <template id="sale_purchased_gift_card">
         <t t-set="gift_cards" t-value="order.coupon_point_ids.filtered(lambda pe: pe.coupon_id.program_id.program_type == 'gift_card').coupon_id"/>
         <div class="card mt-3 " t-if="gift_cards">
@@ -58,4 +46,20 @@
             </div>
         </div>
     </template>
+
+    <template id="sale_order_portal_content_inherit"
+              name="Gift Card Products Portal"
+              inherit_id="sale.sale_order_portal_content">
+        <xpath expr="//section[@id='details']//td[@id='product_name']/*[last()]" position="after">
+            <t t-if="line.coupon_id and line.coupon_id.program_id.program_type == 'gift_card'"
+               t-call="sale_loyalty.used_gift_card"/>
+        </xpath>
+        <xpath expr="//div[@id='total']" position="after">
+            <t t-call="sale_loyalty.sale_purchased_gift_card">
+                <t t-set="order" t-value="sale_order"/>
+                <t t-set="hide_intro" t-value="1"/>
+            </t>
+        </xpath>
+    </template>
+
 </odoo>