diff --git a/account_ebics/wizards/ebics_xfer.xml b/account_ebics/wizards/ebics_xfer.xml
index 3e329e9..0ec245c 100644
--- a/account_ebics/wizards/ebics_xfer.xml
+++ b/account_ebics/wizards/ebics_xfer.xml
@@ -1,136 +1,139 @@
 <?xml version="1.0" encoding="utf-8" ?>
 <odoo>
 
-  <record id="ebics_xfer_view_form_download" model="ir.ui.view">
-    <field name="name">EBICS File Download</field>
-    <field name="model">ebics.xfer</field>
-    <field name="priority">1</field>
-    <field name="arch" type="xml">
-      <form string="EBICS File Download">
-        <group>
-          <separator string="Select your bank :" colspan="2" />
-          <field
+    <record id="ebics_xfer_view_form_download" model="ir.ui.view">
+        <field name="name">EBICS File Download</field>
+        <field name="model">ebics.xfer</field>
+        <field name="priority">1</field>
+        <field name="arch" type="xml">
+            <form string="EBICS File Download">
+                <group>
+                    <separator string="Select your bank :" colspan="2" />
+                    <field
                         name="ebics_config_id"
                         required="1"
                         options="{'no_create': True, 'no_open': True}"
                     />
-          <field
+                    <field
                         name="ebics_userid_id"
                         domain="[('ebics_config_id', '=', ebics_config_id), ('user_ids.id', '=', uid), ('transaction_rights', 'in', ['both', 'down'])]"
                         required="1"
                         options="{'no_create': True, 'no_open': True}"
                     />
-          <field
+                    <field
                         name="ebics_passphrase"
                         password="True"
                         invisible="ebics_passphrase_store"
                         required="not ebics_passphrase_store"
                     />
-          <field name="ebics_passphrase_store" invisible="1" />
-          <field name="date_from" />
-          <field name="date_to" />
-          <field
+                    <field name="ebics_passphrase_store" invisible="1" />
+                    <field name="date_from" />
+                    <field name="date_to" />
+                    <field
                         name="format_id"
                         domain="[('type', '=', 'down'), ('id', 'in', allowed_format_ids)]"
                     />
-          <field name="order_type" />
-          <field name="allowed_format_ids" invisible="1" />
-        </group>
-        <footer>
-          <button
+                    <field name="order_type" />
+                    <field name="allowed_format_ids" invisible="1" />
+                </group>
+                <footer>
+                    <button
                         name="ebics_download"
                         string="Download Files"
                         type="object"
                         class="btn-primary"
                         data-hotkey="q"
                     />
-          <button
+                    <button
                         string="Cancel"
                         class="btn-secondary"
                         special="cancel"
                         data-hotkey="z"
                     />
-        </footer>
-      </form>
-    </field>
-  </record>
+                </footer>
+            </form>
+        </field>
+    </record>
 
-  <record id="ebics_xfer_view_form_upload" model="ir.ui.view">
-    <field name="name">EBICS File Upload</field>
-    <field name="model">ebics.xfer</field>
-    <field name="priority">1</field>
-    <field name="arch" type="xml">
-      <form string="EBICS File Upload">
-        <group>
-          <separator string="Select your bank :" colspan="2" />
-          <field
+    <record id="ebics_xfer_view_form_upload" model="ir.ui.view">
+        <field name="name">EBICS File Upload</field>
+        <field name="model">ebics.xfer</field>
+        <field name="priority">1</field>
+        <field name="arch" type="xml">
+            <form string="EBICS File Upload">
+                <group>
+                    <separator string="Select your bank :" colspan="2" />
+                    <field
                         name="ebics_config_id"
                         required="1"
                         options="{'no_create': True, 'no_open': True}"
                     />
-          <field
+                    <field
                         name="ebics_userid_id"
                         domain="[('ebics_config_id', '=', ebics_config_id), ('user_ids.id', '=', uid), ('transaction_rights', 'in', ['both', 'up'])]"
                         required="1"
                         options="{'no_create': True, 'no_open': True}"
                     />
-          <field
+                    <field
                         name="ebics_passphrase"
                         password="True"
                         invisible="ebics_passphrase_store"
                         required="not ebics_passphrase_store"
                     />
-          <field
+                    <field
                         name="ebics_sig_passphrase"
                         password="True"
                         invisible="ebics_sig_passphrase_invisible"
                     />
-          <field name="ebics_passphrase_store" invisible="1" />
-          <field name="ebics_sig_passphrase_invisible" invisible="1" />
-          <separator string="Select your file :" colspan="2" />
-          <field name="upload_data" filename="upload_fname" required="1" />
-          <field name="upload_fname" invisible="1" />
-          <field name="upload_fname_dummy" string="Upload Filename" />
-          <field name="upload_format_ids" invisible="1" />
-          <field
+                    <field name="ebics_passphrase_store" invisible="1" />
+                    <field name="ebics_sig_passphrase_invisible" invisible="1" />
+                    <separator string="Select your file :" colspan="2" />
+                    <field name="upload_data" filename="upload_fname" required="1" />
+                    <field name="upload_fname" invisible="1" />
+                    <field name="upload_fname_dummy" string="Upload Filename" />
+                    <field name="upload_format_ids" invisible="1" />
+                    <field
                         name="format_id"
                         required="1"
                         domain="[('type', '=', 'up'), ('id', 'in', allowed_format_ids)]"
                         readonly="context.get('active_model') == 'account.payment.order'"
                     />
-          <field name="order_type" />
-          <field name="test_mode" invisible="order_type not in ('FUL', 'BTU')" />
-          <field name="allowed_format_ids" invisible="1" />
-        </group>
-        <footer>
-          <button
+                    <field name="order_type" />
+                    <field
+                        name="test_mode"
+                        invisible="order_type not in ('FUL', 'BTU')"
+                    />
+                    <field name="allowed_format_ids" invisible="1" />
+                </group>
+                <footer>
+                    <button
                         name="ebics_upload"
                         string="Upload File"
                         type="object"
                         class="btn-primary"
                         data-hotkey="q"
                     />
-          <button
+                    <button
                         string="Cancel"
                         class="btn-secondary"
                         special="cancel"
                         data-hotkey="z"
                     />
-        </footer>
-      </form>
-    </field>
-  </record>
+                </footer>
+            </form>
+        </field>
+    </record>
 
-  <record id="ebics_xfer_view_form_result" model="ir.ui.view">
-    <field name="name">EBICS File Transfer</field>
-    <field name="model">ebics.xfer</field>
-    <field name="priority">2</field>
-    <field name="arch" type="xml">
-      <form string="EBICS File Transfer">
-        <separator colspan="4" string="Results :" />
-        <field name="note" colspan="4" nolabel="1" width="850" height="400" />
-        <footer>
-          <button
+    <record id="ebics_xfer_view_form_result" model="ir.ui.view">
+        <field name="name">EBICS File Transfer</field>
+        <field name="model">ebics.xfer</field>
+        <field name="priority">2</field>
+        <field name="arch" type="xml">
+            <form string="EBICS File Transfer">
+                <separator colspan="4" string="Results :" />
+                <field name="note" colspan="4" nolabel="1" width="850" height="400" />
+                <footer>
+                    <button
                         name="view_ebics_file"
                         type="object"
                         string="View EBICS File(s)"
@@ -138,36 +141,36 @@
                         invisible="not context.get('ebics_file_ids')"
                         data-hotkey="q"
                     />
-          <button
+                    <button
                         string="Close"
                         class="btn-secondary"
                         special="cancel"
                         data-hotkey="z"
                     />
-        </footer>
-      </form>
-    </field>
-  </record>
+                </footer>
+            </form>
+        </field>
+    </record>
 
-  <record id="ebics_xfer_action_download" model="ir.actions.act_window">
-    <field name="name">EBICS File Transfer - Download</field>
-    <field name="type">ir.actions.act_window</field>
-    <field name="res_model">ebics.xfer</field>
-    <field name="view_mode">form</field>
-    <field name="target">new</field>
-    <field name="context">{'ebics_download': 1}</field>
-    <field name="view_id" ref="ebics_xfer_view_form_download" />
-  </record>
+    <record id="ebics_xfer_action_download" model="ir.actions.act_window">
+        <field name="name">EBICS File Transfer - Download</field>
+        <field name="type">ir.actions.act_window</field>
+        <field name="res_model">ebics.xfer</field>
+        <field name="view_mode">form</field>
+        <field name="target">new</field>
+        <field name="context">{'ebics_download': 1}</field>
+        <field name="view_id" ref="ebics_xfer_view_form_download" />
+    </record>
 
-  <record id="ebics_xfer_action_upload" model="ir.actions.act_window">
-    <field name="name">EBICS File Transfer - Upload</field>
-    <field name="type">ir.actions.act_window</field>
-    <field name="res_model">ebics.xfer</field>
-    <field name="view_mode">form</field>
-    <field name="target">new</field>
-    <field name="context">{'ebics_upload': 1}</field>
-    <field name="view_id" ref="ebics_xfer_view_form_upload" />
-  </record>
+    <record id="ebics_xfer_action_upload" model="ir.actions.act_window">
+        <field name="name">EBICS File Transfer - Upload</field>
+        <field name="type">ir.actions.act_window</field>
+        <field name="res_model">ebics.xfer</field>
+        <field name="view_mode">form</field>
+        <field name="target">new</field>
+        <field name="context">{'ebics_upload': 1}</field>
+        <field name="view_id" ref="ebics_xfer_view_form_upload" />
+    </record>
 
     <record id="ebics_xfer_view_form_mark_as_downloaded" model="ir.ui.view">
         <field name="name">Mark EBICS files as Downloaded</field>
@@ -176,9 +179,11 @@
         <field name="arch" type="xml">
             <form string="EBICS Mark as Downloaded">
                 <div class="alert alert-warning" role="alert">
-                    The EBICS Files (Bank Statements) selected via this screen will not become available in Odoo as EBICS files but will be marked by your bank as downloaded.
+                    The EBICS Files (Bank Statements) selected via this screen will not become available in Odoo as
+                    EBICS files but will be marked by your bank as downloaded.
                     <br />
-                    As a consequence, these Bank Statements will not be retrieved by the next 'EBICS Batch Import' scheduled action.
+                    As a consequence, these Bank Statements will not be retrieved by the next 'EBICS Batch Import'
+                    scheduled action.
                 </div>
                 <group>
                     <separator string="Select your bank :" colspan="2" />
@@ -199,6 +204,7 @@
                         invisible="ebics_passphrase_store"
                         required="not ebics_passphrase_store"
                     />
+                    <field name="ebics_passphrase_store" invisible="1" />
                     <field name="date_from" required="1" />
                     <field name="date_to" required="1" />
                     <field
@@ -206,6 +212,7 @@
                         required="1"
                         domain="[('type', '=', 'down'), ('id', 'in', allowed_format_ids)]"
                     />
+                    <field name="allowed_format_ids" invisible="1" />
                 </group>
                 <footer>
                     <button
diff --git a/account_ebics_batch_payment/models/account_batch_payment.py b/account_ebics_batch_payment/models/account_batch_payment.py
index f942e7c..bdb891d 100644
--- a/account_ebics_batch_payment/models/account_batch_payment.py
+++ b/account_ebics_batch_payment/models/account_batch_payment.py
@@ -1,15 +1,18 @@
 # Copyright 2020 Noviat.
 # License LGPL-3 or later (http://www.gnu.org/licenses/lgpl).
 
-from odoo import _, fields, models
+from odoo import _, api, fields, models
 from odoo.exceptions import UserError
 
 
 class AccountBatchPayment(models.Model):
     _inherit = "account.batch.payment"
 
-    hide_ebics_upload = fields.Boolean(compute="_compute_hide_ebics_upload")
+    hide_ebics_upload = fields.Boolean(
+        compute="_compute_hide_ebics_upload", default=True
+    )
 
+    @api.depends("journal_id.ebics_config_id", "file_generation_enabled", "state")
     def _compute_hide_ebics_upload(self):
         for rec in self:
             rec.hide_ebics_upload = (
@@ -47,7 +50,6 @@ class AccountBatchPayment(models.Model):
         view = self.env.ref("account_ebics.ebics_xfer_view_form_upload")
         act = {
             "name": _("EBICS Upload"),
-            "view_type": "form",
             "view_mode": "form",
             "res_model": "ebics.xfer",
             "view_id": view.id,
diff --git a/account_ebics_payment_order/models/account_payment_mode.py b/account_ebics_payment_order/models/account_payment_mode.py
index 00bec22..055fbf4 100644
--- a/account_ebics_payment_order/models/account_payment_mode.py
+++ b/account_ebics_payment_order/models/account_payment_mode.py
@@ -1,5 +1,5 @@
 # Copyright 2015 Noviat.
-# License LGPL-3 or later (https://www.gnu.org/licenses/lpgl).
+# License LGPL-3 or later (https://www.gnu.org/licenses/lgpl).
 
 from odoo import fields, models
 
diff --git a/account_ebics_payment_order/models/account_payment_order.py b/account_ebics_payment_order/models/account_payment_order.py
index ea0b53e..f268734 100644
--- a/account_ebics_payment_order/models/account_payment_order.py
+++ b/account_ebics_payment_order/models/account_payment_order.py
@@ -1,15 +1,18 @@
 # Copyright 2015 Noviat.
 # License LGPL-3 or later (https://www.gnu.org/licenses/lgpl).
 
-from odoo import _, fields, models
+from odoo import _, api, fields, models
 from odoo.exceptions import UserError
 
 
 class AccountPaymentOrder(models.Model):
     _inherit = "account.payment.order"
 
-    hide_ebics_upload = fields.Boolean(compute="_compute_hide_ebics_upload")
+    hide_ebics_upload = fields.Boolean(
+        compute="_compute_hide_ebics_upload", default=True
+    )
 
+    @api.depends("journal_id.ebics_config_id", "state")
     def _compute_hide_ebics_upload(self):
         for rec in self:
             rec.hide_ebics_upload = (
@@ -77,7 +80,6 @@ class AccountPaymentOrder(models.Model):
             view = self.env.ref("account_ebics.ebics_xfer_view_form_upload")
             act = {
                 "name": _("EBICS Upload"),
-                "view_type": "form",
                 "view_mode": "form",
                 "res_model": "ebics.xfer",
                 "view_id": view.id,