diff --git a/account_multi_store/views/res_store_views.xml b/account_multi_store/views/res_store_views.xml
index a83db5e..a5fcdae 100644
--- a/account_multi_store/views/res_store_views.xml
+++ b/account_multi_store/views/res_store_views.xml
@@ -16,14 +16,12 @@
                     <field name="journals_count" widget="statinfo"/>
                 </button>
             </div>
-            <field name="parent_id" position="after">
-                <group>
-                    <field name="only_allow_reonciliaton_of_this_store"/>
-                </group>
-            </field>
+            <group name="col2">
+                <field name="only_allow_reonciliaton_of_this_store"/>
+            </group>
             <notebook>
                 <page string="Journals" name="journals">
-                    <field name="journal_ids" readonly="1" widget="many2many_tags"/>
+                    <field name="journal_ids" widget="many2many" domain="[('store_id', '=', False)]"/>
                 </page>
             </notebook>
         </field>
diff --git a/account_payment_group_multi_store/__manifest__.py b/account_payment_group_multi_store/__manifest__.py
index 80ae119..512cb6f 100644
--- a/account_payment_group_multi_store/__manifest__.py
+++ b/account_payment_group_multi_store/__manifest__.py
@@ -19,7 +19,7 @@
 ##############################################################################
 {
     'name': 'Multi Store on Payment Groups',
-    'version': '13.0.1.0.0',
+    'version': '16.0.1.0.0',
     'category': 'Accounting',
     'sequence': 14,
     'summary': '',
diff --git a/account_payment_group_multi_store/models/account_payment_group.py b/account_payment_group_multi_store/models/account_payment_group.py
index b67dfbd..9a851f5 100644
--- a/account_payment_group_multi_store/models/account_payment_group.py
+++ b/account_payment_group_multi_store/models/account_payment_group.py
@@ -6,7 +6,6 @@ class AccountPaymentGroup(models.Model):
 
     store_id = fields.Many2one(
         'res.store',
-        # related='journal_id.store_id',
         compute='_compute_store_id',
         readonly=False,
         store=True,
diff --git a/base_multi_store/views/res_store_view.xml b/base_multi_store/views/res_store_view.xml
index a6dbb24..b6e9ceb 100644
--- a/base_multi_store/views/res_store_view.xml
+++ b/base_multi_store/views/res_store_view.xml
@@ -19,6 +19,7 @@
         <field name="model">res.store</field>
         <field name="arch" type="xml">
             <form>
+                <field name="company_id" invisible="1"/>
                 <sheet>
                     <div class="oe_button_box" name="button_box"> </div>
                     <field name="id" invisible="1"/>
@@ -29,12 +30,15 @@
                         </h1>
                     </div>
                     <group>
-                            <field name="company_id" invisible="1"/>
-                            <field name="company_id" placeholder="Company" groups="base.group_multi_company"/>
-                            <field name="parent_id" placeholder="Parent" domain="[('id', '!=', id),'|', ('company_id', '=', False), ('company_id', '=', company_id)]" context="{'default_company_id': company_id}"/>
-                        <notebook>
-                        </notebook>
+                        <group name="col1">
+                            <field name="company_id" groups="base.group_multi_company"/>
+                            <field name="parent_id" domain="[('id', '!=', id),'|', ('company_id', '=', False), ('company_id', '=', company_id)]" context="{'default_company_id': company_id}"/>
+                        </group>
+                        <group name="col2">
+                        </group>
                     </group>
+                    <notebook>
+                    </notebook>
                 </sheet>
             </form>
         </field>
diff --git a/stock_multi_store/views/res_store_view.xml b/stock_multi_store/views/res_store_view.xml
index 4f904e1..6180b45 100644
--- a/stock_multi_store/views/res_store_view.xml
+++ b/stock_multi_store/views/res_store_view.xml
@@ -20,7 +20,7 @@
 
             <notebook>
                 <page string="Warehouses" name="warehouses">
-                    <field name="warehouse_ids" readonly="1" widget="many2many_tags"/>
+                    <field name="warehouse_ids" widget="many2many" domain="[('store_id', '=', False)]"/>
                 </page>
             </notebook>