diff --git a/inventory.xml b/inventory.xml
index f9396268ef..e03cffb4f9 100644
--- a/inventory.xml
+++ b/inventory.xml
@@ -1,5 +1,6 @@
 <?xml version="1.0"?>
-<!-- This file is part of Tryton.  The COPYRIGHT file at the top level of this repository contains the full copyright notices and license terms. -->
+<!-- This file is part of Tryton.  The COPYRIGHT file at the top level of
+this repository contains the full copyright notices and license terms. -->
 <tryton>
     <data>
         <record model="ir.action.wizard" id="wizard_complete_inventory">
@@ -23,17 +24,17 @@
                         <field name="date"/>
                         <label name="company"/>
                         <field name="company"/>
-                        <label colspan="2"/>
+                        <label colspan="2" id="empty"/>
                         <button string="Complete Inventory" type="action"
                             name="%(wizard_complete_inventory)d"
                             states="{'readonly': '''state != 'draft' '''}"
                             colspan="2"
                             help="Add an inventory line for each missing products"/>
                         <field name="lines" colspan="4"/>
-                        <group col="4" colspan="4">
+                        <group col="4" colspan="4" id="group_buttons">
                             <label name="state"/>
                             <field name="state"/>
-                            <group colspan="2" col="3">
+                            <group colspan="2" col="3" id="buttons">
                                 <button string="Cancel"
                                     name="cancel"
                                     states="{'invisible': '''state in ('cancel', 'done') ''', 'readonly': '''%(group_stock)d not in groups'''}"
diff --git a/location.xml b/location.xml
index 97cd7023ab..00f3e1862c 100644
--- a/location.xml
+++ b/location.xml
@@ -179,9 +179,9 @@ this repository contains the full copyright notices and license terms. -->
                 <![CDATA[
                 <data>
                     <xpath
-                        expr="/form/notebook/page[@string=&quot;Accounting&quot;]"
+                        expr="/form/notebook/page[@id=&quot;accounting&quot;]"
                         position="after">
-                        <page string="Stock">
+                        <page string="Stock" id="stock">
                             <label name="customer_location"/>
                             <field name="customer_location"/>
                             <label name="supplier_location"/>
diff --git a/move.xml b/move.xml
index bb4228f08b..21d330e186 100644
--- a/move.xml
+++ b/move.xml
@@ -1,5 +1,6 @@
 <?xml version="1.0"?>
-<!-- This file is part of Tryton.  The COPYRIGHT file at the top level of this repository contains the full copyright notices and license terms. -->
+<!-- This file is part of Tryton.  The COPYRIGHT file at the top level of
+this repository contains the full copyright notices and license terms. -->
 <tryton>
     <data>
         <record model="ir.ui.view" id="move_view_form">
@@ -28,7 +29,7 @@
                         <field name="planned_date"/>
                         <label name="effective_date"/>
                         <field name="effective_date"/>
-                        <separator colspan="4"/>
+                        <separator colspan="4" id="separator"/>
                         <label name="state"/>
                         <field name="state"/>
                         <field name="unit_price_required" invisible="1" colspan="4"/>
diff --git a/packing.xml b/packing.xml
index e391e29dbe..68afdfb0d6 100644
--- a/packing.xml
+++ b/packing.xml
@@ -26,7 +26,7 @@ this repository contains the full copyright notices and license terms. -->
                         <label name="warehouse"/>
                         <field name="warehouse"/>
                         <notebook colspan="6">
-                            <page string="Incoming Moves">
+                            <page string="Incoming Moves" id="incoming_moves">
                                 <field name="incoming_moves" colspan="4">
                                     <tree string="Moves">
                                         <field name="product" select="1"/>
@@ -40,14 +40,14 @@ this repository contains the full copyright notices and license terms. -->
                                     </tree>
                                 </field>
                             </page>
-                            <page string="Inventory Moves">
+                            <page string="Inventory Moves" id="inventory_moves">
                                 <field name="inventory_moves" colspan="4"/>
                             </page>
                         </notebook>
-                        <group col="4" colspan="6">
+                        <group col="4" colspan="6" id="state_buttons">
                             <label name="state"/>
                             <field name="state"/>
-                            <group col="5" colspan="2">
+                            <group col="5" colspan="2" id="buttons">
                                 <button string="Cancel" name="cancel"
                                     states="{'invisible': '''state in ('cancel', 'done') ''', 'readonly': '''%(group_stock)d not in groups'''}"
                                     icon="tryton-cancel"/>
@@ -180,17 +180,17 @@ this repository contains the full copyright notices and license terms. -->
                         <label name="effective_date"/>
                         <field name="effective_date"/>
                         <notebook colspan="4">
-                            <page string="Inventory Moves">
+                            <page string="Inventory Moves" id="inventory_moves">
                                 <field name="inventory_moves" colspan="4"/>
                             </page>
-                            <page string="Outgoing Moves">
+                            <page string="Outgoing Moves" id="outgoing_moves">
                                 <field name="outgoing_moves" colspan="4"/>
                             </page>
                         </notebook>
-                        <group col="4" colspan="4">
+                        <group col="4" colspan="4" id="state_buttons">
                             <label name="state"/>
                             <field name="state"/>
-                            <group col="8" colspan="2">
+                            <group col="8" colspan="2" id="buttons">
                                 <button string="Cancel" name="cancel"
                                         states="{'invisible': '''state in ('cancel', 'done') ''', 'readonly': '''%(group_stock)d not in groups'''}"
                                         icon="tryton-cancel"/>
@@ -348,7 +348,7 @@ this repository contains the full copyright notices and license terms. -->
                         <field name="moves"  colspan="4"/>
                         <label name="state"/>
                         <field name="state"/>
-                        <group col="7" colspan="2">
+                        <group col="7" colspan="2" id="buttons">
                             <button string="Cancel" name="cancel"
                                 states="{'invisible': '''state in ('cancel', 'done') ''', 'readonly': '''%(group_stock)d not in groups'''}"
                                 icon="tryton-cancel"/>