diff --git a/mis_builder/views/mis_builder.xml b/mis_builder/views/mis_builder.xml
index 09074021..87d895a6 100644
--- a/mis_builder/views/mis_builder.xml
+++ b/mis_builder/views/mis_builder.xml
@@ -29,7 +29,9 @@
                     <group col="2">
                         <field name="name"/>
                         <field name="description"/>
-                        <field name="query_ids">
+                    </group>
+                    <group string="Queries">
+                        <field name="query_ids" nolabel="1" colspan="2">
                             <tree string="Queries" editable="bottom">
                                 <field name="name"/>
                                 <field name="model_id"/>
@@ -40,7 +42,9 @@
                                 <field name="domain"/>
                             </tree>
                         </field>
-                        <field name="kpi_ids">
+                    </group>
+                    <group string="KPI's">
+                        <field name="kpi_ids" nolabel="1" colspan="2">
                             <tree string="KPI's" editable="bottom">
                                 <field name="sequence" widget="handle"/>
                                 <field name="description"/>
@@ -57,7 +61,7 @@
                             </tree>
                         </field>
                     </group>
-                    <group col="2" string="Legend (for expression)">
+                    <group col="2" string="Legend (for kpi expressions)">
                         <group>
                             <label colspan="2" string="Expressions are of the form &lt;field&gt;&lt;mode&gt;[accounts][domain]"/>
                             <label colspan="2" string="Possible values for 'field' can be:"/>
@@ -171,26 +175,33 @@
                         <field name="landscape_pdf" />
                         <field name="root_account"/>
                         <field name="company_id" groups="base.group_multi_company"/>
-                        <field name="date"/>
                         <field name="target_move"/>
-                        <field name="period_ids" colspan="4">
-                            <tree string="KPI's" editable="bottom" colors="red:valid==False">
-                                <field name="sequence" widget="handle"/>
-                                <field name="name"/>
-                                <field name="type"/>
-                                <field name="offset"/>
-                                <field name="duration"/>
-                                <field name="normalize_factor"/>
-                                <field name="date_from"/>
-                                <field name="date_to"/>
-                                <field name="period_from"/>
-                                <field name="period_to"/>
-                                <field name="valid" invisible="1"/>
-                                <field name="report_instance_id" invisible="1"/>
-                                <field name="id" invisible="1"/>
-                                <field name="comparison_column_ids" domain="[('report_instance_id', '=', report_instance_id), ('id', '!=', id)]" widget="many2many_tags"/>
-                            </tree>
-                        </field>
+		    </group>
+		    <group col="4" string="Periods">
+			<group colspan="2">
+			    <field name="date"/>
+			</group>
+			<newline/>
+			<group>
+			    <field name="period_ids" colspan="4" nolabel="1">
+				<tree string="KPI's" editable="bottom" colors="red:valid==False">
+				    <field name="sequence" widget="handle"/>
+				    <field name="name"/>
+				    <field name="type"/>
+				    <field name="offset"/>
+				    <field name="duration"/>
+				    <field name="normalize_factor"/>
+				    <field name="date_from"/>
+				    <field name="date_to"/>
+				    <field name="period_from"/>
+				    <field name="period_to"/>
+				    <field name="valid" invisible="1"/>
+				    <field name="report_instance_id" invisible="1"/>
+				    <field name="id" invisible="1"/>
+				    <field name="comparison_column_ids" domain="[('report_instance_id', '=', report_instance_id), ('id', '!=', id)]" widget="many2many_tags"/>
+				</tree>
+			    </field>
+			</group>
                     </group>
                 </sheet>
                 </form>