diff --git a/view/opportunity_employee_monthly_tree.xml b/view/opportunity_employee_monthly_tree.xml
index d0b9eaadb1..34021a37fd 100644
--- a/view/opportunity_employee_monthly_tree.xml
+++ b/view/opportunity_employee_monthly_tree.xml
@@ -4,7 +4,7 @@ this repository contains the full copyright notices and license terms. -->
 <tree>
     <field name="year"/>
     <field name="month" widget="selection"/>
-    <field name="employee"/>
+    <field name="employee" expand="1"/>
     <field name="number"/>
     <field name="converted"/>
     <field name="won"/>
diff --git a/view/opportunity_employee_tree.xml b/view/opportunity_employee_tree.xml
index ed2d205c21..ebfa707e63 100644
--- a/view/opportunity_employee_tree.xml
+++ b/view/opportunity_employee_tree.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="employee"/>
+    <field name="employee" expand="1"/>
     <field name="number"/>
     <field name="converted"/>
     <field name="won"/>
diff --git a/view/opportunity_form.xml b/view/opportunity_form.xml
index db059e8bb0..de4338e1d9 100644
--- a/view/opportunity_form.xml
+++ b/view/opportunity_form.xml
@@ -39,17 +39,6 @@ this repository contains the full copyright notices and license terms. -->
             <field name="comment" colspan="4"/>
             <separator name="lost_reason" colspan="4"/>
             <field name="lost_reason" colspan="4"/>
-            <group col="2" colspan="2" id="state">
-                <label name="state"/>
-                <field name="state"/>
-            </group>
-            <group col="-1" colspan="2" id="buttons">
-                <button name="cancel" icon="tryton-cancel"/>
-                <button name="lost" icon="tryton-cancel"/>
-                <button name="lead" icon="tryton-back"/>
-                <button name="opportunity" icon="tryton-forward"/>
-                <button name="convert" icon="tryton-forward"/>
-            </group>
         </page>
         <page name="lines">
             <field name="lines"/>
@@ -58,4 +47,13 @@ this repository contains the full copyright notices and license terms. -->
             <field name="sales" colspan="4"/>
         </page>
     </notebook>
+    <label name="state"/>
+    <field name="state"/>
+    <group col="-1" colspan="2" id="buttons">
+        <button name="cancel" icon="tryton-cancel"/>
+        <button name="lost" icon="tryton-cancel"/>
+        <button name="lead" icon="tryton-back"/>
+        <button name="opportunity" icon="tryton-forward"/>
+        <button name="convert" icon="tryton-forward"/>
+    </group>
 </form>
diff --git a/view/opportunity_line_tree.xml b/view/opportunity_line_tree.xml
index 3f85b40c56..18e45e30e5 100644
--- a/view/opportunity_line_tree.xml
+++ b/view/opportunity_line_tree.xml
@@ -2,9 +2,8 @@
 <!-- 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">
-    <field name="opportunity"/>
-    <field name="product"/>
+    <field name="opportunity" expand="1"/>
+    <field name="product" expand="1"/>
     <field name="quantity"/>
-    <field name="unit" expand="1"/>
-    <field name="sequence" tree_invisible="1"/>
+    <field name="unit"/>
 </tree>
diff --git a/view/opportunity_tree.xml b/view/opportunity_tree.xml
index a410726cdd..39a1a40935 100644
--- a/view/opportunity_tree.xml
+++ b/view/opportunity_tree.xml
@@ -2,13 +2,13 @@
 <!-- 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="start_date"/>
     <field name="end_date"/>
-    <field name="employee"/>
-    <field name="description"/>
-    <field name="party"/>
+    <field name="employee" expand="1"/>
+    <field name="description" expand="1"/>
+    <field name="party" expand="1"/>
     <field name="amount"/>
     <field name="currency"/>
     <field name="state"/>