diff --git a/view/inventory_form.xml b/view/inventory_form.xml
index eca14d3730..3dae6e5f2f 100644
--- a/view/inventory_form.xml
+++ b/view/inventory_form.xml
@@ -1,7 +1,7 @@
 <?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. -->
-<form col="4">
+<form>
     <label name="location"/>
     <field name="location"/>
     <label name="number"/>
@@ -15,14 +15,12 @@ this repository contains the full copyright notices and license terms. -->
     <label name="empty_quantity"/>
     <field name="empty_quantity"/>
     <field name="lines" colspan="4"/>
-    <group col="4" colspan="4" id="group_buttons">
-        <label name="state"/>
-        <field name="state"/>
-        <group colspan="2" col="-1" id="buttons">
-            <button name="cancel" icon="tryton-cancel"/>
-            <button name="complete_lines"/>
-            <button name="count"/>
-            <button name="confirm" icon="tryton-ok"/>
-        </group>
+    <label name="state"/>
+    <field name="state"/>
+    <group colspan="2" col="-1" id="buttons">
+        <button name="cancel" icon="tryton-cancel"/>
+        <button name="complete_lines"/>
+        <button name="count"/>
+        <button name="confirm" icon="tryton-ok"/>
     </group>
 </form>
diff --git a/view/inventory_line_tree.xml b/view/inventory_line_tree.xml
index 245637c6e6..3ab9ede4f7 100644
--- a/view/inventory_line_tree.xml
+++ b/view/inventory_line_tree.xml
@@ -2,10 +2,9 @@
 <!-- This file is part of Tryton.  The COPYRIGHT file at the top level of
 this repository contains the full copyright notices and license terms. -->
 <tree editable="bottom">
-    <field name="inventory"/>
-    <field name="product"/>
+    <field name="inventory" expand="1"/>
+    <field name="product" expand="1"/>
     <field name="expected_quantity"/>
     <field name="quantity"/>
     <field name="uom"/>
-    <field name="unit_digits" tree_invisible="1"/>
 </tree>
diff --git a/view/inventory_tree.xml b/view/inventory_tree.xml
index 740e62fec2..3cc10acb3a 100644
--- a/view/inventory_tree.xml
+++ b/view/inventory_tree.xml
@@ -2,9 +2,9 @@
 <!-- This file is part of Tryton.  The COPYRIGHT file at the top level of
 this repository contains the full copyright notices and license terms. -->
 <tree>
-    <field name="number"/>
-    <field name="location"/>
+    <field name="number" expand="1"/>
+    <field name="location" expand="2"/>
     <field name="date"/>
     <field name="state"/>
-    <field name="company"/>
+    <field name="company" expand="1"/>
 </tree>
diff --git a/view/location_lead_time_list.xml b/view/location_lead_time_list.xml
index 29c0d56406..9732c24998 100644
--- a/view/location_lead_time_list.xml
+++ b/view/location_lead_time_list.xml
@@ -2,7 +2,7 @@
 <!-- This file is part of Tryton.  The COPYRIGHT file at the top level of
 this repository contains the full copyright notices and license terms. -->
 <tree sequence="sequence" editable="top">
-    <field name="warehouse_from"/>
-    <field name="warehouse_to"/>
+    <field name="warehouse_from" expand="1"/>
+    <field name="warehouse_to" expand="1"/>
     <field name="lead_time"/>
 </tree>
diff --git a/view/location_list.xml b/view/location_list.xml
index 881d3eff3d..6ba968cc75 100644
--- a/view/location_list.xml
+++ b/view/location_list.xml
@@ -2,7 +2,7 @@
 <!-- This file is part of Tryton.  The COPYRIGHT file at the top level of
 this repository contains the full copyright notices and license terms. -->
 <tree>
-    <field name="name"/>
     <field name="code"/>
+    <field name="name" expand="1"/>
     <field name="type"/>
 </tree>
diff --git a/view/location_tree.xml b/view/location_tree.xml
index 6d24a71e42..33f5cdd32e 100644
--- a/view/location_tree.xml
+++ b/view/location_tree.xml
@@ -2,10 +2,7 @@
 <!-- This file is part of Tryton.  The COPYRIGHT file at the top level of
 this repository contains the full copyright notices and license terms. -->
 <tree keyword_open="1">
-    <field name="name"/>
+    <field name="name" expand="1"/>
     <field name="code"/>
     <field name="type"/>
-    <field name="active" tree_invisible="1"/>
-    <field name="parent" tree_invisible="1"/>
-    <field name="childs" tree_invisible="1"/>
 </tree>
diff --git a/view/move_list_shipment_in.xml b/view/move_list_shipment_in.xml
index 3c913b237a..d57b523632 100644
--- a/view/move_list_shipment_in.xml
+++ b/view/move_list_shipment_in.xml
@@ -2,10 +2,10 @@
 <!-- This file is part of Tryton.  The COPYRIGHT file at the top level of
 this repository contains the full copyright notices and license terms. -->
 <tree>
-    <field name="shipment"/>
-    <field name="product"/>
-    <field name="from_location"/>
-    <field name="to_location"/>
+    <field name="shipment" expand="2"/>
+    <field name="product" expand="2"/>
+    <field name="from_location" expand="1"/>
+    <field name="to_location" expand="1"/>
     <field name="quantity"/>
     <field name="uom"/>
     <field name="planned_date"/>
@@ -14,5 +14,4 @@ this repository contains the full copyright notices and license terms. -->
     <button name="cancel" string="Cancel"/>
     <button name="draft" string="Reset to Draft"/>
     <button name="do" string="Do"/>
-    <field name="assignation_required" tree_invisible="1"/>
 </tree>
diff --git a/view/move_tree.xml b/view/move_tree.xml
index 37e317fe4b..6b43683570 100644
--- a/view/move_tree.xml
+++ b/view/move_tree.xml
@@ -2,10 +2,10 @@
 <!-- This file is part of Tryton.  The COPYRIGHT file at the top level of
 this repository contains the full copyright notices and license terms. -->
 <tree>
-    <field name="origin"/>
-    <field name="product"/>
-    <field name="from_location"/>
-    <field name="to_location"/>
+    <field name="origin" expand="1"/>
+    <field name="product" expand="1"/>
+    <field name="from_location" expand="1"/>
+    <field name="to_location" expand="1"/>
     <field name="quantity"/>
     <field name="uom"/>
     <field name="planned_date"/>
@@ -14,6 +14,4 @@ this repository contains the full copyright notices and license terms. -->
     <button name="cancel"/>
     <button name="draft"/>
     <button name="do"/>
-    <field name="unit_digits" tree_invisible="1"/>
-    <field name="assignation_required" tree_invisible="1"/>
 </tree>
diff --git a/view/move_tree_simple.xml b/view/move_tree_simple.xml
index ade0d6c7b1..559f6f0129 100644
--- a/view/move_tree_simple.xml
+++ b/view/move_tree_simple.xml
@@ -2,8 +2,7 @@
 <!-- This file is part of Tryton.  The COPYRIGHT file at the top level of
 this repository contains the full copyright notices and license terms. -->
 <tree>
-    <field name="product"/>
+    <field name="product" expand="1"/>
     <field name="quantity"/>
-    <field name="uom" expand="1"/>
-    <field name="unit_digits" tree_invisible="1"/>
+    <field name="uom"/>
 </tree>
diff --git a/view/period_list.xml b/view/period_list.xml
index fb71b227dd..9388c88380 100644
--- a/view/period_list.xml
+++ b/view/period_list.xml
@@ -3,6 +3,6 @@
 this repository contains the full copyright notices and license terms. -->
 <tree>
     <field name="date"/>
-    <field name="company"/>
+    <field name="company" expand="1"/>
     <field name="state"/>
 </tree>
diff --git a/view/shipment_in_form.xml b/view/shipment_in_form.xml
index 6626c95bc5..f7ec8c29f9 100644
--- a/view/shipment_in_form.xml
+++ b/view/shipment_in_form.xml
@@ -33,14 +33,12 @@ this repository contains the full copyright notices and license terms. -->
             <field name="done_by"/>
         </page>
     </notebook>
-    <group col="4" colspan="6" id="state_buttons">
-        <label name="state"/>
-        <field name="state"/>
-        <group col="-1" colspan="2" id="buttons">
-            <button name="cancel" icon="tryton-cancel"/>
-            <button name="receive" icon="tryton-forward"/>
-            <button name="done" icon="tryton-ok"/>
-            <button name="draft" icon="tryton-undo"/>
-        </group>
+    <label name="state"/>
+    <field name="state"/>
+    <group col="-1" colspan="2" id="buttons">
+        <button name="cancel" icon="tryton-cancel"/>
+        <button name="receive" icon="tryton-forward"/>
+        <button name="done" icon="tryton-ok"/>
+        <button name="draft" icon="tryton-undo"/>
     </group>
 </form>
diff --git a/view/shipment_in_return_tree.xml b/view/shipment_in_return_tree.xml
index 78358b931b..ff9eb3156a 100644
--- a/view/shipment_in_return_tree.xml
+++ b/view/shipment_in_return_tree.xml
@@ -6,7 +6,7 @@ this repository contains the full copyright notices and license terms. -->
     <field name="reference"/>
     <field name="planned_date"/>
     <field name="effective_date"/>
-    <field name="supplier"/>
+    <field name="supplier" expand="1"/>
     <field name="delivery_address"/>
     <field name="state"/>
 </tree>
diff --git a/view/shipment_in_tree.xml b/view/shipment_in_tree.xml
index 5c3f2ec8c3..241320f2b5 100644
--- a/view/shipment_in_tree.xml
+++ b/view/shipment_in_tree.xml
@@ -2,11 +2,11 @@
 <!-- This file is part of Tryton.  The COPYRIGHT file at the top level of
 this repository contains the full copyright notices and license terms. -->
 <tree>
-    <field name="number"/>
-    <field name="reference"/>
+    <field name="number" expand="1"/>
+    <field name="reference" expand="1"/>
     <field name="planned_date"/>
     <field name="effective_date"/>
-    <field name="supplier"/>
+    <field name="supplier" expand="2"/>
     <field name="contact_address"/>
     <field name="state"/>
 </tree>
diff --git a/view/shipment_internal_form.xml b/view/shipment_internal_form.xml
index 5b6abbd58e..f1c3a165a6 100644
--- a/view/shipment_internal_form.xml
+++ b/view/shipment_internal_form.xml
@@ -1,7 +1,7 @@
 <?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. -->
-<form col="4" cursor="from_location">
+<form cursor="from_location">
     <label name="reference"/>
     <field name="reference"/>
     <label name="number"/>
diff --git a/view/shipment_internal_tree.xml b/view/shipment_internal_tree.xml
index afd7c75654..8b4c85d41e 100644
--- a/view/shipment_internal_tree.xml
+++ b/view/shipment_internal_tree.xml
@@ -2,12 +2,12 @@
 <!-- This file is part of Tryton.  The COPYRIGHT file at the top level of
 this repository contains the full copyright notices and license terms. -->
 <tree>
-    <field name="number"/>
-    <field name="reference"/>
+    <field name="number" expand="1"/>
+    <field name="reference" expand="1"/>
     <field name="planned_start_date"/>
     <field name="planned_date"/>
     <field name="effective_date"/>
-    <field name="from_location"/>
-    <field name="to_location"/>
+    <field name="from_location" expand="1"/>
+    <field name="to_location" expand="1"/>
     <field name="state"/>
 </tree>
diff --git a/view/shipment_out_form.xml b/view/shipment_out_form.xml
index eb03a4f9ac..8e8827810b 100644
--- a/view/shipment_out_form.xml
+++ b/view/shipment_out_form.xml
@@ -1,7 +1,7 @@
 <?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. -->
-<form col="4" cursor="customer">
+<form cursor="customer">
     <label name="reference"/>
     <field name="reference"/>
     <label name="number"/>
@@ -34,18 +34,14 @@ this repository contains the full copyright notices and license terms. -->
             <field name="done_by"/>
         </page>
     </notebook>
-    <group col="4" colspan="4" id="state_buttons">
-        <label name="state"/>
-        <field name="state"/>
-        <group col="-1" colspan="2" id="buttons">
-            <button name="cancel" icon="tryton-cancel"/>
-            <button name="draft"/>
-            <button name="wait"/>
-            <button name="assign_wizard" icon="tryton-forward"/>
-            <button name="pack" icon="tryton-forward"/>
-            <button name="done" icon="tryton-ok"/>
-        </group>
+    <label name="state"/>
+    <field name="state"/>
+    <group col="-1" colspan="2" id="buttons">
+        <button name="cancel" icon="tryton-cancel"/>
+        <button name="draft"/>
+        <button name="wait"/>
+        <button name="assign_wizard" icon="tryton-forward"/>
+        <button name="pack" icon="tryton-forward"/>
+        <button name="done" icon="tryton-ok"/>
     </group>
-    <field name="warehouse_storage" invisible="1" colspan="4"/>
-    <field name="warehouse_output" invisible="1" colspan="4"/>
 </form>
diff --git a/view/shipment_out_return_form.xml b/view/shipment_out_return_form.xml
index 6e9ac3ffaa..4b70b622c8 100644
--- a/view/shipment_out_return_form.xml
+++ b/view/shipment_out_return_form.xml
@@ -32,14 +32,12 @@ this repository contains the full copyright notices and license terms. -->
             <field name="done_by"/>
         </page>
     </notebook>
-    <group col="4" colspan="6" id="state_buttons">
-        <label name="state"/>
-        <field name="state"/>
-        <group col="-1" colspan="2" id="buttons">
-            <button name="cancel" icon="tryton-cancel"/>
-            <button name="draft" icon="tryton-clear"/>
-            <button name="receive" icon="tryton-forward"/>
-            <button name="done" icon="tryton-ok"/>
-        </group>
+    <label name="state"/>
+    <field name="state"/>
+    <group col="-1" colspan="2" id="buttons">
+        <button name="cancel" icon="tryton-cancel"/>
+        <button name="draft" icon="tryton-clear"/>
+        <button name="receive" icon="tryton-forward"/>
+        <button name="done" icon="tryton-ok"/>
     </group>
 </form>
diff --git a/view/shipment_out_return_tree.xml b/view/shipment_out_return_tree.xml
index b4e1509db1..5dd300e02e 100644
--- a/view/shipment_out_return_tree.xml
+++ b/view/shipment_out_return_tree.xml
@@ -2,11 +2,11 @@
 <!-- This file is part of Tryton.  The COPYRIGHT file at the top level of
 this repository contains the full copyright notices and license terms. -->
 <tree>
-    <field name="number"/>
-    <field name="reference"/>
+    <field name="number" expand="1"/>
+    <field name="reference" expand="1"/>
     <field name="state"/>
     <field name="planned_date"/>
     <field name="effective_date"/>
-    <field name="customer"/>
+    <field name="customer" expand="2"/>
     <field name="delivery_address"/>
 </tree>
diff --git a/view/shipment_out_tree.xml b/view/shipment_out_tree.xml
index 6d879bb844..78b194f9b2 100644
--- a/view/shipment_out_tree.xml
+++ b/view/shipment_out_tree.xml
@@ -2,11 +2,11 @@
 <!-- This file is part of Tryton.  The COPYRIGHT file at the top level of
 this repository contains the full copyright notices and license terms. -->
 <tree>
-    <field name="number"/>
-    <field name="reference"/>
+    <field name="number" expand="1"/>
+    <field name="reference" expand="1"/>
     <field name="planned_date"/>
     <field name="effective_date"/>
-    <field name="customer"/>
+    <field name="customer" expand="2"/>
     <field name="delivery_address"/>
     <field name="state"/>
 </tree>