diff --git a/addons/base_setup/base_setup_todo.xml b/addons/base_setup/base_setup_todo.xml
index 5db25283777..cfe815fb94e 100644
--- a/addons/base_setup/base_setup_todo.xml
+++ b/addons/base_setup/base_setup_todo.xml
@@ -36,11 +36,11 @@
                     <field name="currency" widget="selection"/>
                 </group>
                 <newline/>
-                <group colspan="2" groups="base.group_extended">
-                    <separator string="Report Information" colspan="4"/>
-                    <field name="rml_header1" colspan="5"/>
-                    <field name="rml_footer1" colspan="5"/>
-                    <field name="rml_footer2" colspan="5"/>
+                <group colspan="2" groups="base.group_extended" >
+<!--                    <separator string="Report Information" colspan="4" />-->
+                    <field name="rml_header1" colspan="5" invisible="1"/>
+                    <field name="rml_footer1" colspan="5" invisible="1"/>
+                    <field name="rml_footer2" colspan="5" invisible="1"/>
 
                     <separator colspan="4"
                                string="Your Logo - Use a size of about 450x150 pixels."/>
diff --git a/addons/event/event_view.xml b/addons/event/event_view.xml
index c72cc60dcef..9caaae6e722 100644
--- a/addons/event/event_view.xml
+++ b/addons/event/event_view.xml
@@ -53,21 +53,22 @@
                         <field name="product_id" on_change="onchange_product(product_id)"/>
                     </group>
                     <notebook colspan="4">
-                    <page string="General">
+                    <page string="Event Information">
+                        <separator string="Description" colspan="4"/>
                         <field name="unit_price"/>
                         <field name="currency_id"/>
-                        <separator string="Speaker Information" colspan="4"/>
-                        <field name="main_speaker_id" domain="[('speaker','=',True)]"/>
-                        <field name="address_id"/>
-                        <field name="speaker_ids" domain="[('speaker','=',True)]" colspan="4"/>
-                        <field name="country_id" />
-                        <field name="speaker_confirmed"/>
-                        <field name="language"/>
-                        <separator string="Event description" colspan="4"/>
-                        <field name="parent_id" domain="[('parent_id','child_of','Event')]"/>
-                        <field name="active"/>
                         <field name="register_min"/>
                         <field name="register_max"/>
+                        <field name="parent_id" domain="[('parent_id','child_of','Event')]"/>
+                        <field name="active"/>
+                        <separator string="Location" colspan="4"/>
+                        <field name="country_id" />
+                        <field name="language"/>
+                        <field name="address_id"/>
+                        <separator string="Speaker Information" colspan="4"/>
+                        <field name="main_speaker_id" domain="[('speaker','=',True)]"/>
+                        <field name="speaker_confirmed"/>
+                        <field name="speaker_ids" domain="[('speaker','=',True)]" colspan="4"/>
                         <newline/>
                         <field name="state" select="1"/>
                         <group col="4" colspan="2">