diff --git a/sign_oca/__manifest__.py b/sign_oca/__manifest__.py
index ba0e188a..1b4a58b5 100644
--- a/sign_oca/__manifest__.py
+++ b/sign_oca/__manifest__.py
@@ -5,7 +5,7 @@
     "name": "Sign Oca",
     "summary": """
         Allow to sign documents inside Odoo CE""",
-    "version": "16.0.4.0.0",
+    "version": "17.0.1.0.0",
     "license": "AGPL-3",
     "author": "Dixmit,Odoo Community Association (OCA)",
     "website": "https://github.com/OCA/sign",
@@ -63,7 +63,6 @@
             "sign_oca/static/src/components/sign_oca_pdf_portal/sign_oca_pdf_portal.esm.js",
             "sign_oca/static/src/components/sign_oca_pdf_portal/sign_oca_pdf_portal.xml",
             "sign_oca/static/src/scss/portal.scss",
-            "sign_oca/static/src/js/*.js",
             "sign_oca/static/src/xml/*.xml",
         ],
         "sign_oca.sign_assets": [
diff --git a/sign_oca/migrations/16.0.1.1.1/pre-migration.py b/sign_oca/migrations/16.0.1.1.1/pre-migration.py
deleted file mode 100644
index bcb86c05..00000000
--- a/sign_oca/migrations/16.0.1.1.1/pre-migration.py
+++ /dev/null
@@ -1,25 +0,0 @@
-# Copyright 2024 ForgeFlow S.L.  <https://www.forgeflow.com>
-# License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl.html).
-
-from openupgradelib import openupgrade
-
-
-@openupgrade.migrate()
-def migrate(env, version):
-    old_column_name = "partner_type"
-    new_column_name = "partner_selection_policy"
-
-    if not openupgrade.column_exists(
-        env.cr, "sign_oca_role", new_column_name
-    ) and openupgrade.column_exists(env.cr, "sign_oca_role", old_column_name):
-        openupgrade.rename_columns(
-            env.cr,
-            {
-                "sign_oca_role": [
-                    (
-                        old_column_name,
-                        new_column_name,
-                    ),
-                ]
-            },
-        )
diff --git a/sign_oca/models/sign_oca_request.py b/sign_oca/models/sign_oca_request.py
index 9d33e61d..8cf714a6 100644
--- a/sign_oca/models/sign_oca_request.py
+++ b/sign_oca/models/sign_oca_request.py
@@ -27,16 +27,12 @@ class SignOcaRequest(models.Model):
 
     name = fields.Char(required=True)
     active = fields.Boolean(default=True)
-    template_id = fields.Many2one("sign.oca.template", readonly=True)
-    data = fields.Binary(
-        required=True, readonly=True, states={"draft": [("readonly", False)]}
-    )
+    template_id = fields.Many2one("sign.oca.template")
+    data = fields.Binary(required=True)
     filename = fields.Char()
     user_id = fields.Many2one(
         comodel_name="res.users",
         string="Responsible",
-        readonly=True,
-        states={"draft": [("readonly", False)]},
         default=lambda self: self.env.user,
         required=True,
     )
@@ -48,8 +44,6 @@ class SignOcaRequest(models.Model):
             .search([("transient", "=", False), ("model", "not like", "sign.oca")])
         ],
         string="Object",
-        readonly=True,
-        states={"draft": [("readonly", False)]},
     )
     signed = fields.Boolean(copy=False)
     signer_ids = fields.One2many(
@@ -75,7 +69,6 @@ class SignOcaRequest(models.Model):
             ("cancel", "Cancelled"),
         ],
         default="draft",
-        readonly=True,
         required=True,
         copy=False,
         tracking=True,
@@ -85,16 +78,13 @@ class SignOcaRequest(models.Model):
     to_sign = fields.Boolean(compute="_compute_to_sign")
     signatory_data = fields.Serialized(
         default=lambda r: {},
-        readonly=True,
         copy=False,
     )
-    current_hash = fields.Char(readonly=True, copy=False)
+    current_hash = fields.Char(copy=False)
     company_id = fields.Many2one(
         "res.company",
         default=lambda r: r.env.company.id,
         required=True,
-        readonly=True,
-        states={"draft": [("readonly", False)]},
     )
     next_item_id = fields.Integer(compute="_compute_next_item_id")
     ask_location = fields.Boolean()
@@ -351,8 +341,8 @@ class SignOcaRequestSigner(models.Model):
     partner_name = fields.Char(related="partner_id.name")
     partner_id = fields.Many2one("res.partner", required=True, ondelete="restrict")
     role_id = fields.Many2one("sign.oca.role", required=True, ondelete="restrict")
-    signed_on = fields.Datetime(readonly=True)
-    signature_hash = fields.Char(readonly=True)
+    signed_on = fields.Datetime()
+    signature_hash = fields.Char()
     model = fields.Char(compute="_compute_model", store=True)
     res_id = fields.Integer(compute="_compute_res_id", store=True)
     is_allow_signature = fields.Boolean(compute="_compute_is_allow_signature")
@@ -584,9 +574,9 @@ def _set_action_log(self, action, **kwargs):
         self.ensure_one()
         return self.request_id._set_action_log(action, signer_id=self.id, **kwargs)
 
-    def name_get(self):
-        result = [(signer.id, (signer.partner_id.display_name)) for signer in self]
-        return result
+    def _compute_display_name(self):
+        for signer in self:
+            signer.display_name = signer.partner_id.display_name
 
     def _get_sequence(self):
         return self.env.ref("sign_oca.sign_inalterability_sequence")
@@ -663,13 +653,10 @@ class SignRequestLog(models.Model):
     uid = fields.Many2one(
         "res.users",
         required=True,
-        readonly=True,
         ondelete="cascade",
         default=lambda r: r.env.user.id,
     )
-    date = fields.Datetime(
-        required=True, readonly=True, default=lambda r: fields.Datetime.now()
-    )
+    date = fields.Datetime(required=True, default=lambda r: fields.Datetime.now())
     partner_id = fields.Many2one(
         "res.partner", required=True, default=lambda r: r.env.user.partner_id.id
     )
@@ -688,7 +675,6 @@ class SignRequestLog(models.Model):
             ("configure", "Configure"),
         ],
         required=True,
-        readonly=True,
     )
-    access_token = fields.Char(readonly=True)
-    ip = fields.Char(readonly=True)
+    access_token = fields.Char()
+    ip = fields.Char()
diff --git a/sign_oca/static/src/components/sign_oca_configure/sign_oca_configure.esm.js b/sign_oca/static/src/components/sign_oca_configure/sign_oca_configure.esm.js
index 5178eb92..ace400de 100644
--- a/sign_oca/static/src/components/sign_oca_configure/sign_oca_configure.esm.js
+++ b/sign_oca/static/src/components/sign_oca_configure/sign_oca_configure.esm.js
@@ -1,12 +1,14 @@
-/** @odoo-module **/
+/** @odoo-module QWeb **/
 
-import {ComponentWrapper} from "web.OwlCompatibility";
-import AbstractAction from "web.AbstractAction";
-import Dialog from "web.Dialog";
-import core from "web.core";
-import ControlPanel from "web.ControlPanel";
+import {Component} from "@odoo/owl";
+import {ControlPanel} from "@web/search/control_panel/control_panel";
+import {Dialog} from "@web/core/dialog/dialog";
+import {FormRenderer} from "@web/views/form/form_renderer";
 import SignOcaPdfCommon from "../sign_oca_pdf_common/sign_oca_pdf_common.esm.js";
-const _t = core._t;
+import {_t} from "@web/core/l10n/translation";
+import {registry} from "@web/core/registry";
+import {renderToString} from "@web/core/utils/render";
+
 export class SignOcaConfigureControlPanel extends ControlPanel {}
 SignOcaConfigureControlPanel.template = "sign_oca.SignOcaConfigureControlPanel";
 export class SignOcaConfigure extends SignOcaPdfCommon {
@@ -35,7 +37,7 @@ export class SignOcaConfigure extends SignOcaPdfCommon {
                     }
                     var position = page.getBoundingClientRect();
                     this.contextMenu = $(
-                        core.qweb.render("sign_oca.sign_iframe_contextmenu", {
+                        renderToString("sign_oca.sign_iframe_contextmenu", {
                             page,
                             e,
                             left: ((e.pageX - position.x) * 100) / position.width + "%",
@@ -111,7 +113,7 @@ export class SignOcaConfigure extends SignOcaPdfCommon {
                 var dialog = new Dialog(this, {
                     title: _t("Edit field"),
                     $content: $(
-                        core.qweb.render("sign_oca.sign_oca_field_edition", {
+                        renderToString("sign_oca.sign_oca_field_edition", {
                             item,
                             info: this.info,
                         })
@@ -367,9 +369,8 @@ export class SignOcaConfigure extends SignOcaPdfCommon {
     }
 }
 
-export const SignOcaConfigureAction = AbstractAction.extend({
-    hasControlPanel: true,
-    init: function (parent, action) {
+export class SignOcaConfigureAction extends Component {
+    init(parent, action) {
         this._super.apply(this, arguments);
         this.model =
             (action.params.res_model !== undefined && action.params.res_model) ||
@@ -377,24 +378,24 @@ export const SignOcaConfigureAction = AbstractAction.extend({
         this.res_id =
             (action.params.res_id !== undefined && action.params.res_id) ||
             action.context.params.id;
-    },
+    }
     async start() {
         await this._super(...arguments);
-        this.component = new ComponentWrapper(this, SignOcaConfigure, {
+        this.component = new FormRenderer(this, SignOcaConfigure, {
             model: this.model,
             res_id: this.res_id,
         });
         this.$el.addClass("o_sign_oca_action");
         return this.component.mount(this.$(".o_content")[0]);
-    },
-    getState: function () {
+    }
+    getState() {
         var result = this._super(...arguments);
         result = _.extend({}, result, {
             res_model: this.model,
             res_id: this.res_id,
         });
         return result;
-    },
-});
-core.action_registry.add("sign_oca_configure", SignOcaConfigureAction);
+    }
+}
 SignOcaConfigure.template = "sign_oca.SignOcaConfigure";
+registry.category("actions").add("sign_oca_configure", SignOcaConfigureAction);
diff --git a/sign_oca/static/src/components/sign_oca_configure/sign_oca_configure.xml b/sign_oca/static/src/components/sign_oca_configure/sign_oca_configure.xml
index 01801d67..15bf4b1c 100644
--- a/sign_oca/static/src/components/sign_oca_configure/sign_oca_configure.xml
+++ b/sign_oca/static/src/components/sign_oca_configure/sign_oca_configure.xml
@@ -107,7 +107,6 @@
         t-name="sign_oca.SignOcaConfigure"
         t-inherit="sign_oca.SignOcaPdfCommon"
         t-inherit-mode="primary"
-        owl="1"
     >
         <xpath expr="//iframe" position="before">
             <div
diff --git a/sign_oca/static/src/components/sign_oca_pdf/sign_oca_pdf.esm.js b/sign_oca/static/src/components/sign_oca_pdf/sign_oca_pdf.esm.js
index 40202d52..d15a14a4 100644
--- a/sign_oca/static/src/components/sign_oca_pdf/sign_oca_pdf.esm.js
+++ b/sign_oca/static/src/components/sign_oca_pdf/sign_oca_pdf.esm.js
@@ -1,9 +1,10 @@
-/** @odoo-module **/
+/** @odoo-module Qweb **/
 
 import SignOcaPdfCommon from "../sign_oca_pdf_common/sign_oca_pdf_common.esm.js";
-import core from "web.core";
 import {registry} from "@web/core/registry";
 const SignRegistry = registry.category("sign_oca");
+import {renderToString} from "@web/core/utils/render";
+
 export default class SignOcaPdf extends SignOcaPdfCommon {
     setup() {
         super.setup(...arguments);
@@ -23,7 +24,7 @@ export default class SignOcaPdf extends SignOcaPdfCommon {
     }
     renderButtons(to_sign) {
         var $buttons = $(
-            core.qweb.render("oca_sign_oca.SignatureButtons", {
+            renderToString("oca_sign_oca.SignatureButtons", {
                 to_sign: to_sign,
             })
         );
diff --git a/sign_oca/static/src/components/sign_oca_pdf/sign_oca_pdf_action.esm.js b/sign_oca/static/src/components/sign_oca_pdf/sign_oca_pdf_action.esm.js
index eac7195d..8dc83b1c 100644
--- a/sign_oca/static/src/components/sign_oca_pdf/sign_oca_pdf_action.esm.js
+++ b/sign_oca/static/src/components/sign_oca_pdf/sign_oca_pdf_action.esm.js
@@ -1,14 +1,12 @@
 /** @odoo-module **/
 
-import AbstractAction from "web.AbstractAction";
-import {ComponentWrapper} from "web.OwlCompatibility";
+import {Component} from "@odoo/owl";
+import {FormRenderer} from "@web/views/form/form_renderer";
 import SignOcaPdf from "./sign_oca_pdf.esm.js";
-import core from "web.core";
+import {registry} from "@web/core/registry";
 
-const SignOcaPdfAction = AbstractAction.extend({
-    className: "o_sign_oca_content",
-    hasControlPanel: true,
-    init: function (parent, action) {
+export class SignOcaPdfAction extends Component {
+    init(parent, action) {
         this._super.apply(this, arguments);
         this.model =
             (action.params.res_model !== undefined && action.params.res_model) ||
@@ -16,25 +14,24 @@ const SignOcaPdfAction = AbstractAction.extend({
         this.res_id =
             (action.params.res_id !== undefined && action.params.res_id) ||
             action.context.params.id;
-    },
+    }
     async start() {
         await this._super(...arguments);
-        this.component = new ComponentWrapper(this, SignOcaPdf, {
+        this.component = new FormRenderer(this, SignOcaPdf, {
             model: this.model,
             res_id: this.res_id,
             updateControlPanel: this.updateControlPanel.bind(this),
             trigger: this.trigger_up.bind(this),
         });
         return this.component.mount(this.$(".o_content")[0]);
-    },
-    getState: function () {
+    }
+    getState() {
         var result = this._super(...arguments);
         result = _.extend({}, result, {
             res_model: this.model,
             res_id: this.res_id,
         });
         return result;
-    },
-});
-core.action_registry.add("sign_oca", SignOcaPdfAction);
-export default SignOcaPdfAction;
+    }
+}
+registry.category("actions").add("sign_oca", SignOcaPdfAction);
diff --git a/sign_oca/static/src/components/sign_oca_pdf_common/sign_oca_pdf_common.esm.js b/sign_oca/static/src/components/sign_oca_pdf_common/sign_oca_pdf_common.esm.js
index b0099e71..1adf6bc1 100644
--- a/sign_oca/static/src/components/sign_oca_pdf_common/sign_oca_pdf_common.esm.js
+++ b/sign_oca/static/src/components/sign_oca_pdf_common/sign_oca_pdf_common.esm.js
@@ -1,8 +1,9 @@
-/** @odoo-module **/
-const {Component, onMounted, onWillStart, onWillUnmount, useRef} = owl;
-import Dialog from "web.Dialog";
-import core from "web.core";
-const _t = core._t;
+/** @odoo-module QWeb **/
+import {Component, onMounted, onWillStart, onWillUnmount, useRef} from "@odoo/owl";
+import {Dialog} from "@web/core/dialog/dialog";
+import {_t} from "@web/core/l10n/translation";
+import {renderToString} from "@web/core/utils/render";
+
 export default class SignOcaPdfCommon extends Component {
     setup() {
         super.setup(...arguments);
@@ -11,8 +12,8 @@ export default class SignOcaPdfCommon extends Component {
         this.pdf_url = this.getPdfUrl();
         this.viewer_url = "/web/static/lib/pdfjs/web/viewer.html?file=" + this.pdf_url;
         this.iframe = useRef("sign_oca_iframe");
-        var iframeResolve = undefined;
-        var iframeReject = undefined;
+        var iframeResolve = "";
+        var iframeReject = "";
         this.iframeLoaded = new Promise(function (resolve, reject) {
             iframeResolve = resolve;
             iframeReject = reject;
@@ -112,7 +113,7 @@ export default class SignOcaPdfCommon extends Component {
                 item.page - 1
             ];
         var signatureItem = $(
-            core.qweb.render(this.field_template, {
+            renderToString(this.field_template, {
                 ...item,
             })
         );
diff --git a/sign_oca/static/src/components/sign_oca_pdf_common/sign_oca_pdf_common.xml b/sign_oca/static/src/components/sign_oca_pdf_common/sign_oca_pdf_common.xml
index 2a313a14..5a9b0638 100644
--- a/sign_oca/static/src/components/sign_oca_pdf_common/sign_oca_pdf_common.xml
+++ b/sign_oca/static/src/components/sign_oca_pdf_common/sign_oca_pdf_common.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <templates xml:space="preserve">
-    <t t-name="sign_oca.SignOcaPdfCommon" owl="1">
+    <t t-name="sign_oca.SignOcaPdfCommon">
         <div class="o_sign_oca_content">
             <iframe
                 class="o_sign_oca_iframe"
diff --git a/sign_oca/static/src/components/sign_oca_pdf_common/sign_oca_pdf_common_action.esm.js b/sign_oca/static/src/components/sign_oca_pdf_common/sign_oca_pdf_common_action.esm.js
index 99de1302..91166329 100644
--- a/sign_oca/static/src/components/sign_oca_pdf_common/sign_oca_pdf_common_action.esm.js
+++ b/sign_oca/static/src/components/sign_oca_pdf_common/sign_oca_pdf_common_action.esm.js
@@ -1,13 +1,12 @@
 /** @odoo-module **/
 
-import AbstractAction from "web.AbstractAction";
-import {ComponentWrapper} from "web.OwlCompatibility";
+import {Component} from "@odoo/owl";
+import {FormRenderer} from "@web/views/form/form_renderer";
 import SignOcaPdfCommon from "./sign_oca_pdf_common.esm.js";
-import core from "web.core";
+import {registry} from "@web/core/registry";
 
-export const SignOcaPdfCommonAction = AbstractAction.extend({
-    hasControlPanel: true,
-    init: function (parent, action) {
+export class SignOcaPdfCommonAction extends Component {
+    init(parent, action) {
         this._super.apply(this, arguments);
         this.model =
             (action.params.res_model !== undefined && action.params.res_model) ||
@@ -15,23 +14,23 @@ export const SignOcaPdfCommonAction = AbstractAction.extend({
         this.res_id =
             (action.params.res_id !== undefined && action.params.res_id) ||
             action.context.params.id;
-    },
+    }
     async start() {
         await this._super(...arguments);
-        this.component = new ComponentWrapper(this, SignOcaPdfCommon, {
+        this.component = new FormRenderer(this, SignOcaPdfCommon, {
             model: this.model,
             res_id: this.res_id,
         });
         this.$el.addClass("o_sign_oca_action");
         return this.component.mount(this.$(".o_content")[0]);
-    },
-    getState: function () {
+    }
+    getState() {
         var result = this._super(...arguments);
         result = _.extend({}, result, {
             res_model: this.model,
             res_id: this.res_id,
         });
         return result;
-    },
-});
-core.action_registry.add("sign_oca_preview", SignOcaPdfCommonAction);
+    }
+}
+registry.category("actions").add("sign_oca_preview", SignOcaPdfCommonAction);
diff --git a/sign_oca/static/src/components/sign_oca_pdf_portal/sign_oca_pdf_portal.esm.js b/sign_oca/static/src/components/sign_oca_pdf_portal/sign_oca_pdf_portal.esm.js
index 067cca2e..a663cd3e 100644
--- a/sign_oca/static/src/components/sign_oca_pdf_portal/sign_oca_pdf_portal.esm.js
+++ b/sign_oca/static/src/components/sign_oca_pdf_portal/sign_oca_pdf_portal.esm.js
@@ -1,13 +1,12 @@
 /** @odoo-module **/
 
 const {App, mount, useRef} = owl;
-
 import SignOcaPdf from "../sign_oca_pdf/sign_oca_pdf.esm.js";
-
-import env from "web.public_env";
+import {makeEnv} from "@web/env";
 import {renderToString} from "@web/core/utils/render";
-import session from "web.session";
+import {session} from "@web/session";
 import {templates} from "@web/core/assets";
+
 export class SignOcaPdfPortal extends SignOcaPdf {
     setup() {
         super.setup(...arguments);
@@ -79,6 +78,7 @@ export function initDocumentToSign(properties) {
         ]).then(async function () {
             var app = new App(null, {templates, test: true});
             renderToString.app = app;
+            const env = makeEnv();
             mount(SignOcaPdfPortal, document.body, {
                 env,
                 props: properties,
diff --git a/sign_oca/static/src/components/sign_oca_pdf_portal/sign_oca_pdf_portal.xml b/sign_oca/static/src/components/sign_oca_pdf_portal/sign_oca_pdf_portal.xml
index 3d2c8169..beec942f 100644
--- a/sign_oca/static/src/components/sign_oca_pdf_portal/sign_oca_pdf_portal.xml
+++ b/sign_oca/static/src/components/sign_oca_pdf_portal/sign_oca_pdf_portal.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <templates xml:space="preserve">
-    <div t-name="sign_oca.SignOcaPdfPortal" owl="1" class="o_sign_oca_content">
+    <div t-name="sign_oca.SignOcaPdfPortal" class="o_sign_oca_content">
         <header>
             <div class="container-fluid">
                 <div class="d-flex justify-content-between flex-fill">
diff --git a/sign_oca/static/src/elements/check.esm.js b/sign_oca/static/src/elements/check.esm.js
index 839b4292..bb17b8a6 100644
--- a/sign_oca/static/src/elements/check.esm.js
+++ b/sign_oca/static/src/elements/check.esm.js
@@ -1,7 +1,8 @@
-/** @odoo-module **/
+/** @odoo-module Qweb **/
 
-import core from "web.core";
 import {registry} from "@web/core/registry";
+import {renderToString} from "@web/core/utils/render";
+
 const checkSignOca = {
     change: function (value, parent, item) {
         item.value = value;
@@ -9,7 +10,7 @@ const checkSignOca = {
     },
     generate: function (parent, item, signatureItem) {
         var input = $(
-            core.qweb.render("sign_oca.sign_iframe_field_check", {
+            renderToString("sign_oca.sign_iframe_field_check", {
                 item: item,
                 role_id: parent.info.role_id,
             })
diff --git a/sign_oca/static/src/elements/signature.esm.js b/sign_oca/static/src/elements/signature.esm.js
index 2a805205..7e0777eb 100644
--- a/sign_oca/static/src/elements/signature.esm.js
+++ b/sign_oca/static/src/elements/signature.esm.js
@@ -1,8 +1,8 @@
-/** @odoo-module **/
+/** @odoo-module Qweb **/
 
 import {SignatureDialog} from "@web/core/signature/signature_dialog";
-import core from "web.core";
 import {registry} from "@web/core/registry";
+import {renderToString} from "@web/core/utils/render";
 
 const signatureSignOca = {
     uploadSignature: function (parent, item, signatureItem, data) {
@@ -19,7 +19,7 @@ const signatureSignOca = {
     },
     generate: function (parent, item, signatureItem) {
         var input = $(
-            core.qweb.render("sign_oca.sign_iframe_field_signature", {item: item})
+            renderToString("sign_oca.sign_iframe_field_signature", {item: item})
         )[0];
         if (item.role_id === parent.info.role_id) {
             signatureItem[0].addEventListener("focus_signature", () => {
diff --git a/sign_oca/static/src/elements/text.esm.js b/sign_oca/static/src/elements/text.esm.js
index 610045a6..cec7a361 100644
--- a/sign_oca/static/src/elements/text.esm.js
+++ b/sign_oca/static/src/elements/text.esm.js
@@ -1,7 +1,8 @@
-/** @odoo-module **/
+/** @odoo-module QWeb **/
 
-import core from "web.core";
 import {registry} from "@web/core/registry";
+import {renderToString} from "@web/core/utils/render";
+
 const textSignOca = {
     change: function (value, parent, item) {
         item.value = value;
@@ -9,7 +10,7 @@ const textSignOca = {
     },
     generate: function (parent, item, signatureItem) {
         var input = $(
-            core.qweb.render("sign_oca.sign_iframe_field_text", {
+            renderToString("sign_oca.sign_iframe_field_text", {
                 item: item,
                 role_id: parent.info.role_id,
             })
diff --git a/sign_oca/static/src/js/ir_model.esm.js b/sign_oca/static/src/js/ir_model.esm.js
index 12d5f2ea..6c47804f 100644
--- a/sign_oca/static/src/js/ir_model.esm.js
+++ b/sign_oca/static/src/js/ir_model.esm.js
@@ -1,30 +1,21 @@
-/** @odoo-module **/
+/** @odoo-module */
 
-import {attr, one} from "@mail/model/model_field";
-import {registerModel} from "@mail/model/model_core";
+import {Component} from "@odoo/owl";
+import {registry} from "@web/core/registry";
+import {standardWidgetProps} from "@web/views/widgets/standard_widget_props";
 
-registerModel({
-    name: "ir.model.request",
-    fields: {
-        /**
-         * Determines the name of the views that are available for this model.
-         */
-        availableWebViews: attr({
-            compute() {
-                return ["kanban", "list", "form", "activity"];
-            },
-        }),
-        requestGroup: one("RequestGroup", {
-            inverse: "irModel",
-        }),
-        iconUrl: attr(),
-        id: attr({
-            identifying: true,
-        }),
-        model: attr({
-            default: "sign.oca.request",
-            required: true,
-        }),
-        name: attr(),
-    },
-});
+
+export class IRModelRequest extends Component {
+    setup() {
+        super.setup();
+    }
+}
+IRModelRequest.props = {
+    ...standardWidgetProps,
+};
+IRModelRequest.template = "sign_oca.IrModelRequest";
+
+export const irModelRequest = {
+    component: IRModelRequest,
+};
+registry.category("view_widgets").add("sign_oca_ir_model_request", irModelRequest);
diff --git a/sign_oca/static/src/js/main.esm.js b/sign_oca/static/src/js/main.esm.js
deleted file mode 100644
index d0e23df3..00000000
--- a/sign_oca/static/src/js/main.esm.js
+++ /dev/null
@@ -1,7 +0,0 @@
-/** @odoo-module **/
-
-import {registry} from "@web/core/registry";
-import {systrayService} from "@sign_oca/js/systray_service.esm";
-
-const serviceRegistry = registry.category("services");
-serviceRegistry.add("request_systray_service", systrayService);
diff --git a/sign_oca/static/src/js/request_group_view.esm.js b/sign_oca/static/src/js/request_group_view.esm.js
index cf6aebb2..1f9b357d 100644
--- a/sign_oca/static/src/js/request_group_view.esm.js
+++ b/sign_oca/static/src/js/request_group_view.esm.js
@@ -1,53 +1,48 @@
-/** @odoo-module **/
+/* @odoo-module */
 
-import {one} from "@mail/model/model_field";
-import {registerModel} from "@mail/model/model_core";
-import {session} from "@web/session";
+import {Component, onWillUpdateProps, useEffect, useRef, useState} from "@odoo/owl";
 
-registerModel({
-    name: "RequestGroupView",
-    recordMethods: {
-        /**
-         * @param {MouseEvent} ev
-         */
-        onClickFilterButton(ev) {
-            this.requestMenuViewOwner.update({isOpen: false});
-            // Fetch the data from the button otherwise fetch the ones from the parent (.o_ActivityMenuView_activityGroup).
-            const data = _.extend({}, $(ev.currentTarget).data(), $(ev.target).data());
-            const context = {};
-            console.log(data);
 
-            this.env.services.action.doAction(
-                {
-                    context,
-                    name: data.model_name,
-                    res_model: "sign.oca.request.signer",
-                    search_view_id: [false],
-                    type: "ir.actions.act_window",
-                    domain: [
-                        ["request_id.state", "=", "sent"],
-                        ["partner_id", "child_of", [session.partner_id]],
-                        ["signed_on", "=", false],
-                    ],
-                    views: [
-                        [false, "list"],
-                        [false, "form"],
-                    ],
-                },
-                {
-                    clearBreadcrumbs: true,
-                }
-            );
-        },
-    },
-    fields: {
-        requestGroup: one("RequestGroup", {
-            identifying: true,
-            inverse: "requestGroupViews",
-        }),
-        requestMenuViewOwner: one("SignerMenuView", {
-            identifying: true,
-            inverse: "requestGroupViews",
-        }),
-    },
-});
+/**
+ * @typedef {Object} Props
+ * @property {number} threadId
+ * @property {string} threadModel
+ * @extends {Component<Props, Env>}
+ */
+export class RequestGroupView extends Component {
+    static template = "sign_oca.RequestGroupView";
+    static components = {};
+    static props = [];
+
+    setup() {}
+
+    onClickFilterButton(ev) {
+        this.requestMenuViewOwner.update({isOpen: false});
+        // Fetch the data from the button otherwise fetch the ones from the parent (.o_ActivityMenuView_activityGroup).
+        const data = _.extend({}, $(ev.currentTarget).data(), $(ev.target).data());
+        const context = {};
+        console.log(data);
+
+        this.env.services.action.doAction(
+            {
+                context,
+                name: data.model_name,
+                res_model: "sign.oca.request.signer",
+                search_view_id: [false],
+                type: "ir.actions.act_window",
+                domain: [
+                    ["request_id.state", "=", "sent"],
+                    ["partner_id", "child_of", [session.partner_id]],
+                    ["signed_on", "=", false],
+                ],
+                views: [
+                    [false, "list"],
+                    [false, "form"],
+                ],
+            },
+            {
+                clearBreadcrumbs: true,
+            }
+        );
+    }
+}
diff --git a/sign_oca/static/src/js/request_groups.esm.js b/sign_oca/static/src/js/request_groups.esm.js
index e68ec6d5..a59cf415 100644
--- a/sign_oca/static/src/js/request_groups.esm.js
+++ b/sign_oca/static/src/js/request_groups.esm.js
@@ -1,52 +1,30 @@
-/** @odoo-module **/
+/* @odoo-module */
 
-import {attr, many, one} from "@mail/model/model_field";
-import {registerModel} from "@mail/model/model_core";
+import {Record} from "@mail/core/common/record";
 
-registerModel({
-    name: "RequestGroup",
-    modelMethods: {
-        convertData(data) {
-            return {
-                domain: data.domain,
-                irModel: {
-                    iconUrl: data.icon,
-                    id: data.id,
-                    model: data.model,
-                    name: data.name,
-                },
-                pending_count: data.total_records,
-            };
-        },
-    },
-    recordMethods: {
-        /**
-         * @private
-         */
-        _onChangePendingCount() {
-            if (this.pending_count === 0) {
-                this.delete();
-            }
-        },
-    },
-    fields: {
-        requestGroupViews: many("RequestGroupView", {
-            inverse: "requestGroup",
-        }),
-        domain: attr(),
-        irModel: one("ir.model.request", {
-            identifying: true,
-            inverse: "requestGroup",
-        }),
-        pending_count: attr({
-            default: 0,
-        }),
-        type: attr(),
-    },
-    onChanges: [
-        {
-            dependencies: ["pending_count", "type"],
-            methodName: "_onChangePendingCount",
-        },
-    ],
-});
+export class RequestGroup extends Record {
+    static pending_count = 0;
+    /** @returns {import("models").RequestGroup} */
+    static get(data) {
+        return super.get(data);
+    }
+    /** @returns {import("models").RequestGroup|import("models").RequestGroup[]} */
+    static insert(data) {
+        return super.insert(...arguments);
+    }
+
+    /** @type {number} */
+    domain;
+    /** @type {string} */
+    type;
+    /** @type {number} */
+    pending_count;
+
+    _onChangePendingCount() {
+        if (this.pending_count === 0) {
+            this.delete();
+        }
+    }
+}
+
+RequestGroup.register();
diff --git a/sign_oca/static/src/js/sign_oca.esm.js b/sign_oca/static/src/js/sign_oca.esm.js
index 3498ccd6..59eeabe6 100644
--- a/sign_oca/static/src/js/sign_oca.esm.js
+++ b/sign_oca/static/src/js/sign_oca.esm.js
@@ -1,12 +1,11 @@
 /** @odoo-module */
 
-import {patch} from "@web/core/utils/patch";
-import {_t} from "web.core";
-import {useService} from "@web/core/utils/hooks";
-import {ListController} from "@web/views/list/list_controller";
 import {FormController} from "@web/views/form/form_controller";
-
+import {ListController} from "@web/views/list/list_controller";
+import {_t} from "@web/core/l10n/translation";
+import {patch} from "@web/core/utils/patch";
 const {onWillStart} = owl;
+import {useService} from "@web/core/utils/hooks";
 
 export const patchControllerSignOca = {
     setup() {
@@ -36,9 +35,8 @@ export const patchControllerSignOca = {
     },
 
     async _actionSignOcaTemplateGenerateMulti() {
-        var resIds = undefined;
-        if (this.getSelectedResIds !== undefined)
-            resIds = await this.getSelectedResIds();
+        var resIds = "";
+        if (this.getSelectedResIds) resIds = await this.getSelectedResIds();
         else resIds = this.model.root.data.id;
         this.action.doAction("sign_oca.sign_oca_template_generate_multi_act_window", {
             additionalContext: {
@@ -67,5 +65,5 @@ export const patchControllerSignOca = {
     },
 };
 
-patch(ListController.prototype, "web.ListController", patchControllerSignOca);
-patch(FormController.prototype, "web.ListController", patchControllerSignOca);
+patch(ListController.prototype, patchControllerSignOca);
+patch(FormController.prototype, patchControllerSignOca);
diff --git a/sign_oca/static/src/js/signer_menu_container.esm.js b/sign_oca/static/src/js/signer_menu_container.esm.js
index ed701f08..9aa8f207 100644
--- a/sign_oca/static/src/js/signer_menu_container.esm.js
+++ b/sign_oca/static/src/js/signer_menu_container.esm.js
@@ -1,7 +1,6 @@
 /** @odoo-module **/
 
-// ensure components are registered beforehand.
-import {getMessagingComponent} from "@mail/utils/messaging_component";
+import {registry} from "@web/core/registry";
 /* eslint-disable */
 import SignerMenuView from "./signer_menu_view.esm";
 /* eslint-enable */
@@ -22,7 +21,8 @@ export class SignerMenuContainer extends Component {
     }
 }
 
-Object.assign(SignerMenuContainer, {
-    components: {SignerMenuView: getMessagingComponent("SignerMenuView")},
-    template: "sign_oca.SignerMenuContainer",
+SignerMenuContainer.template = "sign_oca.SignerMenuContainer";
+registry.category("menu").add("SignerMenuContainer", {
+    Component: SignerMenuView,
+    props: {record: Object},
 });
diff --git a/sign_oca/static/src/js/signer_menu_view.esm.js b/sign_oca/static/src/js/signer_menu_view.esm.js
index 2009b5d5..e7b96548 100644
--- a/sign_oca/static/src/js/signer_menu_view.esm.js
+++ b/sign_oca/static/src/js/signer_menu_view.esm.js
@@ -1,8 +1,6 @@
 /** @odoo-module **/
 
-import {registerMessagingComponent} from "@mail/utils/messaging_component";
-import {useComponentToModel} from "@mail/component_hooks/use_component_to_model";
-
+import {registry} from "@web/core/registry";
 const {Component} = owl;
 
 export class SignerMenuView extends Component {
@@ -11,7 +9,6 @@ export class SignerMenuView extends Component {
      */
     setup() {
         super.setup();
-        useComponentToModel({fieldName: "component"});
     }
     /**
      * @returns {SignerMenuView}
@@ -21,9 +18,8 @@ export class SignerMenuView extends Component {
     }
 }
 
-Object.assign(SignerMenuView, {
+SignerMenuView.template = "sign_oca.SignerMenuView";
+registry.category("menu").add("SignerMenuView", {
+    Component: SignerMenuView,
     props: {record: Object},
-    template: "sign_oca.SignerMenuView",
 });
-
-registerMessagingComponent(SignerMenuView);
diff --git a/sign_oca/static/src/js/systray.esm.js b/sign_oca/static/src/js/systray.esm.js
index f2c7ba90..4d334d20 100644
--- a/sign_oca/static/src/js/systray.esm.js
+++ b/sign_oca/static/src/js/systray.esm.js
@@ -2,8 +2,7 @@
 
 import {attr, many} from "@mail/model/model_field";
 import {registerModel} from "@mail/model/model_core";
-
-import session from "web.session";
+import {session} from "@web/session";
 
 registerModel({
     name: "SignerMenuView",
diff --git a/sign_oca/static/src/js/systray.js b/sign_oca/static/src/js/systray.js
new file mode 100644
index 00000000..752593f3
--- /dev/null
+++ b/sign_oca/static/src/js/systray.js
@@ -0,0 +1,70 @@
+/* @odoo-module */
+
+import {Component, onWillUpdateProps, useEffect, useRef, useState} from "@odoo/owl";
+
+import {useService} from "@web/core/utils/hooks";
+import {hidePDFJSButtons} from "@web/libs/pdfjs";
+
+/**
+ * @typedef {Object} Props
+ * @property {number} threadId
+ * @property {string} threadModel
+ * @extends {Component<Props, Env>}
+ */
+export class AttachmentView extends Component {
+    static template = "mail.AttachmentView";
+    static components = {};
+    static props = [];
+
+    setup() {
+    }
+
+    close() {
+        this.update({isOpen: false});
+    }
+    async fetchData() {
+        const data = await this.messaging.rpc({
+            model: "res.users",
+            method: "sign_oca_request_user_count",
+            args: [],
+            kwargs: {context: session.user_context},
+        });
+
+        this.update({
+            requestGroups: data.map((vals) =>
+                this.messaging.models.RequestGroup.convertData(vals)
+            ),
+            extraCount: 0,
+        });
+    }
+    /**
+     * @param {MouseEvent} ev
+     */
+    onClickDropdownToggle(ev) {
+        ev.preventDefault();
+        if (this.isOpen) {
+            this.update({isOpen: false});
+        } else {
+            this.update({isOpen: true});
+            this.fetchData();
+        }
+    }
+    /**
+     * Closes the menu when clicking outside, if appropriate.
+     *
+     * @private
+     * @param {MouseEvent} ev
+     */
+    onClickCaptureGlobal(ev) {
+        if (!this.exists()) {
+            return;
+        }
+        if (!this.component || !this.component.root.el) {
+            return;
+        }
+        if (this.component.root.el.contains(ev.target)) {
+            return;
+        }
+        this.close();
+    }
+}
diff --git a/sign_oca/static/src/js/systray_service.esm.js b/sign_oca/static/src/js/systray_service.esm.js
index 3fdce502..548640c2 100644
--- a/sign_oca/static/src/js/systray_service.esm.js
+++ b/sign_oca/static/src/js/systray_service.esm.js
@@ -15,3 +15,4 @@ export const systrayService = {
         );
     },
 };
+systrayRegistry.add("request_systray_service", systrayService);
diff --git a/sign_oca/static/src/xml/signer_menu_container.xml b/sign_oca/static/src/xml/signer_menu_container.xml
index 605d80ed..12b78e9a 100644
--- a/sign_oca/static/src/xml/signer_menu_container.xml
+++ b/sign_oca/static/src/xml/signer_menu_container.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <templates xml:space="preserve">
-    <t t-name="sign_oca.SignerMenuContainer" owl="1">
+    <t t-name="sign_oca.SignerMenuContainer">
         <t t-if="signerMenuView">
             <SignerMenuView record="signerMenuView" />
         </t>
diff --git a/sign_oca/static/src/xml/systray.xml b/sign_oca/static/src/xml/systray.xml
index e531419f..d840bab8 100644
--- a/sign_oca/static/src/xml/systray.xml
+++ b/sign_oca/static/src/xml/systray.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <templates>
-    <t t-name="sign_oca.SignerMenuView" owl="1">
+    <t t-name="sign_oca.SignerMenuView">
         <div class="o_ActivityMenuView dropdown" t-ref="root">
             <a
                 class="o_ActivityMenuView_dropdownToggle dropdown-toggle o-no-caret o-dropdown--narrow"
diff --git a/sign_oca/templates/assets.xml b/sign_oca/templates/assets.xml
index f9fe7b02..43626804 100644
--- a/sign_oca/templates/assets.xml
+++ b/sign_oca/templates/assets.xml
@@ -12,7 +12,6 @@
                 <script type="text/javascript">
                     odoo.define("sign.document_portal", function(require) {
                         var ajax = require("web.ajax");
-                        var core = require("web.core");
                         var document_signing = require("@sign_oca/components/sign_oca_pdf_portal/sign_oca_pdf_portal.esm");
                         document_signing.initDocumentToSign(<t
                         t-out="json.dumps({'access_token': access_token, 'signer_id': signer.id})"
diff --git a/sign_oca/tests/test_sign.py b/sign_oca/tests/test_sign.py
index 7ca228e1..cf977435 100644
--- a/sign_oca/tests/test_sign.py
+++ b/sign_oca/tests/test_sign.py
@@ -3,6 +3,8 @@
 
 import base64
 
+import requests
+
 from odoo.modules.module import get_module_resource
 from odoo.tests.common import Form, TransactionCase
 
@@ -10,6 +12,7 @@
 class TestSign(TransactionCase):
     @classmethod
     def setUpClass(cls):
+        cls._super_send = requests.Session.send
         super().setUpClass()
         cls.data = base64.b64encode(
             open(
@@ -83,6 +86,11 @@ def configure_request(self):
             }
         )
 
+    @classmethod
+    def _request_handler(cls, s, r, /, **kw):
+        """Don't block external requests."""
+        return cls._super_send(s, r, **kw)
+
     def test_template_configuration(self):
         self.assertFalse(self.template.get_info()["items"])
         self.configure_template()
diff --git a/sign_oca/tests/test_sign_portal.py b/sign_oca/tests/test_sign_portal.py
index 529b685b..84a10da6 100644
--- a/sign_oca/tests/test_sign_portal.py
+++ b/sign_oca/tests/test_sign_portal.py
@@ -3,41 +3,45 @@
 
 import base64
 
+import requests
+
 from odoo.modules.module import get_module_resource
 from odoo.tests.common import HttpCase, tagged
 
 
 @tagged("post_install", "-at_install")
 class TestSign(HttpCase):
-    def setUp(self):
-        super().setUp()
-        self.data = base64.b64encode(
+    @classmethod
+    def setUpClass(cls):
+        cls._super_send = requests.Session.send
+        super().setUpClass()
+        cls.data = base64.b64encode(
             open(
                 get_module_resource("sign_oca", "tests", "empty.pdf"),
                 "rb",
             ).read()
         )
-        self.signer = self.env["res.partner"].create({"name": "Signer"})
-        self.request = self.env["sign.oca.request"].create(
+        cls.signer = cls.env["res.partner"].create({"name": "Signer"})
+        cls.request = cls.env["sign.oca.request"].create(
             {
-                "data": self.data,
+                "data": cls.data,
                 "name": "Demo template",
                 "signer_ids": [
                     (
                         0,
                         0,
                         {
-                            "partner_id": self.signer.id,
-                            "role_id": self.env.ref("sign_oca.sign_role_customer").id,
+                            "partner_id": cls.signer.id,
+                            "role_id": cls.env.ref("sign_oca.sign_role_customer").id,
                         },
                     )
                 ],
             }
         )
-        self.item = self.request.add_item(
+        cls.item = cls.request.add_item(
             {
-                "role_id": self.env.ref("sign_oca.sign_role_customer").id,
-                "field_id": self.env.ref("sign_oca.sign_field_name").id,
+                "role_id": cls.env.ref("sign_oca.sign_role_customer").id,
+                "field_id": cls.env.ref("sign_oca.sign_field_name").id,
                 "page": 1,
                 "position_x": 10,
                 "position_y": 10,
@@ -46,6 +50,11 @@ def setUp(self):
             }
         )
 
+    @classmethod
+    def _request_handler(cls, s, r, /, **kw):
+        """Don't block external requests."""
+        return cls._super_send(s, r, **kw)
+
     def test_portal(self):
         self.authenticate("portal", "portal")
         self.request.action_send()
diff --git a/sign_oca/views/res_partner_views.xml b/sign_oca/views/res_partner_views.xml
index 1a7064c6..a2e4b14c 100644
--- a/sign_oca/views/res_partner_views.xml
+++ b/sign_oca/views/res_partner_views.xml
@@ -11,7 +11,7 @@
                     class="oe_stat_button"
                     type="object"
                     name="action_show_signer_ids"
-                    attrs="{'invisible': [('signer_count', '=', 0)]}"
+                    invisible="signer_count == 0"
                     icon="fa-pencil"
                     groups="sign_oca.sign_oca_group_user"
                 >
diff --git a/sign_oca/views/sign_oca_request.xml b/sign_oca/views/sign_oca_request.xml
index a0fe2405..84056694 100644
--- a/sign_oca/views/sign_oca_request.xml
+++ b/sign_oca/views/sign_oca_request.xml
@@ -14,20 +14,20 @@
                         name="sign"
                         class="btn btn-primary"
                         type="object"
-                        attrs="{'invisible': ['|',('to_sign', '=', False), ('state', '!=', 'sent')]}"
+                        invisible="not to_sign or state != 'sent'"
                     />
                     <field name="to_sign" invisible="1" />
                     <button
                         string="Send"
                         type="object"
-                        states="draft"
+                        invisible="state != 'draft'"
                         name="action_send"
                         icon="fa-paper-plane"
                     />
                     <button
                         string="Cancel"
                         type="object"
-                        states="draft,sent,signed"
+                        invisible="state not in ['draft', 'sent', 'signed']"
                         name="cancel"
                         confirm="You will cancel the request and all the accesses. Are you sure about it?"
                         groups="sign_oca.sign_oca_group_user"
@@ -36,6 +36,7 @@
                         name="state"
                         widget="statusbar"
                         statusbar_visible="sent,signed"
+                        readonly="1"
                     />
                 </header>
                 <sheet>
@@ -45,7 +46,7 @@
                             type="object"
                             class="oe_stat_button"
                             icon="fa-pencil"
-                            states="sent,signed"
+                            invisible="state not in ['sent', 'signed']"
                             groups="sign_oca.sign_oca_group_user"
                         >
                             <div class="o_field_widget o_stat_info">
@@ -59,7 +60,7 @@
                         <button
                             class="oe_stat_button"
                             icon="fa-wrench"
-                            states="draft"
+                            invisible="state not in ['draft']"
                             name="configure"
                             type="object"
                             string="Configure"
@@ -78,40 +79,45 @@
                     <widget
                         name="web_ribbon"
                         title="Fully Signed"
-                        attrs="{'invisible': [('state', '!=', 'signed')]}"
+                        invisible="state != 'signed'"
                     />
                     <widget
                         name="web_ribbon"
                         bg_color="bg-danger"
                         title="Cancelled"
-                        attrs="{'invisible': [('state', '!=', 'cancel')]}"
+                        invisible="state != 'cancel'"
                     />
                     <widget
                         name="web_ribbon"
                         title="Archived"
                         bg_color="bg-danger"
-                        attrs="{'invisible': [('active', '=', True)]}"
+                        invisible="active"
                     />
                     <div class="oe_title">
                         <label for="name" />
                         <h1><field name="name" /></h1>
                     </div>
                     <group>
-                        <field name="data" filename="filename" />
+                        <field
+                            name="data"
+                            filename="filename"
+                            readonly="state != 'draft'"
+                        />
                         <field name="filename" invisible="1" />
                         <field
                             name="template_id"
-                            attrs="{'invisible': [('template_id', '=', False)]}"
+                            invisible="not template_id"
+                            readonly="1"
                         />
-                        <field name="user_id" />
-                        <field name="record_ref" />
+                        <field name="user_id" readonly="state != 'draft'" />
+                        <field name="record_ref" readonly="state != 'draft'" />
                     </group>
 
-                    <field name="signer_ids" nolabel="1">
+                    <field name="signer_ids" nolabel="1" readonly="state != 'draft'">
                         <tree editable="bottom">
                             <field name="role_id" />
                             <field name="partner_id" />
-                            <field name="signed_on" />
+                            <field name="signed_on" readonly="1" />
                         </tree>
                     </field>
                 </sheet>
@@ -222,9 +228,9 @@
                     name="sign"
                     class="btn btn-primary"
                     type="object"
-                    attrs="{'invisible': ['|',('to_sign', '=', False), ('state', '!=', 'sent')]}"
+                    invisible="not to_sign or state != 'sent'"
                 />
-                <field name="to_sign" invisible="1" />
+                <field name="to_sign" column_invisible="1" />
             </tree>
         </field>
     </record>
@@ -344,7 +350,7 @@
                         string="Sign"
                         type="object"
                         name="sign"
-                        attrs="{'invisible': [('is_allow_signature', '=', False)]}"
+                        invisible="not is_allow_signature"
                     />
                 </header>
                 <sheet>
@@ -383,7 +389,7 @@
         <field name="name">Sign Requests</field>
         <field name="res_model">sign.oca.request</field>
         <field name="view_mode">kanban,tree,form</field>
-        <field name="domain">[('template_id', '=', active_id)]</field>
+        <field name="domain">[('template_id', '=', id)]</field>
         <field name="context">{}</field>
     </record>
 
diff --git a/sign_oca/views/sign_oca_request_log.xml b/sign_oca/views/sign_oca_request_log.xml
index d9c4e9b3..6b7501c6 100644
--- a/sign_oca/views/sign_oca_request_log.xml
+++ b/sign_oca/views/sign_oca_request_log.xml
@@ -20,9 +20,9 @@
         <field name="model">sign.oca.request.log</field>
         <field name="arch" type="xml">
             <tree>
-                <field name="action" />
-                <field name="date" />
-                <field name="uid" />
+                <field name="action" readonly="1" />
+                <field name="date" readonly="1" />
+                <field name="uid" readonly="1" />
                 <field name="partner_id" />
                 <field name="signer_id" />
             </tree>
@@ -34,7 +34,7 @@
         <field name="name">Sign Requests</field>
         <field name="res_model">sign.oca.request.log</field>
         <field name="view_mode">tree</field>
-        <field name="domain">[("request_id", "=", active_id)]</field>
+        <field name="domain">[("request_id", "=", id)]</field>
         <field name="context">{}</field>
     </record>
 
diff --git a/sign_oca/views/sign_oca_role.xml b/sign_oca/views/sign_oca_role.xml
index 716b2016..765b0504 100644
--- a/sign_oca/views/sign_oca_role.xml
+++ b/sign_oca/views/sign_oca_role.xml
@@ -19,11 +19,13 @@
                             <field name="partner_selection_policy" widget="radio" />
                             <field
                                 name="default_partner_id"
-                                attrs="{'invisible': [('partner_selection_policy', '!=', 'default')], 'required': [('partner_selection_policy', '=', 'default')]}"
+                                invisible="partner_selection_policy != 'default'"
+                                required="partner_selection_policy == 'default'"
                             />
                             <field
                                 name="expression_partner"
-                                attrs="{'invisible': [('partner_selection_policy', '!=', 'expression')], 'required': [('partner_selection_policy', '=', 'expression')]}"
+                                invisible="partner_selection_policy != 'expression'"
+                                required="partner_selection_policy == 'expression'"
                             />
                         </group>
                     </group>
diff --git a/sign_oca/wizards/res_config_settings_views.xml b/sign_oca/wizards/res_config_settings_views.xml
index 8a1146ec..f972e286 100644
--- a/sign_oca/wizards/res_config_settings_views.xml
+++ b/sign_oca/wizards/res_config_settings_views.xml
@@ -7,45 +7,23 @@
         <field name="model">res.config.settings</field>
         <field name="inherit_id" ref="base.res_config_settings_view_form" />
         <field name="arch" type="xml">
-            <xpath expr="//div[hasclass('settings')]" position="inside">
-                <div
-                    class="app_settings_block"
+            <xpath expr="//form" position="inside">
+                <app
                     data-string="Sign Oca"
                     string="Sign Oca"
-                    data-key="sign_oca"
                     groups="sign_oca.sign_oca_group_admin"
                 >
-                    <h2>Sign Requests</h2>
-                    <div class="row mt16 o_settings_container" id="sign_oca_requests">
-                        <div class="col-xs-12 col-md-6 o_setting_box">
-                            <div class="o_setting_left_pane">
-                                <field name="sign_oca_send_sign_request_copy" />
-                            </div>
-                            <div class="o_setting_right_pane">
-                                <label for="sign_oca_send_sign_request_copy" />
-                                <div class="text-muted">
-                                    Once all signers have signed the request, a copy of the final document will be sent to each of them.
-                                </div>
-                            </div>
-                        </div>
-                    </div>
-                </div>
+                    <block id="sign_oca_requests" title="Sign Requests">
+                        <setting
+                            class="col-xs-12 col-md-6 o_setting_box"
+                            help="Once all signers have signed the request, a copy of the final document will be sent to each of them."
+                        >
+                            <field name="sign_oca_send_sign_request_copy" />
+                            <label for="sign_oca_send_sign_request_copy" />
+                        </setting>
+                    </block>
+                </app>
             </xpath>
         </field>
     </record>
-    <record id="sign_oca_general_settings_act_window" model="ir.actions.act_window">
-        <field name="name">General Settings</field>
-        <field name="type">ir.actions.act_window</field>
-        <field name="res_model">res.config.settings</field>
-        <field name="view_mode">form</field>
-        <field name="target">inline</field>
-        <field name="context">{'module' : 'sign_oca'}</field>
-    </record>
-    <menuitem
-        name="General settings"
-        id="sign_oca_general_settings_menu"
-        parent="sign_oca_settings_menu"
-        sequence="1"
-        action="sign_oca_general_settings_act_window"
-    />
 </odoo>
diff --git a/sign_oca/wizards/sign_oca_template_generate.xml b/sign_oca/wizards/sign_oca_template_generate.xml
index 473f4263..f5d0f1cd 100644
--- a/sign_oca/wizards/sign_oca_template_generate.xml
+++ b/sign_oca/wizards/sign_oca_template_generate.xml
@@ -18,10 +18,7 @@
                 <group>
                     <field name="template_id" invisible="1" />
                     <field name="sign_now" invisible="1" />
-                    <field
-                        name="message"
-                        attrs="{'invisible': [('sign_now', '=', True)]}"
-                    />
+                    <field name="message" invisible="sign_now" />
                 </group>
                 <footer>
                     <button
@@ -40,7 +37,7 @@
         <field name="name">Sign Oca Template Generate</field> <!-- TODO -->
         <field name="res_model">sign.oca.template.generate</field>
         <field name="view_mode">form</field>
-        <field name="context">{'default_template_id': active_id}</field>
+        <field name="context">{'default_template_id': id}</field>
         <field name="target">new</field>
     </record>