diff --git a/addons/base_setup/base_setup_views.xml b/addons/base_setup/base_setup_views.xml
index 0692b4f651c..2e062ecafcc 100644
--- a/addons/base_setup/base_setup_views.xml
+++ b/addons/base_setup/base_setup_views.xml
@@ -45,25 +45,25 @@
         <field name="model">sale.config.settings</field>
         <field name="type">form</field>
         <field name="arch" type="xml">
-            <form string="Configure Sales" layout="manual">
+            <form string="Configure Sales">
                 <header>
                     <button string="Apply" type="object" name="execute"/>
                     <button string="Cancel" special="cancel"/>
                 </header>
-                <sheet layout="auto">
+                <sheet>
                     <group>
                         <group name="config_sale" colspan="4"/>
 
                         <!-- this part is necessary to allow the plugins to extend the view -->
                         <field name="module_crm" invisible="1"/>
-                        <group name="config_fetchmail" colspan="4" attrs="{'invisible': [('module_crm','=',False)]}">
+                        <group name="config_fetchmail" colspan="2" attrs="{'invisible': [('module_crm','=',False)]}">
                             <separator string="Emails"/>
                         </group>
                         <field name="module_plugin_thunderbird" attrs="{'invisible': [('module_crm','=',False)]}"/>
                         <newline/>
                         <field name="module_plugin_outlook" attrs="{'invisible': [('module_crm','=',False)]}"/>
 
-                        <group name="config_crm" colspan="4"/>
+                        <group name="config_crm" colspan="2"/>
                     </group>
                 </sheet>
             </form>
diff --git a/addons/base_setup/res_config_view.xml b/addons/base_setup/res_config_view.xml
index ccf231924fe..7752f3ed5ac 100644
--- a/addons/base_setup/res_config_view.xml
+++ b/addons/base_setup/res_config_view.xml
@@ -6,24 +6,26 @@
             <field name="model">base.config.settings</field>
             <field name="type">form</field>
             <field name="arch" type="xml">
-                <form string="General Settings" layout="manual">
+                <form string="General Settings">
                     <header>
                         <button string="Apply" type="object" name="execute"/>
                         <button string="Cancel" special="cancel"/>
                     </header>
-                    <sheet layout="auto">
-                        <separator string="Company Settings" colspan="4"/>
-                        <field name="module_multi_company"/>
+                    <group>
+                        <group string="Company Settings">
+                            <field name="module_multi_company"/>
+                        </group>
 
-                        <separator string="Others" colspan="4"/>
-                        <label string="Outgoing Mail Servers"/>
-                        <button type="action" name="%(base.action_ir_mail_server_list)d"
-                            string="Configure" icon="gtk-execute"/>
-                        <newline/>
-                        <field name="module_share"/>
-                        <newline/>
-                        <field name="module_portal"/>
-                    </sheet>
+                        <group string="Others">
+                            <label string="Outgoing Mail Servers"/>
+                            <button type="action" name="%(base.action_ir_mail_server_list)d"
+                                string="Configure" icon="gtk-execute"/>
+                        </group>
+                        <group string="External Accesses">
+                            <field name="module_share"/>
+                            <field name="module_portal"/>
+                        </group>
+                    </group>
                 </form>
             </field>
         </record>
diff --git a/addons/project/project.py b/addons/project/project.py
index e7af9f49b7d..54e80e79b52 100644
--- a/addons/project/project.py
+++ b/addons/project/project.py
@@ -923,7 +923,6 @@ class task(base_stage, osv.osv):
     
     def case_close(self, cr, uid, ids, context=None):
         """ Closes Task """
-        request = self.pool.get('res.request')
         if not isinstance(ids, list): ids = [ids]
         for task in self.browse(cr, uid, ids, context=context):
             vals = {}
@@ -956,7 +955,6 @@ class task(base_stage, osv.osv):
         return self.case_cancel(cr, uid, ids, context=context)
     
     def case_cancel(self, cr, uid, ids, context=None):
-        request = self.pool.get('res.request')
         tasks = self.browse(cr, uid, ids, context=context)
         self._check_child_task(cr, uid, ids, context=context)
         for task in tasks: