diff --git a/addons/mrp/mrp_view.xml b/addons/mrp/mrp_view.xml
index 4186a6e8722..fa43632e577 100644
--- a/addons/mrp/mrp_view.xml
+++ b/addons/mrp/mrp_view.xml
@@ -33,7 +33,7 @@
             </field>
         </record>
         <record id="mrp_property_group_action" model="ir.actions.act_window">
-            <field name="name">Property Categories</field>
+            <field name="name">Property Groups</field>
             <field name="type">ir.actions.act_window</field>
             <field name="res_model">mrp.property.group</field>
             <field name="view_type">form</field>
@@ -82,8 +82,8 @@
                 <search string="Search">
                    <group col='15' colspan='4'>
                        <field name="name"/>
-                       <field name="group_id"  widget="selection" />
                        <field name="composition"/>
+                       <field name="group_id"  widget="selection" />
                    </group>
                    <newline/>
                    <group expand="0" string="Group By..." colspan="4" col="20">
diff --git a/addons/resource/resource_view.xml b/addons/resource/resource_view.xml
index 02b9abd882a..1f7b9cd71c8 100644
--- a/addons/resource/resource_view.xml
+++ b/addons/resource/resource_view.xml
@@ -53,9 +53,9 @@
                 <search string="Search Working Period Leaves">
                    <group col='15' colspan='4'>
                        <field name="name" string="Name"/>
+                       <field name="resource_id" string="Resource"/>
                        <field name="company_id" string="Company" widget="selection" />
                        <field name="calendar_id" string="Working Time" widget="selection"/>
-                       <field name="resource_id" string="Resource"/>
                    </group>
                    <newline/>
                    <group expand="0" string="Group By..." colspan="4" col="20">
@@ -74,9 +74,10 @@
             <field name="type">form</field>
             <field name="arch" type="xml">
                 <form string="Working Period">
-                    <field name="name" select="1"/>
-                    <field name="manager" select="1"/>
-                    <field name="company_id" select="1" groups="base.group_multi_company"/>
+                    <field name="name"/>
+                    <field name="manager"/>
+                    <field name="company_id" groups="base.group_multi_company"/>
+                    <field name="attendance_ids" colspan="4"/>
                 </form>
             </field>
         </record>
@@ -196,7 +197,7 @@
             <field name="name">Resources</field>
             <field name="res_model">resource.resource</field>
             <field name="view_mode">tree,form</field>
-            <field name="context">{"search_default_user_id":uid}</field>
+            <field name="context">{}</field>
             <field name="search_view_id" ref="view_resource_resource_search"/>
             <field name="help">There you can find clusters of your resources type involved in a specific project phase as well as their workload.</field>
         </record>
@@ -210,7 +211,7 @@
                     <field name="name"/>
                     <field name="resource_id"  on_change="onchange_resource(resource_id)"/>
                     <field name="company_id"  widget="selection" groups="base.group_multi_company"/>
-                    <field name="calendar_id"/>
+                    <field name="calendar_id" widget="selection"/>
                     <newline/>
                     <field name="date_from"/>
                     <field name="date_to"/>
@@ -224,11 +225,11 @@
             <field name="arch" type="xml">
                 <tree string="Leave Detail">
                     <field name="name" />
+                    <field name="resource_id" />
                     <field name="company_id" groups="base.group_multi_company"/>
                     <field name="calendar_id" />
                     <field name="date_from" />
                     <field name="date_to" />
-                    <field name="resource_id" />
                 </tree>
             </field>
         </record>