diff --git a/README.md b/README.md
index 8c1d1fb..e225871 100644
--- a/README.md
+++ b/README.md
@@ -15,7 +15,7 @@ Available addons
 ----------------
 addon | version | maintainers | summary
 --- | --- | --- | ---
-[account_ebics](account_ebics/) | 18.0.1.0.3 |  | EBICS banking protocol
+[account_ebics](account_ebics/) | 18.0.1.1.0 |  | EBICS banking protocol
 [account_ebics_batch](account_ebics_batch/) | 18.0.1.0.0 |  | EBICS Files automated import and processing
 [account_ebics_batch_payment](account_ebics_batch_payment/) | 18.0.1.0.0 |  | Upload Batch Payment via EBICS
 [account_ebics_oca_statement_import](account_ebics_oca_statement_import/) | 18.0.1.0.0 |  | Use OCA Bank Statement Import with account_ebics
diff --git a/account_ebics/__manifest__.py b/account_ebics/__manifest__.py
index 534df97..ee0aba5 100644
--- a/account_ebics/__manifest__.py
+++ b/account_ebics/__manifest__.py
@@ -1,9 +1,9 @@
-# Copyright 2009-2025 Noviat.
+# Copyright 2015 Noviat.
 # License LGPL-3 or later (https://www.gnu.org/licenses/lgpl).
 
 {
     "name": "EBICS banking protocol",
-    "version": "18.0.1.0.3",
+    "version": "18.0.1.1.0",
     "license": "LGPL-3",
     "author": "Noviat",
     "website": "https://www.noviat.com/",
diff --git a/account_ebics/i18n/account_ebics.pot b/account_ebics/i18n/account_ebics.pot
index 7320e12..77486fb 100644
--- a/account_ebics/i18n/account_ebics.pot
+++ b/account_ebics/i18n/account_ebics.pot
@@ -85,8 +85,7 @@ msgid "Active Keys"
 msgstr ""
 
 #. module: account_ebics
-#: model_terms:ir.ui.view,arch_db:account_ebics.ebics_file_view_form_download
-#: model_terms:ir.ui.view,arch_db:account_ebics.ebics_file_view_form_upload
+#: model_terms:ir.ui.view,arch_db:account_ebics.ebics_file_view_form
 msgid "Additional Information"
 msgstr ""
 
@@ -171,7 +170,7 @@ msgid "Bank Statement"
 msgstr ""
 
 #. module: account_ebics
-#: model_terms:ir.ui.view,arch_db:account_ebics.ebics_file_view_form_download
+#: model_terms:ir.ui.view,arch_db:account_ebics.ebics_file_view_form
 msgid "Bank Statements"
 msgstr ""
 
@@ -340,8 +339,8 @@ msgid "Download"
 msgstr ""
 
 #. module: account_ebics
-#: model_terms:ir.ui.view,arch_db:account_ebics.ebics_file_view_form_download
-#: model_terms:ir.ui.view,arch_db:account_ebics.ebics_file_view_list_download
+#: model_terms:ir.ui.view,arch_db:account_ebics.ebics_file_view_form
+#: model_terms:ir.ui.view,arch_db:account_ebics.ebics_file_view_list
 msgid "Download Date"
 msgstr ""
 
@@ -446,12 +445,6 @@ msgstr ""
 msgid "EBICS Download Files"
 msgstr ""
 
-#. module: account_ebics
-#: model_terms:ir.ui.view,arch_db:account_ebics.ebics_file_view_form_download
-#: model_terms:ir.ui.view,arch_db:account_ebics.ebics_file_view_form_upload
-msgid "EBICS File"
-msgstr ""
-
 #. module: account_ebics
 #. odoo-python
 #: code:addons/account_ebics/wizards/ebics_xfer.py:0
@@ -1219,7 +1212,7 @@ msgid ""
 msgstr ""
 
 #. module: account_ebics
-#: model_terms:ir.ui.view,arch_db:account_ebics.ebics_file_view_form_download
+#: model_terms:ir.ui.view,arch_db:account_ebics.ebics_file_view_form
 msgid "Process"
 msgstr ""
 
@@ -1240,7 +1233,7 @@ msgid "Process file %(fn)s results:"
 msgstr ""
 
 #. module: account_ebics
-#: model_terms:ir.ui.view,arch_db:account_ebics.ebics_file_view_form_download
+#: model_terms:ir.ui.view,arch_db:account_ebics.ebics_file_view_form
 msgid "Process the EBICS File"
 msgstr ""
 
@@ -1274,11 +1267,6 @@ msgid ""
 "Either an ISO-3166 ALPHA 2 country code or an issuer code of 3 alphanumeric characters [A-Z0-9]."
 msgstr ""
 
-#. module: account_ebics
-#: model_terms:ir.ui.view,arch_db:account_ebics.ebics_file_view_search
-msgid "Search EBICS Files"
-msgstr ""
-
 #. module: account_ebics
 #: model:ir.model.fields,help:account_ebics.field_ebics_admin_order__format_id
 #: model:ir.model.fields,help:account_ebics.field_ebics_xfer__format_id
@@ -1350,15 +1338,13 @@ msgid "Set this flag in order to work with self-signed X.509 certificates"
 msgstr ""
 
 #. module: account_ebics
-#: model_terms:ir.ui.view,arch_db:account_ebics.ebics_file_view_form_download
-#: model_terms:ir.ui.view,arch_db:account_ebics.ebics_file_view_form_upload
+#: model_terms:ir.ui.view,arch_db:account_ebics.ebics_file_view_form
 msgid "Set to Done"
 msgstr ""
 
 #. module: account_ebics
 #: model_terms:ir.ui.view,arch_db:account_ebics.ebics_config_view_form
-#: model_terms:ir.ui.view,arch_db:account_ebics.ebics_file_view_form_download
-#: model_terms:ir.ui.view,arch_db:account_ebics.ebics_file_view_form_upload
+#: model_terms:ir.ui.view,arch_db:account_ebics.ebics_file_view_form
 #: model_terms:ir.ui.view,arch_db:account_ebics.ebics_userid_view_form
 msgid "Set to Draft"
 msgstr ""
@@ -1579,8 +1565,8 @@ msgid "Upload"
 msgstr ""
 
 #. module: account_ebics
-#: model_terms:ir.ui.view,arch_db:account_ebics.ebics_file_view_form_upload
-#: model_terms:ir.ui.view,arch_db:account_ebics.ebics_file_view_list_upload
+#: model_terms:ir.ui.view,arch_db:account_ebics.ebics_file_view_form
+#: model_terms:ir.ui.view,arch_db:account_ebics.ebics_file_view_list
 msgid "Upload Date"
 msgstr ""
 
diff --git a/account_ebics/i18n/fr.po b/account_ebics/i18n/fr.po
index 2d4a7cf..464e63c 100644
--- a/account_ebics/i18n/fr.po
+++ b/account_ebics/i18n/fr.po
@@ -11,8 +11,8 @@ msgstr ""
 "PO-Revision-Date: 2025-11-02 03:03+0000\n"
 "Last-Translator: Weblate Translation Memory <noreply-mt-weblate-translation-"
 "memory@weblate.org>\n"
-"Language-Team: French <https://translation.noviat.com/projects/"
-"noviat-generic-account-ebics-v18/account_ebics/fr/>\n"
+"Language-Team: French <https://translation.noviat.com/projects/noviat-"
+"generic-account-ebics-v18/account_ebics/fr/>\n"
 "Language: fr\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -92,8 +92,7 @@ msgid "Active Keys"
 msgstr ""
 
 #. module: account_ebics
-#: model_terms:ir.ui.view,arch_db:account_ebics.ebics_file_view_form_download
-#: model_terms:ir.ui.view,arch_db:account_ebics.ebics_file_view_form_upload
+#: model_terms:ir.ui.view,arch_db:account_ebics.ebics_file_view_form
 msgid "Additional Information"
 msgstr "Informations additionelles"
 
@@ -180,7 +179,7 @@ msgid "Bank Statement"
 msgstr "Relevé bancaire"
 
 #. module: account_ebics
-#: model_terms:ir.ui.view,arch_db:account_ebics.ebics_file_view_form_download
+#: model_terms:ir.ui.view,arch_db:account_ebics.ebics_file_view_form
 msgid "Bank Statements"
 msgstr "Relevés"
 
@@ -350,8 +349,8 @@ msgid "Download"
 msgstr "Télécharger"
 
 #. module: account_ebics
-#: model_terms:ir.ui.view,arch_db:account_ebics.ebics_file_view_form_download
-#: model_terms:ir.ui.view,arch_db:account_ebics.ebics_file_view_list_download
+#: model_terms:ir.ui.view,arch_db:account_ebics.ebics_file_view_form
+#: model_terms:ir.ui.view,arch_db:account_ebics.ebics_file_view_list
 msgid "Download Date"
 msgstr ""
 
@@ -460,12 +459,6 @@ msgstr ""
 msgid "EBICS Download Files"
 msgstr ""
 
-#. module: account_ebics
-#: model_terms:ir.ui.view,arch_db:account_ebics.ebics_file_view_form_download
-#: model_terms:ir.ui.view,arch_db:account_ebics.ebics_file_view_form_upload
-msgid "EBICS File"
-msgstr ""
-
 #. module: account_ebics
 #. odoo-python
 #: code:addons/account_ebics/wizards/ebics_xfer.py:0
@@ -538,8 +531,8 @@ msgstr ""
 #. odoo-python
 #: code:addons/account_ebics/wizards/ebics_xfer.py:0
 msgid ""
-"EBICS Functional Error during download of File Format %(name)s "
-"(%(order_type)s):"
+"EBICS Functional Error during download of File Format %(name)s (%"
+"(order_type)s):"
 msgstr ""
 
 #. module: account_ebics
@@ -678,8 +671,8 @@ msgstr ""
 #. odoo-python
 #: code:addons/account_ebics/wizards/ebics_xfer.py:0
 msgid ""
-"EBICS Technical Error during download of File Format %(name)s "
-"(%(order_type)s):"
+"EBICS Technical Error during download of File Format %(name)s (%"
+"(order_type)s):"
 msgstr ""
 
 #. module: account_ebics
@@ -725,8 +718,8 @@ msgstr ""
 #. odoo-python
 #: code:addons/account_ebics/wizards/ebics_xfer.py:0
 msgid ""
-"EBICS Verification Error during download of File Format %(name)s "
-"(%(order_type)s):"
+"EBICS Verification Error during download of File Format %(name)s (%"
+"(order_type)s):"
 msgstr ""
 
 #. module: account_ebics
@@ -1242,7 +1235,7 @@ msgid ""
 msgstr ""
 
 #. module: account_ebics
-#: model_terms:ir.ui.view,arch_db:account_ebics.ebics_file_view_form_download
+#: model_terms:ir.ui.view,arch_db:account_ebics.ebics_file_view_form
 msgid "Process"
 msgstr "Traiter"
 
@@ -1263,7 +1256,7 @@ msgid "Process file %(fn)s results:"
 msgstr ""
 
 #. module: account_ebics
-#: model_terms:ir.ui.view,arch_db:account_ebics.ebics_file_view_form_download
+#: model_terms:ir.ui.view,arch_db:account_ebics.ebics_file_view_form
 msgid "Process the EBICS File"
 msgstr ""
 
@@ -1298,11 +1291,6 @@ msgid ""
 "characters [A-Z0-9]."
 msgstr ""
 
-#. module: account_ebics
-#: model_terms:ir.ui.view,arch_db:account_ebics.ebics_file_view_search
-msgid "Search EBICS Files"
-msgstr ""
-
 #. module: account_ebics
 #: model:ir.model.fields,help:account_ebics.field_ebics_admin_order__format_id
 #: model:ir.model.fields,help:account_ebics.field_ebics_xfer__format_id
@@ -1374,15 +1362,13 @@ msgid "Set this flag in order to work with self-signed X.509 certificates"
 msgstr ""
 
 #. module: account_ebics
-#: model_terms:ir.ui.view,arch_db:account_ebics.ebics_file_view_form_download
-#: model_terms:ir.ui.view,arch_db:account_ebics.ebics_file_view_form_upload
+#: model_terms:ir.ui.view,arch_db:account_ebics.ebics_file_view_form
 msgid "Set to Done"
 msgstr ""
 
 #. module: account_ebics
 #: model_terms:ir.ui.view,arch_db:account_ebics.ebics_config_view_form
-#: model_terms:ir.ui.view,arch_db:account_ebics.ebics_file_view_form_download
-#: model_terms:ir.ui.view,arch_db:account_ebics.ebics_file_view_form_upload
+#: model_terms:ir.ui.view,arch_db:account_ebics.ebics_file_view_form
 #: model_terms:ir.ui.view,arch_db:account_ebics.ebics_userid_view_form
 msgid "Set to Draft"
 msgstr "Mettre à l'état \"Brouillon\""
@@ -1604,8 +1590,8 @@ msgid "Upload"
 msgstr ""
 
 #. module: account_ebics
-#: model_terms:ir.ui.view,arch_db:account_ebics.ebics_file_view_form_upload
-#: model_terms:ir.ui.view,arch_db:account_ebics.ebics_file_view_list_upload
+#: model_terms:ir.ui.view,arch_db:account_ebics.ebics_file_view_form
+#: model_terms:ir.ui.view,arch_db:account_ebics.ebics_file_view_list
 msgid "Upload Date"
 msgstr ""
 
diff --git a/account_ebics/i18n/nl.po b/account_ebics/i18n/nl.po
index 3f8c74f..e3917ca 100644
--- a/account_ebics/i18n/nl.po
+++ b/account_ebics/i18n/nl.po
@@ -11,8 +11,8 @@ msgstr ""
 "PO-Revision-Date: 2025-11-02 03:03+0000\n"
 "Last-Translator: Weblate Translation Memory <noreply-mt-weblate-translation-"
 "memory@weblate.org>\n"
-"Language-Team: Dutch <https://translation.noviat.com/projects/"
-"noviat-generic-account-ebics-v18/account_ebics/nl/>\n"
+"Language-Team: Dutch <https://translation.noviat.com/projects/noviat-generic-"
+"account-ebics-v18/account_ebics/nl/>\n"
 "Language: nl\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -92,8 +92,7 @@ msgid "Active Keys"
 msgstr ""
 
 #. module: account_ebics
-#: model_terms:ir.ui.view,arch_db:account_ebics.ebics_file_view_form_download
-#: model_terms:ir.ui.view,arch_db:account_ebics.ebics_file_view_form_upload
+#: model_terms:ir.ui.view,arch_db:account_ebics.ebics_file_view_form
 msgid "Additional Information"
 msgstr "Bijkomende informatie"
 
@@ -180,7 +179,7 @@ msgid "Bank Statement"
 msgstr "Rekeningafschrift"
 
 #. module: account_ebics
-#: model_terms:ir.ui.view,arch_db:account_ebics.ebics_file_view_form_download
+#: model_terms:ir.ui.view,arch_db:account_ebics.ebics_file_view_form
 msgid "Bank Statements"
 msgstr "Afschriften"
 
@@ -350,8 +349,8 @@ msgid "Download"
 msgstr "Downloaden"
 
 #. module: account_ebics
-#: model_terms:ir.ui.view,arch_db:account_ebics.ebics_file_view_form_download
-#: model_terms:ir.ui.view,arch_db:account_ebics.ebics_file_view_list_download
+#: model_terms:ir.ui.view,arch_db:account_ebics.ebics_file_view_form
+#: model_terms:ir.ui.view,arch_db:account_ebics.ebics_file_view_list
 msgid "Download Date"
 msgstr ""
 
@@ -460,12 +459,6 @@ msgstr ""
 msgid "EBICS Download Files"
 msgstr ""
 
-#. module: account_ebics
-#: model_terms:ir.ui.view,arch_db:account_ebics.ebics_file_view_form_download
-#: model_terms:ir.ui.view,arch_db:account_ebics.ebics_file_view_form_upload
-msgid "EBICS File"
-msgstr ""
-
 #. module: account_ebics
 #. odoo-python
 #: code:addons/account_ebics/wizards/ebics_xfer.py:0
@@ -538,8 +531,8 @@ msgstr ""
 #. odoo-python
 #: code:addons/account_ebics/wizards/ebics_xfer.py:0
 msgid ""
-"EBICS Functional Error during download of File Format %(name)s "
-"(%(order_type)s):"
+"EBICS Functional Error during download of File Format %(name)s (%"
+"(order_type)s):"
 msgstr ""
 
 #. module: account_ebics
@@ -678,8 +671,8 @@ msgstr ""
 #. odoo-python
 #: code:addons/account_ebics/wizards/ebics_xfer.py:0
 msgid ""
-"EBICS Technical Error during download of File Format %(name)s "
-"(%(order_type)s):"
+"EBICS Technical Error during download of File Format %(name)s (%"
+"(order_type)s):"
 msgstr ""
 
 #. module: account_ebics
@@ -725,8 +718,8 @@ msgstr ""
 #. odoo-python
 #: code:addons/account_ebics/wizards/ebics_xfer.py:0
 msgid ""
-"EBICS Verification Error during download of File Format %(name)s "
-"(%(order_type)s):"
+"EBICS Verification Error during download of File Format %(name)s (%"
+"(order_type)s):"
 msgstr ""
 
 #. module: account_ebics
@@ -1242,7 +1235,7 @@ msgid ""
 msgstr ""
 
 #. module: account_ebics
-#: model_terms:ir.ui.view,arch_db:account_ebics.ebics_file_view_form_download
+#: model_terms:ir.ui.view,arch_db:account_ebics.ebics_file_view_form
 msgid "Process"
 msgstr ""
 
@@ -1263,7 +1256,7 @@ msgid "Process file %(fn)s results:"
 msgstr ""
 
 #. module: account_ebics
-#: model_terms:ir.ui.view,arch_db:account_ebics.ebics_file_view_form_download
+#: model_terms:ir.ui.view,arch_db:account_ebics.ebics_file_view_form
 msgid "Process the EBICS File"
 msgstr ""
 
@@ -1298,11 +1291,6 @@ msgid ""
 "characters [A-Z0-9]."
 msgstr ""
 
-#. module: account_ebics
-#: model_terms:ir.ui.view,arch_db:account_ebics.ebics_file_view_search
-msgid "Search EBICS Files"
-msgstr ""
-
 #. module: account_ebics
 #: model:ir.model.fields,help:account_ebics.field_ebics_admin_order__format_id
 #: model:ir.model.fields,help:account_ebics.field_ebics_xfer__format_id
@@ -1374,15 +1362,13 @@ msgid "Set this flag in order to work with self-signed X.509 certificates"
 msgstr ""
 
 #. module: account_ebics
-#: model_terms:ir.ui.view,arch_db:account_ebics.ebics_file_view_form_download
-#: model_terms:ir.ui.view,arch_db:account_ebics.ebics_file_view_form_upload
+#: model_terms:ir.ui.view,arch_db:account_ebics.ebics_file_view_form
 msgid "Set to Done"
 msgstr ""
 
 #. module: account_ebics
 #: model_terms:ir.ui.view,arch_db:account_ebics.ebics_config_view_form
-#: model_terms:ir.ui.view,arch_db:account_ebics.ebics_file_view_form_download
-#: model_terms:ir.ui.view,arch_db:account_ebics.ebics_file_view_form_upload
+#: model_terms:ir.ui.view,arch_db:account_ebics.ebics_file_view_form
 #: model_terms:ir.ui.view,arch_db:account_ebics.ebics_userid_view_form
 msgid "Set to Draft"
 msgstr "Zet op concept"
@@ -1604,8 +1590,8 @@ msgid "Upload"
 msgstr "Upload"
 
 #. module: account_ebics
-#: model_terms:ir.ui.view,arch_db:account_ebics.ebics_file_view_form_upload
-#: model_terms:ir.ui.view,arch_db:account_ebics.ebics_file_view_list_upload
+#: model_terms:ir.ui.view,arch_db:account_ebics.ebics_file_view_form
+#: model_terms:ir.ui.view,arch_db:account_ebics.ebics_file_view_list
 msgid "Upload Date"
 msgstr ""
 
diff --git a/account_ebics/views/ebics_file_views.xml b/account_ebics/views/ebics_file_views.xml
index b43e442..59c1d38 100644
--- a/account_ebics/views/ebics_file_views.xml
+++ b/account_ebics/views/ebics_file_views.xml
@@ -4,7 +4,7 @@
         <field name="name">ebics.file.search</field>
         <field name="model">ebics.file</field>
         <field name="arch" type="xml">
-            <search string="Search EBICS Files">
+            <search>
                 <field name="date_from" />
                 <field name="date_to" />
                 <field name="name" />
@@ -42,17 +42,30 @@
         </field>
     </record>
 
-    <!-- Download -->
-
-    <record id="ebics_file_view_list_download" model="ir.ui.view">
+    <record id="ebics_file_view_list" model="ir.ui.view">
         <field name="name">ebics.file.list</field>
         <field name="model">ebics.file</field>
         <field name="arch" type="xml">
             <list decoration-muted="state=='draft'" create="false">
-                <field name="date" string="Download Date" />
+                <field
+                    name="date"
+                    string="Download Date"
+                    column_invisible="context.get('ebics_mode') != 'down'"
+                />
+                <field
+                    name="date"
+                    string="Upload Date"
+                    column_invisible="context.get('ebics_mode') == 'down'"
+                />
                 <field name="name" />
-                <field name="date_from" />
-                <field name="date_to" />
+                <field
+                    name="date_from"
+                    column_invisible="context.get('ebics_mode') != 'down'"
+                />
+                <field
+                    name="date_to"
+                    column_invisible="context.get('ebics_mode') != 'down'"
+                />
                 <field name="user_id" />
                 <field name="state" />
                 <field name="format_id" />
@@ -65,72 +78,94 @@
         </field>
     </record>
 
-    <record id="ebics_file_view_form_download" model="ir.ui.view">
+    <record id="ebics_file_view_form" model="ir.ui.view">
         <field name="name">ebics.file.form</field>
         <field name="model">ebics.file</field>
         <field name="priority">1</field>
         <field name="arch" type="xml">
-            <form string="EBICS File" create="false">
+            <form create="false">
                 <header>
-                    <field name="download_process_method" invisible="1" />
                     <button
                         name="set_to_draft"
-                        invisible="not download_process_method or state != 'done'"
                         string="Set to Draft"
                         type="object"
                         groups="account.group_account_manager"
+                        invisible="(context.get('ebics_mode') == 'down' and (not download_process_method or state != 'done')) or (context.get('ebics_mode') == 'up' and state != 'done')"
                     />
+
                     <button
                         name="process"
                         class="oe_highlight"
-                        invisible="not download_process_method or state != 'draft'"
                         string="Process"
                         type="object"
                         groups="account.group_account_invoice"
                         help="Process the EBICS File"
+                        invisible="(context.get('ebics_mode') == 'down' and (not download_process_method or state != 'draft')) or (context.get('ebics_mode') == 'up')"
                     />
+
                     <button
                         name="set_to_done"
-                        invisible="not download_process_method or state != 'draft'"
                         string="Set to Done"
                         type="object"
                         groups="account.group_account_manager"
+                        invisible="(context.get('ebics_mode') == 'down' and (not download_process_method or state != 'draft')) or (context.get('ebics_mode') == 'up' and state != 'draft')"
                     />
+
                     <field
                         name="state"
                         widget="statusbar"
-                        invisible="not download_process_method"
+                        invisible="context.get('ebics_mode') == 'down' and not download_process_method"
                     />
                 </header>
-                <group name="main">
-                    <group name="main-full-screen" colspan="2" col="2">
-                        <field name="name" />
-                        <field name="data" filename="name" />
-                        <field name="format_id" />
+                <sheet>
+                    <group name="main">
+                        <group name="main-full-screen" colspan="2" col="2">
+                            <field name="name" />
+                            <field name="data" filename="name" />
+                            <field name="format_id" />
+                        </group>
+                        <group name="main-left">
+                            <field
+                                name="date"
+                                string="Download Date"
+                                invisible="context.get('ebics_mode') != 'down'"
+                            />
+                            <field
+                                name="date"
+                                string="Upload Date"
+                                invisible="context.get('ebics_mode') == 'down'"
+                            />
+                            <field name="user_id" />
+                            <field name="ebics_userid_id" />
+                        </group>
+                        <group name="main-right">
+                            <field
+                                name="date_from"
+                                invisible="context.get('ebics_mode') != 'down'"
+                            />
+                            <field
+                                name="date_to"
+                                invisible="context.get('ebics_mode') != 'down'"
+                            />
+                            <field
+                                name="company_ids"
+                                widget="many2many_tags"
+                                groups="base.group_multi_company"
+                            />
+                        </group>
                     </group>
-                    <group name="main-left">
-                        <field name="date" string="Download Date" />
-                        <field name="user_id" />
-                        <field name="ebics_userid_id" />
-                    </group>
-                    <group name="main-right">
-                        <field name="date_from" />
-                        <field name="date_to" />
-                        <field
-                            name="company_ids"
-                            widget="many2many_tags"
-                            groups="base.group_multi_company"
-                        />
-                    </group>
-                </group>
-                <notebook>
-                    <page string="Additional Information">
-                        <field name="note" nolabel="1" />
-                    </page>
-                    <page string="Bank Statements" invisible="not bank_statement_ids">
-                        <field name="bank_statement_ids" nolabel="1" />
-                    </page>
-                </notebook>
+                    <notebook>
+                        <page string="Additional Information">
+                            <field name="note" nolabel="1" />
+                        </page>
+                        <page
+                            string="Bank Statements"
+                            invisible="not bank_statement_ids"
+                        >
+                            <field name="bank_statement_ids" nolabel="1" />
+                        </page>
+                    </notebook>
+                </sheet>
             </form>
         </field>
     </record>
@@ -138,7 +173,7 @@
     <record id="ebics_file_view_form_result" model="ir.ui.view">
         <field name="name">ebics.file.process.result</field>
         <field name="model">ebics.file</field>
-        <field name="priority">2</field>
+        <field name="priority">100</field>
         <field name="arch" type="xml">
             <form string="Process EBICS File">
                 <separator colspan="4" string="Results :" />
@@ -168,89 +203,8 @@
         <field name="type">ir.actions.act_window</field>
         <field name="res_model">ebics.file</field>
         <field name="view_mode">list,form</field>
-        <field name="view_id" eval="False" />
         <field name="domain">[('type', '=', 'down')]</field>
-        <field name="search_view_id" ref="ebics_file_view_search" />
-    </record>
-
-    <record id="ebics_file_action_download_list" model="ir.actions.act_window.view">
-        <field eval="1" name="sequence" />
-        <field name="view_mode">list</field>
-        <field name="view_id" ref="ebics_file_view_list_download" />
-        <field name="act_window_id" ref="ebics_file_action_download" />
-    </record>
-
-    <record id="ebics_file_action_download_form" model="ir.actions.act_window.view">
-        <field eval="2" name="sequence" />
-        <field name="view_mode">form</field>
-        <field name="view_id" ref="ebics_file_view_form_download" />
-        <field name="act_window_id" ref="ebics_file_action_download" />
-    </record>
-
-    <!-- Upload -->
-
-    <record id="ebics_file_view_list_upload" model="ir.ui.view">
-        <field name="name">ebics.file.list</field>
-        <field name="model">ebics.file</field>
-        <field name="arch" type="xml">
-            <list decoration-muted="state=='draft'" create="false">
-                <field name="date" string="Upload Date" />
-                <field name="name" />
-                <field name="user_id" />
-                <field name="state" />
-                <field name="format_id" />
-                <field
-                    name="company_ids"
-                    widget="many2many_tags"
-                    groups="base.group_multi_company"
-                />
-            </list>
-        </field>
-    </record>
-
-    <record id="ebics_file_view_form_upload" model="ir.ui.view">
-        <field name="name">ebics.file.form</field>
-        <field name="model">ebics.file</field>
-        <field name="priority">1</field>
-        <field name="arch" type="xml">
-            <form string="EBICS File" create="false">
-                <header>
-                    <button
-                        name="set_to_draft"
-                        invisible="state != 'done'"
-                        string="Set to Draft"
-                        type="object"
-                        groups="account.group_account_manager"
-                    />
-                    <button
-                        name="set_to_done"
-                        invisible="state != 'draft'"
-                        string="Set to Done"
-                        type="object"
-                        groups="account.group_account_manager"
-                    />
-                    <field name="state" widget="statusbar" />
-                </header>
-                <group colspan="4" col="4">
-                    <field name="date" string="Upload Date" />
-                    <field name="name" />
-                    <field name="data" filename="name" />
-                    <field name="format_id" />
-                    <field name="user_id" />
-                    <field name="ebics_userid_id" />
-                    <field
-                        name="company_ids"
-                        widget="many2many_tags"
-                        groups="base.group_multi_company"
-                    />
-                </group>
-                <notebook>
-                    <page string="Additional Information">
-                        <field name="note" nolabel="1" />
-                    </page>
-                </notebook>
-            </form>
-        </field>
+        <field name="context">{'ebics_mode': 'down'}</field>
     </record>
 
     <record id="ebics_file_action_upload" model="ir.actions.act_window">
@@ -258,22 +212,7 @@
         <field name="type">ir.actions.act_window</field>
         <field name="res_model">ebics.file</field>
         <field name="view_mode">list,form</field>
-        <field name="view_id" eval="False" />
         <field name="domain">[('type', '=', 'up')]</field>
-        <field name="search_view_id" ref="ebics_file_view_search" />
-    </record>
-
-    <record id="ebics_file_action_upload_list" model="ir.actions.act_window.view">
-        <field eval="1" name="sequence" />
-        <field name="view_mode">list</field>
-        <field name="view_id" ref="ebics_file_view_list_upload" />
-        <field name="act_window_id" ref="ebics_file_action_upload" />
-    </record>
-
-    <record id="ebics_file_action_upload_form" model="ir.actions.act_window.view">
-        <field eval="2" name="sequence" />
-        <field name="view_mode">form</field>
-        <field name="view_id" ref="ebics_file_view_form_upload" />
-        <field name="act_window_id" ref="ebics_file_action_upload" />
+        <field name="context">{'ebics_mode': 'up'}</field>
     </record>
 </odoo>