diff --git a/addons/account_analytic_plans/account_analytic_plans_installer_view.xml b/addons/account_analytic_plans/account_analytic_plans_installer_view.xml
index c9d21147458..c6879774078 100644
--- a/addons/account_analytic_plans/account_analytic_plans_installer_view.xml
+++ b/addons/account_analytic_plans/account_analytic_plans_installer_view.xml
@@ -7,14 +7,15 @@
         <field name="res_model">account.analytic.plan</field>
         <field name="view_type">form</field>
         <field name="view_mode">tree,form</field>
-        <field name="view_id" ref="account_analytic_plans.account_analytic_plan_form"/>
+        <field name="view_id" eval="False"/>
+        <field name="help">To setup a multiple analytic plans environment, you must define the root analytic accounts for each plan set. Then, you must attach a plan set to your account journals.</field>
+    </record>
+
+    <record id="account_analytic_plan_installer_todo" model="ir.actions.todo">
+        <field name="action_id" ref="account_analytic_plan_form_action_installer"/>
+        <field name="category_id" ref="account.category_accounting_configuration"/>
+        <field name="sequence">15</field>
     </record>
-        
-   <record id="account_analytic_plan_installer_todo" model="ir.actions.todo">
-      <field name="action_id" ref="account_analytic_plan_form_action_installer"/>
-      <field name="category_id" ref="account.category_accounting_configuration"/>
-      <field name="sequence">15</field>
-  </record>
 
   </data>
 </openerp>
diff --git a/addons/delivery/delivery.py b/addons/delivery/delivery.py
index 0a0abc92259..437e2ab6f80 100644
--- a/addons/delivery/delivery.py
+++ b/addons/delivery/delivery.py
@@ -255,11 +255,8 @@ class define_delivery_steps(osv.osv_memory):
 
     def apply_cb(self, cr, uid, ids, context=None):
         ir_values_obj = self.pool.get('ir.values')
-
         wizard = self.browse(cr, uid, ids, context=context)[0]
-
         ir_values_obj.set(cr, uid, 'default', False, 'picking_policy', ['sale.order'], wizard.picking_policy)
-
         return {'type' : 'ir.actions.act_window_close'}
 
 define_delivery_steps()
diff --git a/addons/delivery/delivery_view.xml b/addons/delivery/delivery_view.xml
index 4d92e6aa125..5daa6534c55 100644
--- a/addons/delivery/delivery_view.xml
+++ b/addons/delivery/delivery_view.xml
@@ -342,9 +342,9 @@
             <field name="model">delivery.define.delivery.steps.wizard</field>
             <field name="type">form</field>
             <field name="arch" type="xml">
-                <form string="Define Delivery Steps">
-                    <label string="" />
+                <form string="Setup Your Delivery Steps">
                     <field name="picking_policy" />
+                    <separator string="" colspan="4"/>
                     <group colspan="4">
                         <button string="Cancel" icon="gtk-cancel" special="cancel" />
                         <button string="Apply" icon="gtk-apply" name="apply_cb" type="object" />
diff --git a/addons/mrp/mrp_installer.xml b/addons/mrp/mrp_installer.xml
index af2a35b3ce7..33ef333d8ca 100644
--- a/addons/mrp/mrp_installer.xml
+++ b/addons/mrp/mrp_installer.xml
@@ -40,16 +40,8 @@
         <field name="groups_id" eval="[(6, 0, [ref('base.group_extended')])]" />
     </record>
 
-    <record id="action_create_bill_of_materials" model="ir.actions.act_window">
-        <field name="name">Create Bill of Materials</field>
-        <field name="type">ir.actions.act_window</field>
-        <field name="res_model">mrp.bom</field>
-        <field name="view_mode">form,tree</field>
-        <field name="view_type">form</field>
-    </record>
-
     <record id="todo_action_create_bill_of_materials" model="ir.actions.todo">
-        <field name="action_id" ref="action_create_bill_of_materials" />
+        <field name="action_id" ref="mrp_bom_form_action" />
         <field name="category_id" ref="category_mrp_config" />
     </record>