diff --git a/bin/addons/base/base_menu.xml b/bin/addons/base/base_menu.xml
index 31ddb5df1f1..b37b78f6740 100644
--- a/bin/addons/base/base_menu.xml
+++ b/bin/addons/base/base_menu.xml
@@ -21,7 +21,8 @@
             groups="base.group_extended"/>
         <menuitem id="menu_management" name="Modules" parent="base.menu_administration" sequence="10"
             groups="base.group_extended"/>
-        <menuitem icon="terp-graph" id="reporting_menu" name="Reporting" sequence="45"
-            groups="group_extended"/>
+        <menuitem icon="STOCK_OPEN" id="reporting_menu"
+            parent="base.menu_custom" name="Reporting" sequence="30"
+             />
     </data>
 </openerp>
diff --git a/bin/addons/base/ir/ir.xml b/bin/addons/base/ir/ir.xml
index 8f5a1f0da4a..17e9eccda8a 100644
--- a/bin/addons/base/ir/ir.xml
+++ b/bin/addons/base/ir/ir.xml
@@ -2062,14 +2062,7 @@
         </record>
         <menuitem id="next_id_11" name="Configuration Wizards" parent="base.menu_config" sequence="1"/>
 
-        <wizard id="wizard_configuration" model="ir.module.module" name="module.configuration" string="Start Configuration"/>
         <menuitem action="act_ir_actions_todo_form" id="menu_ir_actions_todo_form"
                 parent="next_id_11" groups="base.group_extended" sequence="20"/>
-
-        <menuitem
-            action="wizard_configuration" name="Start Configuration"
-            id="menu_configurator_module" parent="next_id_11"
-            type="wizard"/>
-
     </data>
 </openerp>
diff --git a/bin/addons/base/ir/workflow/workflow_view.xml b/bin/addons/base/ir/workflow/workflow_view.xml
index 3fb98efb8f9..c3e5c3f3c98 100644
--- a/bin/addons/base/ir/workflow/workflow_view.xml
+++ b/bin/addons/base/ir/workflow/workflow_view.xml
@@ -15,11 +15,11 @@
       <field name="type">form</field>
       <field name="arch" type="xml">
         <form string="Workflow">
-        	<group col="6" colspan="4" >
-          		<field name="name"/>
-          		<field name="osv"/>
-          		<field name="on_create"/>
-          	</group>
+            <group col="6" colspan="4" >
+                  <field name="name"/>
+                  <field name="osv"/>
+                  <field name="on_create"/>
+              </group>
           <separator colspan="4" string="Activities"/>
           <field colspan="4" name="activities" nolabel="1"/>
         </form>
@@ -94,10 +94,10 @@
       <field name="type">form</field>
       <field name="arch" type="xml">
         <form string="Activity">
-        	<group col="6" colspan="4">
-            	<field name="name"/>
-            	<field name="wkf_id"/>
-            	<field name="kind"/>
+            <group col="6" colspan="4">
+                <field name="name"/>
+                <field name="wkf_id"/>
+                <field name="kind"/>
             </group>
           <group  colspan="2">
             <field name="flow_start"/>
@@ -181,9 +181,9 @@
           <field name="action_id"/>
           <field name="action"/>
           <newline/>
-	          <group expand="0" string="Group By...">
-        	      <filter string="Workflow" icon="terp-stock_align_left_24" domain="[]" context="{'group_by':'wkf_id'}"/>
-    	      </group>
+              <group expand="0" string="Group By...">
+                  <filter string="Workflow" icon="terp-stock_align_left_24" domain="[]" context="{'group_by':'wkf_id'}"/>
+              </group>
         </search>
       </field>
     </record>
@@ -210,14 +210,14 @@
       <field name="type">form</field>
       <field name="arch" type="xml">
         <form string="Transition">
-        	<group col="6" colspan ="4">
-            	<field name="act_from"/>
-            	<field name="act_to"/>
-            	<field name="signal"/>
-            	<field name="condition"/>
-            	<field name="trigger_model"/>
-          	    <field name="trigger_expr_id"/>
-            	<field name="role_id"/>
+            <group col="6" colspan ="4">
+                <field name="act_from"/>
+                <field name="act_to"/>
+                <field name="signal"/>
+                <field name="condition"/>
+                <field name="trigger_model"/>
+                  <field name="trigger_expr_id"/>
+                <field name="role_id"/>
             </group>
         </form>
       </field>
@@ -299,6 +299,8 @@
       <field name="type">search</field>
       <field name="arch" type="xml">
         <search string="Workflow Instances">
+          <filter icon="terp-camera_test" string="Active" domain="[('state','=','active')]" name="active"/>
+          <separator orientation="vertical"/>
           <field name="wkf_id"/>
           <field name="uid"/>
           <field name="res_id"/>
@@ -313,6 +315,7 @@
       <field name="res_model">workflow.instance</field>
       <field name="view_type">form</field>
       <field name="view_id" ref="view_workflow_instance_tree"/>
+      <field name="context">{'search_default_active':1}</field>
       <field name="search_view_id" ref="view_workflow_instance_search"/>
     </record>
     <menuitem action="action_workflow_instance_form" id="menu_workflow_instance" parent="base.menu_low_workflow"/>
@@ -355,6 +358,8 @@
       <field name="type">search</field>
       <field name="arch" type="xml">
         <search string="Workflow Workitems">
+          <filter icon="terp-camera_test" string="Active" name="active" domain="[('state','=','active')]"/>
+          <separator orientation="vertical"/>
           <field name="act_id"/>
           <field name="subflow_id"/>
           <field name="inst_id"/>
@@ -368,6 +373,7 @@
       <field name="res_model">workflow.workitem</field>
       <field name="view_type">form</field>
       <field name="view_id" ref="view_workflow_workitem_tree"/>
+      <field name="context">{'search_default_active':1}</field>
       <field name="search_view_id" ref="view_workflow_workitem_search"/>
     </record>
     <menuitem action="action_workflow_workitem_form" id="menu_workflow_workitem" parent="base.menu_low_workflow"/>
diff --git a/bin/addons/base/res/res_request.py b/bin/addons/base/res/res_request.py
index bdbc6c0bdac..eceb670d17f 100644
--- a/bin/addons/base/res/res_request.py
+++ b/bin/addons/base/res/res_request.py
@@ -1,6 +1,6 @@
 # -*- coding: utf-8 -*-
 ##############################################################################
-#    
+#
 #    OpenERP, Open Source Management Solution
 #    Copyright (C) 2004-2009 Tiny SPRL (<http://tiny.be>).
 #
@@ -15,7 +15,7 @@
 #    GNU Affero General Public License for more details.
 #
 #    You should have received a copy of the GNU Affero General Public License
-#    along with this program.  If not, see <http://www.gnu.org/licenses/>.     
+#    along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #
 ##############################################################################
 
@@ -50,7 +50,7 @@ class res_request(osv.osv):
         return True
 
     def request_close(self, cr, uid, ids, *args):
-        self.write(cr, uid, ids, {'state':'closed', 'active':False})
+        self.write(cr, uid, ids, {'state':'closed'})
         return True
 
     def request_get(self, cr, uid):
@@ -113,7 +113,7 @@ class res_request_history(osv.osv):
         'name': lambda *a: 'NoName',
         'act_from': lambda obj,cr,uid,context={}: uid,
         'act_to': lambda obj,cr,uid,context={}: uid,
-        'date_sent': lambda *a: time.strftime('%Y-%m-%d %H:%M:%S'), 
+        'date_sent': lambda *a: time.strftime('%Y-%m-%d %H:%M:%S'),
     }
 res_request_history()
 
diff --git a/bin/addons/base/res/res_request_view.xml b/bin/addons/base/res/res_request_view.xml
index 2b1195df51c..53b7044f8ff 100644
--- a/bin/addons/base/res/res_request_view.xml
+++ b/bin/addons/base/res/res_request_view.xml
@@ -8,7 +8,7 @@
             <field name="model">res.request</field>
             <field name="type">tree</field>
             <field name="arch" type="xml">
-                <tree string="Requests" colors="blue:state in ('draft');gray:state in ('closed')">
+                <tree string="Requests" colors="blue:state in ('waiting');gray:state in ('closed')">
                     <field name="create_date"/>
                     <field name="act_from"/>
                     <field name="act_to"/>