diff --git a/modules/trade_finance/view/facility_form.xml b/modules/trade_finance/view/facility_form.xml
index c0a777b..586cfe7 100644
--- a/modules/trade_finance/view/facility_form.xml
+++ b/modules/trade_finance/view/facility_form.xml
@@ -1,49 +1,45 @@
 <form col="6">
-    <label name="name"/>
-    <field name="name" colspan="3"/>
-    <label name="status"/>
-    <field name="status"/>
-
-    <label name="tfe"/>
-    <field name="tfe" colspan="3"/>
-    <label name="commitment_status"/>
-    <field name="commitment_status"/>
-
-    <label name="currency"/>
-    <field name="currency"/>
-    <label name="fx_feeder"/>
-    <field name="fx_feeder"/>
-    <label name="fx_haircut_pct"/>
-    <field name="fx_haircut_pct"/>
-    <label/>
-    <label/>
-
-    <label name="date_from"/>
-    <field name="date_from"/>
-    <label name="date_to"/>
-    <field name="date_to"/>
-    <label name="is_tpa"/>
-    <field name="is_tpa"/>
-
-    <label name="broker"/>
-    <field name="broker"/>
-    <label name="broker_account"/>
-    <field name="broker_account" colspan="3"/>
-
-    <label name="description"/>
-    <field name="description" colspan="5"/>
-
-    <notebook>
-        <page string="Limits">
+    <group id="header" col="6" colspan="6">
+        <label name="name"/>
+        <field name="name" colspan="3"/>
+        <label name="status"/>
+        <field name="status"/>
+        <label name="tfe"/>
+        <field name="tfe" colspan="3"/>
+        <label name="commitment_status"/>
+        <field name="commitment_status"/>
+        <label name="currency"/>
+        <field name="currency"/>
+        <label name="fx_feeder"/>
+        <field name="fx_feeder"/>
+        <label name="fx_haircut_pct"/>
+        <field name="fx_haircut_pct"/>
+        <newline/>
+        <label name="date_from"/>
+        <field name="date_from"/>
+        <label name="date_to"/>
+        <field name="date_to"/>
+        <label name="is_tpa"/>
+        <field name="is_tpa"/>
+        <label name="broker"/>
+        <field name="broker"/>
+        <label name="broker_account"/>
+        <field name="broker_account" colspan="3"/>
+        <newline/>
+        <label name="description"/>
+        <field name="description" colspan="5"/>
+    </group>
+    <notebook colspan="6">
+        <page string="Limits" id="limits">
             <field name="limits" colspan="6"/>
         </page>
-        <page string="Caps">
+        <page string="Caps" id="caps">
             <field name="caps" colspan="6"/>
         </page>
-        <page string="Constraints">
+        <page string="Constraints" id="constraints">
             <field name="constraints" colspan="6"/>
         </page>
-        <page string="Covenants">
+        <page string="Covenants" id="covenants">
             <field name="covenants" colspan="6"/>
         </page>
     </notebook>
diff --git a/modules/trade_finance/view/facility_limit_form.xml b/modules/trade_finance/view/facility_limit_form.xml
index 98bbc28..d798512 100644
--- a/modules/trade_finance/view/facility_limit_form.xml
+++ b/modules/trade_finance/view/facility_limit_form.xml
@@ -1,41 +1,40 @@
 <form col="6">
-    <label name="name"/>
-    <field name="name" colspan="2"/>
-    <label name="is_global"/>
-    <field name="is_global" colspan="2"/>
-
-    <label name="financing_type"/>
-    <field name="financing_type" colspan="2"/>
-    <label name="amount"/>
-    <field name="amount"/>
-    <label name="tenor"/>
-    <field name="tenor"/>
-
-    <label name="parent"/>
-    <field name="parent" colspan="2"/>
-    <label name="sequence"/>
-    <field name="sequence" colspan="2"/>
-
-    <notebook>
-        <page string="Sub-Limits">
+    <group id="header" col="6" colspan="6">
+        <label name="name"/>
+        <field name="name" colspan="2"/>
+        <label name="is_global"/>
+        <field name="is_global" colspan="2"/>
+        <label name="financing_type"/>
+        <field name="financing_type" colspan="2"/>
+        <label name="amount"/>
+        <field name="amount"/>
+        <label name="tenor"/>
+        <field name="tenor"/>
+        <label name="parent"/>
+        <field name="parent" colspan="2"/>
+        <label name="sequence"/>
+        <field name="sequence" colspan="2"/>
+    </group>
+    <notebook colspan="6">
+        <page string="Sub-Limits" id="children">
             <field name="children" colspan="6"/>
         </page>
-        <page string="Haircuts">
+        <page string="Haircuts" id="haircuts">
             <field name="haircuts" colspan="6"/>
         </page>
-        <page string="Currencies">
+        <page string="Currencies" id="currencies">
             <field name="currencies" colspan="6"/>
         </page>
-        <page string="Costs">
+        <page string="Costs" id="costs">
             <field name="costs" colspan="6"/>
         </page>
-        <page string="Operational Statuses">
+        <page string="Operational Statuses" id="op_statuses">
             <field name="op_statuses" colspan="6"/>
         </page>
-        <page string="Bank Accounts">
+        <page string="Bank Accounts" id="bank_accounts">
             <field name="bank_accounts" colspan="6"/>
         </page>
-        <page string="Constraints">
+        <page string="Constraints" id="limit_constraints">
             <field name="constraints" colspan="6"/>
         </page>
     </notebook>