diff --git a/addons/account/account_menuitem.xml b/addons/account/account_menuitem.xml
index c2275c0e461..401f77c9f94 100644
--- a/addons/account/account_menuitem.xml
+++ b/addons/account/account_menuitem.xml
@@ -2,7 +2,7 @@
 <openerp>
     <data>
 
-        <menuitem icon="terp-account" id="menu_finance" name="Invoicing" sequence="14"
+        <menuitem icon="terp-account" id="menu_finance" name="Invoicing" sequence="100"
             groups="group_account_user,group_account_manager,group_account_invoice"
             web_icon="images/accounting.png"
             web_icon_hover="images/accounting-hover.png"/>
diff --git a/addons/base_tools/tools_view.xml b/addons/base_tools/tools_view.xml
index eb51e000c1b..0541e452620 100644
--- a/addons/base_tools/tools_view.xml
+++ b/addons/base_tools/tools_view.xml
@@ -1,9 +1,11 @@
 <?xml version="1.0"?>
 <openerp>
     <data>
+
           <menuitem icon="STOCK_PREFERENCES" id="base.menu_tools"
-                    name="Tools" sequence="28"
+                    name="Tools" sequence="160"
                     web_icon="images/tools.png"
                     web_icon_hover="images/tools-hover.png"/>
+
     </data>
 </openerp>
diff --git a/addons/event/event_view.xml b/addons/event/event_view.xml
index 1b1b5daa9a9..11e2322a0d8 100644
--- a/addons/event/event_view.xml
+++ b/addons/event/event_view.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0"?>
 <openerp>
     <data>
-      <act_window
+        <act_window
             id="act_event_list_register_event"
             name="Registration"
             res_model="event.registration"
@@ -9,12 +9,13 @@
             view_mode="calendar,tree,form,graph"
             context="{'search_default_event_id': active_id, 'default_event_id': active_id}"
             view_type="form"/>
-        <menuitem  name="Events" id="event_main_menu"/>
-        <menuitem name="Events Organisation" id="base.menu_event_main" parent="event_main_menu" />
 
-    <!-- EVENTS  -->
+        <menuitem name="Events" id="event_main_menu" sequence="80"/>
+        <menuitem name="Events Organisation" id="base.menu_event_main" parent="event_main_menu"/>
 
-    <!-- EVENTS/CONFIGURATION/TYPE OF EVENTS -->
+        <!-- EVENTS  -->
+
+        <!-- EVENTS/CONFIGURATION/TYPE OF EVENTS -->
         <record model="ir.ui.view" id="view_event_type_form">
             <field name="name">Event type</field>
             <field name="model">event.type</field>
@@ -52,7 +53,7 @@
         <menuitem name="Configuration" id="base.menu_marketing_config_root" parent="event_main_menu" sequence="30"/>
         <menuitem name="Types of Events" id="menu_event_type" action="action_event_type" parent="base.menu_marketing_config_root" groups="base.group_no_one"/>
 
-    <!-- Events Organisation/CONFIGURATION/EVENTS -->
+        <!-- Events Organisation/CONFIGURATION/EVENTS -->
 
         <!-- Event Read/Unread actions -->
         <record id="actions_server_event_event_unread" model="ir.actions.server">
@@ -111,7 +112,7 @@
                         <div class="oe_title">
                             <label for="name" class="oe_edit_only"/>
                             <h1><field name="name"/></h1>
-                        </div> 
+                        </div>
                         <div>
                             <h2>From <field name="date_begin" class="oe_inline" /> to <field name="date_end" class="oe_inline"/>
                             </h2>
@@ -151,7 +152,7 @@
                                     </group>
                                     <group>
                                         <field name="register_attended"/>
-                                    </group> 
+                                    </group>
                                 </group>
                                 <field name="registration_ids" colspan="4" nolabel="1" groups="event.group_event_manager,event.group_event_user">
                                     <tree string="Registration" editable="top">
@@ -222,7 +223,7 @@
 
         <!-- Event Kanban View -->
 
-    <record model="ir.ui.view" id="view_event_kanban">
+        <record model="ir.ui.view" id="view_event_kanban">
             <field name="name">event.event.kanban</field>
             <field name="model">event.event</field>
             <field name="type">kanban</field>
@@ -286,7 +287,7 @@
             </field>
         </record>
 
-      <!-- Events  Calendar  View -->
+        <!-- Events  Calendar  View -->
 
         <record id="view_event_calendar" model="ir.ui.view">
             <field name="name">event.event.calendar</field>
@@ -316,7 +317,7 @@
             </field>
         </record>
 
-    <!-- Event Search View -->
+        <!-- Event Search View -->
 
         <record model="ir.ui.view" id="view_event_search">
             <field name="name">Events</field>
@@ -362,7 +363,7 @@
 
 
         <!-- Events Organisation/CONFIGURATION/EVENTS  -->
-       <record model="ir.actions.act_window" id="action_event_view">
+        <record model="ir.actions.act_window" id="action_event_view">
            <field name="name">Events</field>
            <field name="type">ir.actions.act_window</field>
            <field name="res_model">event.event</field>
@@ -371,9 +372,9 @@
            <field name="context">{"search_default_upcoming":1}</field>
            <field name="search_view_id" ref="view_event_search"/>
            <field name="help">Event is the low level object used by meeting and others documents that should be synchronized with mobile devices or calendar applications through caldav. Most of the users should work in the Calendar menu, and not in the list of events.</field>
-       </record>
+        </record>
 
-      <act_window
+        <act_window
             id="act_register_event_partner"
             name="Subscribe"
             res_model="event.registration"
@@ -382,9 +383,9 @@
             context="{'search_default_partner_id': [active_id], 'default_partner_id': active_id}"
             view_type="form"/>
 
-       <menuitem name="Events" id="menu_event_event" action="action_event_view" parent="base.menu_event_main" />
+        <menuitem name="Events" id="menu_event_event" action="action_event_view" parent="base.menu_event_main" />
 
-    <!-- EVENTS/REGISTRATIONS/EVENTS  -->
+        <!-- EVENTS/REGISTRATIONS/EVENTS  -->
 
         <!-- Registration Read/Unread actions -->
         <record id="actions_server_event_registration_unread" model="ir.actions.server">
diff --git a/addons/hr/hr_view.xml b/addons/hr/hr_view.xml
index 54ced534880..6e798449fba 100644
--- a/addons/hr/hr_view.xml
+++ b/addons/hr/hr_view.xml
@@ -2,7 +2,7 @@
 <openerp>
     <data>
 
-        <menuitem id="menu_hr_root" icon="terp-hr" name="Human Resources" sequence="15"
+        <menuitem id="menu_hr_root" icon="terp-hr" name="Human Resources" sequence="110"
             web_icon="images/hr.png"
             web_icon_hover="images/hr-hover.png"
             groups="base.group_hr_manager,base.group_hr_user,base.group_user"/>
@@ -20,7 +20,7 @@
             <field name="arch" type="xml">
                 <form string="Employee" version="7.0">
                     <sheet>
-                        <field name="photo" widget='image' class="oe_right" on_change="onchange_photo(photo)"/>    
+                        <field name="photo" widget='image' class="oe_right" on_change="onchange_photo(photo)"/>
                         <div class="oe_title">
                             <label for="name" class="oe_edit_only"/>
                             <h1>
@@ -213,7 +213,7 @@
             <field name="view_mode">form</field>
             <field name="view_id" ref="view_employee_form"/>
             <field name="act_window_id" ref="open_view_employee_list_my"/>
-        </record> 
+        </record>
 
         <menuitem action="open_view_employee_list_my" id="menu_open_view_employee_list_my" sequence="3" parent="menu_hr_main"/>
 
@@ -418,8 +418,8 @@
                 <search string="Jobs">
                     <field name="name" string="Job"/>
                     <separator orientation="vertical"/>
-                    <filter icon="terp-camera_test"  
-                            domain="[('state','=','open')]" 
+                    <filter icon="terp-camera_test"
+                            domain="[('state','=','open')]"
                             string="In Position"
                             help="In Position"/>
                     <filter icon="terp-personal+"  domain="[('state','=','recruit')]" string="In Recruitment"
@@ -435,7 +435,7 @@
                 </search>
             </field>
         </record>
-        
+
         <record id="view_hr_job_employee_form" model="ir.ui.view">
             <field name="name">hr.job.employee.form</field>
             <field name="model">hr.job</field>
@@ -452,7 +452,7 @@
                 </form>
             </field>
         </record>
-        
+
         <record model="ir.actions.act_window" id="action_hr_job">
             <field name="name">Job Positions</field>
             <field name="res_model">hr.job</field>
diff --git a/addons/knowledge/knowledge_view.xml b/addons/knowledge/knowledge_view.xml
index cdc176b347f..b2eefd90cce 100644
--- a/addons/knowledge/knowledge_view.xml
+++ b/addons/knowledge/knowledge_view.xml
@@ -1,7 +1,7 @@
 <openerp>
 <data>
     <menuitem name="Knowledge" icon="terp-stock" id="knowledge.menu_document"
-              sequence="19" groups="base.group_system,base.group_document_user"
+              sequence="130" groups="base.group_system,base.group_document_user"
               web_icon="images/knowledge.png"
               web_icon_hover="images/knowledge-hover.png"/>
     <menuitem name="Configuration" id="knowledge.menu_document_configuration" parent="knowledge.menu_document" sequence="50"/>
diff --git a/addons/mail/mail_thread_view.xml b/addons/mail/mail_thread_view.xml
index a32045efafc..f15141d3711 100644
--- a/addons/mail/mail_thread_view.xml
+++ b/addons/mail/mail_thread_view.xml
@@ -3,9 +3,9 @@
     <data>
 
         <!-- toplevel menu -->
-        <menuitem id="mail_feeds_main" name="Feeds" sequence="0"
+        <menuitem id="mail_feeds_main" name="Feeds" sequence="10"
             web_icon="static/src/img/feeds.png"
-            web_icon_hover="static/src/img/feeds-hover.png" 
+            web_icon_hover="static/src/img/feeds-hover.png"
             groups="base.group_user"/>
 
         <!-- left-side menu: Feeds !-->
diff --git a/addons/marketing/marketing_view.xml b/addons/marketing/marketing_view.xml
index a697d586cd4..e9ee0a11e97 100644
--- a/addons/marketing/marketing_view.xml
+++ b/addons/marketing/marketing_view.xml
@@ -2,11 +2,10 @@
 <openerp>
     <data>
 
-        <menuitem
-            name="Marketing"
+        <menuitem name="Marketing"
             icon="terp-crm"
             id="base.marketing_menu"
-            sequence="17"
+            sequence="120"
             groups="marketing.group_marketing_user,marketing.group_marketing_manager"
             web_icon="images/marketing.png"
             web_icon_hover="images/marketing-hover.png"/>
diff --git a/addons/membership/membership_view.xml b/addons/membership/membership_view.xml
index 9c566a69bde..6a421130544 100644
--- a/addons/membership/membership_view.xml
+++ b/addons/membership/membership_view.xml
@@ -2,8 +2,6 @@
 <openerp>
     <data>
 
-
-
         <!-- MEMBERSHIP -->
 
         <!-- MEMBERSHIP/MEMBERSHIP PRODUCTS -->
@@ -71,7 +69,7 @@
                             <group>
                                 <label for="membership_date_from" string="Membership Duration"/>
                                 <div>
-                                    <field name="membership_date_from" required="1" class="oe_inline"/> - 
+                                    <field name="membership_date_from" required="1" class="oe_inline"/> -
                                     <field name="membership_date_to" required="1" class="oe_inline"/>
                                 </div>
                                 <field name="list_price" string="Membership Fee"/>
@@ -133,7 +131,7 @@
             <field name="act_window_id" ref="action_membership_products"/>
         </record>
 
-        <menuitem name="Association" id="base.menu_association" icon="terp-calendar" sequence="9"/>
+        <menuitem name="Association" id="base.menu_association" icon="terp-calendar" sequence="70"/>
         <menuitem name="Members" id="menu_membership" sequence="0" parent="base.menu_association"/>
         <menuitem name="Configuration" id="base.menu_marketing_config_association"
             parent="base.menu_association" sequence="30"/>
@@ -282,7 +280,7 @@
         <!-- MEMBERSHIP/REPORTING -->
         <menuitem name="Reporting" id="base.menu_report_association" parent="base.menu_association" sequence="20"/>
 
-<!-- View for product.product object inherited from product module................ -->
+        <!-- View for product.product object inherited from product module -->
         <record model="ir.ui.view" id="view_product_form_inherit1">
             <field name="name">product.normal.form</field>
             <field name="type">form</field>
diff --git a/addons/mrp/mrp_view.xml b/addons/mrp/mrp_view.xml
index 86b0fcee0d5..ac6c82f6642 100644
--- a/addons/mrp/mrp_view.xml
+++ b/addons/mrp/mrp_view.xml
@@ -2,8 +2,8 @@
 <openerp>
     <data>
 
-        <menuitem icon="terp-mrp" id="base.menu_mrp_root" parent="" name="Manufacturing"
-            groups="group_mrp_user,group_mrp_manager" sequence="8"
+        <menuitem icon="terp-mrp" id="base.menu_mrp_root" name="Manufacturing"
+            groups="group_mrp_user,group_mrp_manager" sequence="60"
             web_icon="images/manufacturing.png"
             web_icon_hover="images/manufacturing-hover.png"/>
 
@@ -336,7 +336,7 @@
                     <sheet>
                         <label for="product_id" string="Product and Quantity" class="oe_edit_only"/>
                         <h1>
-                            <field name="product_id" on_change="onchange_product_id(product_id, name, context)" class="oe_inline"/>: 
+                            <field name="product_id" on_change="onchange_product_id(product_id, name, context)" class="oe_inline"/>:
                             <field name="product_qty" class="oe_inline"/>
                             <field name="product_uom" class="oe_inline" groups="product.group_uom"/>
                         </h1>
diff --git a/addons/point_of_sale/point_of_sale_view.xml b/addons/point_of_sale/point_of_sale_view.xml
index f3b491116b7..7f99599a04b 100644
--- a/addons/point_of_sale/point_of_sale_view.xml
+++ b/addons/point_of_sale/point_of_sale_view.xml
@@ -1,6 +1,7 @@
 <?xml version="1.0"?>
 <openerp>
     <data>
+
         <menuitem name="PoS Backend" id="menu_point_root" sequence="20"
             icon="terp-partner"
             groups="group_pos_manager"
@@ -8,7 +9,7 @@
             web_icon_hover="images/pos-hover.png"/>
 
         <record id="categ_others" model="pos.category">
-          <field name="name">Others</field>
+            <field name="name">Others</field>
         </record>
 
         <record model="ir.ui.view" id="view_pos_pos_form">
@@ -16,7 +17,7 @@
             <field name="model">pos.order</field>
             <field name="type">form</field>
             <field name="arch" type="xml">
-                <form string="Point of Sale Orders" version="7.0"> 
+                <form string="Point of Sale Orders" version="7.0">
                     <div class="oe_form_topbar">
                         <button name="%(action_pos_payment)d" string="Payment" icon="gtk-apply" type="action" states="draft" context="{'pos_session_id' : session_id}"/>
                         <button name="action_invoice" string="Invoice" icon="gtk-apply" type="object" states="paid" attrs="{'readonly': [('partner_id','=',False)]}"/>
@@ -27,7 +28,7 @@
                                 <field name="state" nolabel="1" widget="statusbar" statusbar_visible="draft,paid,done" statusbar_colors='{"cancel":"red"}'/>
                             </div>
                     </div>
-                    <sheet> 
+                    <sheet>
                     <group col="4" colspan="4">
                         <field name="name"/>
                         <field name="date_order"/>
@@ -748,10 +749,15 @@
             <field name="tag">pos.ui</field>
         </record>
 
+        <!--
+            right now it's not possible to directly call a client action
+            from a menuitem, so we can't use this shortcut element and
+            use an explicit record element instead
+        -->
         <record id="menu_point_root_touchscreen" model="ir.ui.menu">
-          <field name="name">Point of Sale</field>
-          <field name="sequence" eval="21"/>
-          <field name="action" ref="action_pos_pos"/>
+            <field name="name">Point of Sale</field>
+            <field name="sequence">160</field>
+            <field name="action" ref="action_pos_pos"/>
         </record>
 
         <!-- use menuitem to add web_icon and web_icon_hover above -->
@@ -842,12 +848,12 @@
         </record>
 
 
-        <act_window 
-            id="act_pos_config_sessions" 
+        <act_window
+            id="act_pos_config_sessions"
             name="Sessions"
             src_model="pos.config"
             res_model="pos.session"
-            domain="[('config_id', '=', active_id)]" />         
+            domain="[('config_id', '=', active_id)]" />
 
         <record model="ir.actions.act_window" id="action_pos_config_pos">
             <field name="name">Point of Sales</field>
@@ -864,8 +870,8 @@
             id="menu_pos_config_pos"
             groups="group_pos_manager"/>
 
-        <act_window 
-            id="act_pos_session_orders" 
+        <act_window
+            id="act_pos_session_orders"
             name="Orders"
             src_model="pos.session"
             res_model="pos.order"
@@ -878,10 +884,10 @@
             <field name="model">pos.session</field>
             <field name="type">form</field>
             <field name="arch" type="xml">
-                <form string="Point of Sale Session" version="7.0">  
+                <form string="Point of Sale Session" version="7.0">
                     <header>
-                        <button name="open" type="workflow" string="Validate &amp; Open Session" states="opening_control" /> 
-                        <button name="cashbox_control" type="workflow" string="End of Session" states="opened" /> 
+                        <button name="open" type="workflow" string="Validate &amp; Open Session" states="opening_control" />
+                        <button name="cashbox_control" type="workflow" string="End of Session" states="opened" />
                         <button name="close" type="workflow" string="Validate &amp; Close" states="closing_control,opened" />
 
                         <div class="oe_right">
diff --git a/addons/project/project_view.xml b/addons/project/project_view.xml
index 26814892775..145af6f34ad 100644
--- a/addons/project/project_view.xml
+++ b/addons/project/project_view.xml
@@ -2,16 +2,16 @@
 <openerp>
     <data>
 
-        <menuitem
+        <menuitem name="Project"
             icon="terp-project" id="base.menu_main_pm"
-            name="Project" sequence="10"
+            sequence="90"
             groups="group_project_manager,group_project_user"
             web_icon="images/project.png"
             web_icon_hover="images/project-hover.png"/>
 
         <menuitem id="menu_project_management" name="Project" parent="base.menu_main_pm" sequence="1"/>
         <menuitem id="base.menu_definitions" name="Configuration" parent="base.menu_main_pm" sequence="60"/>
-        
+
         <act_window
             context="{'search_default_project_id': [active_id], 'default_project_id': active_id}"
             id="act_project_project_2_project_task_all"
@@ -157,7 +157,7 @@
             <field name="arch" type="xml">
                 <search string="Search Project">
                    <group>
-                       <field name="complete_name" string="Project Name"/> 
+                       <field name="complete_name" string="Project Name"/>
                        <separator orientation="vertical"/>
                        <filter icon="terp-mail-message-new"
                            string="Inbox" help="Unread messages"
@@ -545,7 +545,7 @@
                                                     ,[5, (hours gte 5 and hours lt 10)]
                                                     ,[10, (hours gte 10)]
                                                 ]"/>
-                                                <t t-foreach="times" t-as="time"><a 
+                                                <t t-foreach="times" t-as="time"><a
                                                     t-if="!time[1]" t-attf-data-name="set_remaining_time_#{time[0]}" type="object" class="oe_kanban_button"><t t-esc="time[0]"/></a><b
                                                     t-if="time[1]" class="oe_kanban_button oe_kanban_button_active"><t t-esc="Math.round(hours)"/></b></t>
                                                 <a name="do_open" states="draft" string="Validate planned time" type="object" class="oe_kanban_button oe_kanban_button_active">!</a>
@@ -652,7 +652,7 @@
                         <filter name="project" string="Project" domain="[('project_id.user_id','=',uid)]" help="My Projects" icon="terp-check"/>
                         <filter string="My Tasks" domain="[('user_id','=',uid)]"  help="My Tasks" icon="terp-personal" />
                         <filter string="Unassigned Tasks" domain="[('user_id','=',False)]"  help="Unassigned Tasks" icon="terp-personal-" />
-                        <filter string="Deadlines" context="{'deadline_visible': False}" domain="[('date_deadline','&lt;&gt;',False)]" 
+                        <filter string="Deadlines" context="{'deadline_visible': False}" domain="[('date_deadline','&lt;&gt;',False)]"
                             help="Show only tasks having a deadline" icon="terp-gnome-cpu-frequency-applet+"/>
                         <separator orientation="vertical"/>
                         <field name="project_id"/>
@@ -675,7 +675,7 @@
                 </search>
             </field>
         </record>
-        
+
         <record id="analytic_account_inherited_form" model="ir.ui.view">
             <field name="name">account.analytic.account.form.inherit</field>
             <field name="model">account.analytic.account</field>
@@ -827,5 +827,6 @@
 
       <!--     User Form-->
         <act_window context="{'search_default_user_id': [active_id], 'default_user_id': active_id}" domain="[('state', '&lt;&gt;', 'cancelled'),('state', '&lt;&gt;', 'done')]" id="act_res_users_2_project_task_opened" name="Assigned Tasks" res_model="project.task" src_model="res.users" view_mode="tree,form,gantt,calendar,graph" view_type="form"/>
+
     </data>
 </openerp>
diff --git a/addons/purchase/purchase_view.xml b/addons/purchase/purchase_view.xml
index 100c60e3f53..144ee741cb5 100644
--- a/addons/purchase/purchase_view.xml
+++ b/addons/purchase/purchase_view.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <openerp>
     <data>
-       <menuitem icon="terp-purchase" id="base.menu_purchase_root" name="Purchases" sequence="3"
+       <menuitem icon="terp-purchase" id="base.menu_purchase_root" name="Purchases" sequence="40"
            groups="group_purchase_manager,group_purchase_user"
            web_icon="images/purchases.png"
            web_icon_hover="images/purchases-hover.png"/>
@@ -222,7 +222,7 @@
                                 <field name="amount_tax"/>
                                 <div class="oe_subtotal_footer_separator oe_inline">
 				    <label for="amount_total"/>
-                                    <button name="button_dummy" 
+                                    <button name="button_dummy"
 				    	states="draft" string="(update)" type="object" class="oe_edit_only oe_link"/>
                                 </div>
 			        <field name="amount_total" nolabel="1" class="oe_subtotal_footer_separator"/>
diff --git a/addons/sale/sale_view.xml b/addons/sale/sale_view.xml
index e7420edb910..c1a8ea22d8b 100644
--- a/addons/sale/sale_view.xml
+++ b/addons/sale/sale_view.xml
@@ -1,6 +1,6 @@
 <openerp>
     <data>
-        <menuitem icon="terp-partner" id="base.menu_base_partner" name="Sales" sequence="1" groups="base.group_sale_salesman,base.group_sale_manager"/>
+        <menuitem icon="terp-partner" id="base.menu_base_partner" name="Sales" sequence="30" groups="base.group_sale_salesman,base.group_sale_manager"/>
         <menuitem id="base.menu_product" name="Products" parent="base.menu_base_partner" sequence="9"/>
 
 
@@ -197,7 +197,7 @@
                                         <group>
                                             <field name="product_id"
                                                 context="{'partner_id':parent.partner_id, 'quantity':product_uom_qty, 'pricelist':parent.pricelist_id, 'shop':parent.shop_id, 'uom':product_uom}"
-                                                groups="base.group_user" 
+                                                groups="base.group_user"
                                                 on_change="product_id_change(parent.pricelist_id,product_id,product_uom_qty,product_uom,product_uos_qty,product_uos,name,parent.partner_id, False, True, parent.date_order, product_packaging, parent.fiscal_position, False, context)"/>
                                             <label for="product_uom_qty"/>
                                             <div>
diff --git a/addons/stock/stock_view.xml b/addons/stock/stock_view.xml
index 432b3ce365b..38b5d677c6b 100644
--- a/addons/stock/stock_view.xml
+++ b/addons/stock/stock_view.xml
@@ -3,7 +3,7 @@
     <data>
 
         <menuitem icon="terp-stock" id="menu_stock_root" name="Warehouse"
-                  groups="group_stock_manager,group_stock_user" sequence="5"
+                  groups="group_stock_manager,group_stock_user" sequence="50"
                   web_icon="images/warehouse.png"
                   web_icon_hover="images/warehouse-hover.png"/>
         <menuitem id="menu_stock_warehouse_mgmt" name="Receive/Deliver By Orders" parent="menu_stock_root" sequence="1"/>
@@ -123,7 +123,7 @@
                 <sheet>
                     <div class="oe_title">
                         <div class="oe_edit_only">
-                            <label for="name"  /> 
+                            <label for="name"  />
                         </div>
                         <h1>
                             <field name="name" placeholder="Annual inventory"/>
@@ -1238,9 +1238,9 @@
                             </div>
                             <label for="product_uso_qty" />
                             <div>
-                                <field name="product_uos_qty" 
-                                    groups="product.group_uos" 
-                                    on_change="onchange_uos_quantity(product_id, product_uos_qty, product_uos, product_uom)" 
+                                <field name="product_uos_qty"
+                                    groups="product.group_uos"
+                                    on_change="onchange_uos_quantity(product_id, product_uos_qty, product_uos, product_uom)"
                                     class="oe_inline"/>
                                 <field name="product_uos" groups="product.group_uos" colspan="4" class="oe_inline"/>
                             </div>
@@ -1419,7 +1419,7 @@
                         <label for="product_qty"/>
                         <div>
                             <field name="product_qty" on_change="onchange_quantity(product_id, product_qty, product_uom, product_uos)" class="oe_inline"/>
-                            <field name="product_uom" string="Unit Of Measure" groups="product.group_uom" class="oe_inline"/> 
+                            <field name="product_uom" string="Unit Of Measure" groups="product.group_uom" class="oe_inline"/>
                             <button name="%(stock.move_scrap)d"
                                 string="Scrap" type="action"
                                 icon="gtk-convert" context="{'scrap': True}"
diff --git a/addons/survey/survey_view.xml b/addons/survey/survey_view.xml
index 20f6f42a929..fb4b232f512 100644
--- a/addons/survey/survey_view.xml
+++ b/addons/survey/survey_view.xml
@@ -1,14 +1,16 @@
 <?xml version="1.0" encoding="utf-8"?>
 <openerp>
     <data>
-            <menuitem name="Surveys" id="menu_surveys" parent="base.menu_tools" sequence="2" groups="base.group_tool_user,base.group_tool_manager,base.group_survey_user"/>
-            <menuitem name="Define Surveys" id="menu_define_survey"
-                 groups="base.group_tool_manager"
-                 parent="menu_surveys" />
-            <menuitem id="menu_answer_surveys" name="Answer Surveys" parent="menu_surveys" groups="base.group_tool_user,base.group_tool_manager,base.group_survey_user"/>
-            <menuitem name="Reporting" parent="base.menu_tools"
-                id="base.menu_lunch_reporting" sequence="6"/>
-            <menuitem name="Reporting" id="menu_reporting" parent="menu_surveys" sequence="60"/>
+
+        <menuitem name="Surveys" id="menu_surveys" parent="base.menu_tools" sequence="2" groups="base.group_tool_user,base.group_tool_manager,base.group_survey_user"/>
+        <menuitem name="Define Surveys" id="menu_define_survey"
+             groups="base.group_tool_manager"
+             parent="menu_surveys" />
+        <menuitem id="menu_answer_surveys" name="Answer Surveys" parent="menu_surveys" groups="base.group_tool_user,base.group_tool_manager,base.group_survey_user"/>
+        <menuitem name="Reporting" parent="base.menu_tools"
+            id="base.menu_lunch_reporting" sequence="6"/>
+        <menuitem name="Reporting" id="menu_reporting" parent="menu_surveys" sequence="60"/>
+
         <!--
             Survey
         -->
@@ -269,7 +271,7 @@
             </field>
         </record>
 
-       <record id="survey_search" model="ir.ui.view">
+        <record id="survey_search" model="ir.ui.view">
             <field name="name">survey_search</field>
             <field name="model">survey</field>
             <field name="type">search</field>
@@ -295,7 +297,7 @@
                </search>
             </field>
         </record>
-        
+
         <record model="ir.ui.view" id="view_survey_kanban">
             <field name="name">event.survey.kanban</field>
             <field name="model">survey</field>
@@ -750,7 +752,7 @@
             </field>
         </record>
 
-       <record id="survey_question_search" model="ir.ui.view">
+        <record id="survey_question_search" model="ir.ui.view">
             <field name="name">survey_question_search</field>
             <field name="model">survey.question</field>
             <field name="type">search</field>