diff --git a/product_harmonized_system/models/hs_code.py b/product_harmonized_system/models/hs_code.py
index b2ee7c8..475c399 100644
--- a/product_harmonized_system/models/hs_code.py
+++ b/product_harmonized_system/models/hs_code.py
@@ -99,9 +99,9 @@ class HSCode(models.Model):
     def create(self, vals):
         if vals.get("local_code"):
             vals["local_code"] = vals["local_code"].replace(" ", "")
-        return super(HSCode, self).create(vals)
+        return super().create(vals)
 
     def write(self, vals):
         if vals.get("local_code"):
             vals["local_code"] = vals["local_code"].replace(" ", "")
-        return super(HSCode, self).write(vals)
+        return super().write(vals)
diff --git a/product_harmonized_system/security/product_hs_security.xml b/product_harmonized_system/security/product_hs_security.xml
index fc1a5e0..42c7761 100644
--- a/product_harmonized_system/security/product_hs_security.xml
+++ b/product_harmonized_system/security/product_hs_security.xml
@@ -5,6 +5,6 @@
         <field name="model_id" ref="model_hs_code" />
         <field
             name="domain_force"
-        >['|', ('company_id', '=', False), ('company_id', 'child_of', [user.company_id.id])]</field>
+        >['|', ('company_id', '=', False), ('company_id', 'in', company_ids)]</field>
     </record>
 </odoo>
diff --git a/product_harmonized_system/views/hs_code.xml b/product_harmonized_system/views/hs_code.xml
index 1841ced..4b0316c 100644
--- a/product_harmonized_system/views/hs_code.xml
+++ b/product_harmonized_system/views/hs_code.xml
@@ -55,6 +55,13 @@
         <field name="model">hs.code</field>
         <field name="arch" type="xml">
             <form string="H.S. Code">
+                <field name="active" invisible="1" />
+                <widget
+                    name="web_ribbon"
+                    text="Archived"
+                    bg_color="bg-danger"
+                    attrs="{'invisible': [('active', '=', True)]}"
+                />
                 <div class="oe_button_box" name="button_box">
                     <button
                         class="oe_stat_button"
@@ -82,18 +89,6 @@
                             <span class="o_stat_text"> Products</span>
                         </div>
                     </button>
-                    <button
-                        name="toggle_active"
-                        type="object"
-                        class="oe_stat_button"
-                        icon="fa-archive"
-                    >
-                        <field
-                            name="active"
-                            widget="boolean_button"
-                            options='{"terminology": "archive"}'
-                        />
-                    </button>
                 </div>
                 <group name="main">
                     <field name="local_code" />