diff --git a/account_banking_pain_base/views/account_payment_mode.xml b/account_banking_pain_base/views/account_payment_mode.xml
index cc7346dd6..29546b84e 100644
--- a/account_banking_pain_base/views/account_payment_mode.xml
+++ b/account_banking_pain_base/views/account_payment_mode.xml
@@ -14,12 +14,10 @@
     <field name="model">account.payment.mode</field>
     <field name="inherit_id" ref="account_payment_order.account_payment_mode_form"/>
     <field name="arch" type="xml">
-        <group name="payment_order_options" position="after">
-            <group name="pain_options" string="Options for PAIN">
-                <!-- To be set visible in the localisation modules that need it -->
-                <field name="initiating_party_identifier" invisible="1"/>
-                <field name="initiating_party_issuer" invisible="1"/>
-            </group>
+        <group name="main" position="inside">
+            <!-- To be set visible in the localisation modules that need it -->
+            <field name="initiating_party_identifier" invisible="1"/>
+            <field name="initiating_party_issuer" invisible="1"/>
         </group>
     </field>
 </record>
diff --git a/account_banking_sepa_direct_debit/views/account_payment_mode.xml b/account_banking_sepa_direct_debit/views/account_payment_mode.xml
index 5f41be2f3..23eca685f 100644
--- a/account_banking_sepa_direct_debit/views/account_payment_mode.xml
+++ b/account_banking_sepa_direct_debit/views/account_payment_mode.xml
@@ -10,7 +10,7 @@
     <field name="model">account.payment.mode</field>
     <field name="inherit_id" ref="account_banking_pain_base.account_payment_mode_form"/>
     <field name="arch" type="xml">
-        <group name="pain_options" position="inside">
+        <group name="main" position="inside">
             <field name="sepa_creditor_identifier" invisible="1"/>
             <!-- This field should be set visible by localization modules
             for countries that may have several sepa_creditor_identifier for
diff --git a/account_payment_mode/views/account_payment_mode.xml b/account_payment_mode/views/account_payment_mode.xml
index 90ffb114f..aa67cb2ec 100644
--- a/account_payment_mode/views/account_payment_mode.xml
+++ b/account_payment_mode/views/account_payment_mode.xml
@@ -21,7 +21,7 @@
                     attrs="{'invisible': [('bank_account_link', '!=', 'variable')], 'required': [('bank_account_link', '=', 'variable')]}"
                     widget="many2many_tags"/>
             </group>
-            <group string="Note" col="4">
+            <group string="Note" name="note">
                 <field name="note" nolabel="1"/>
             </group>
         </form>
diff --git a/account_payment_order/models/account_payment_mode.py b/account_payment_order/models/account_payment_mode.py
index 501be87a1..83e7a4cb4 100644
--- a/account_payment_order/models/account_payment_mode.py
+++ b/account_payment_order/models/account_payment_mode.py
@@ -35,7 +35,7 @@ class AccountPaymentMode(models.Model):
         ('move', 'Move'),
         ], default='due', string="Type of Date Filter")
     group_lines = fields.Boolean(
-        string="Group lines in payment orders", default=True,
+        string="Group Lines in Payment Orders", default=True,
         help="If this mark is checked, the payment order lines will be "
              "grouped when validating the payment order before exporting the "
              "bank file. The grouping will be done only if the following "