diff --git a/openerp/addons/base/ir/ir.xml b/openerp/addons/base/ir/ir.xml
index 6d5da0fc47a..df6aa22a6e3 100644
--- a/openerp/addons/base/ir/ir.xml
+++ b/openerp/addons/base/ir/ir.xml
@@ -1618,12 +1618,16 @@
             <field name="arch" type="xml">
                 <form string="Server Action" version="7.0">
                   <sheet> 
-                    <group col="6" colspan="4">
-                        <field name="name"/>
-                        <field name="model_id"/>
-                        <field name="state"/>
-                        <field name="sequence"/>
-                        <field name="condition"/>
+                    <group>
+                        <group>
+                            <field name="name"/>
+                            <field name="model_id"/>
+                            <field name="state"/>
+                        </group>
+                        <group>
+                            <field name="condition"/>
+                            <field name="sequence"/>
+                        </group>
                     </group>
                     <notebook colspan="4">
                         <page string="Python Code" attrs="{'invisible':[('state','!=','code')]}">
diff --git a/openerp/addons/base/res/res_company_view.xml b/openerp/addons/base/res/res_company_view.xml
index dd3e29ba9c3..16a63401651 100644
--- a/openerp/addons/base/res/res_company_view.xml
+++ b/openerp/addons/base/res/res_company_view.xml
@@ -150,17 +150,18 @@
             <field name="arch" type="xml">
                 <form string="Multi Company" version="7.0">
                   <sheet>
-                    <group col="6" colspan="4">
-                        <field name="name" colspan="6"/>
-                        <separator string="Matching" colspan="6"/>
-                        <field name="company_id"/>
-                        <field name="object_id"/>
-                        <field name="field_id" domain="[('model_id','=',object_id)]"/>
-                        <separator string="Condition" colspan="6"/>
-                        <field name="expression" colspan="4"/>
-                        <field name="sequence"/>
-                        <separator string="Returning" colspan="6"/>
-                        <field name="company_dest_id"/>
+                    <group>
+                        <group>
+                            <field name="name"/>
+                            <field name="company_id"/>
+                            <field name="company_dest_id"/>
+                        </group>
+                        <group>
+                            <field name="object_id"/>
+                            <field name="field_id" domain="[('model_id','=',object_id)]"/>
+                            <field name="expression"/>
+                            <field name="sequence"/>
+                        </group>
                     </group>
                    </sheet> 
                 </form>