diff --git a/addons/base_contact/base_contact.py b/addons/base_contact/base_contact.py
index f180bb4d1d9..a90411c20b9 100644
--- a/addons/base_contact/base_contact.py
+++ b/addons/base_contact/base_contact.py
@@ -79,7 +79,7 @@ class res_partner_address(osv.osv):
                 res.append((r['id'], r['partner_id'][1]))
             else:
                 addr = str('')
-                addr += "%s %s %s" % ( r.get('street', ''), r.get('zip', ''), r.get('city', '') )
+                addr += "%s %s %s" % ( r.get('street', '') or '', r.get('zip', '') or '', r.get('city', '') or '' )
                 res.append((r['id'], addr.strip() or '/'))
         return res
 
diff --git a/addons/hr_expense/hr_expense_view.xml b/addons/hr_expense/hr_expense_view.xml
index 5282704748c..1f07b6667e9 100644
--- a/addons/hr_expense/hr_expense_view.xml
+++ b/addons/hr_expense/hr_expense_view.xml
@@ -40,16 +40,18 @@
             <field name="model">hr.expense.expense</field>
             <field name="arch" type="xml">
                 <form string="Expenses Sheet">
-                    <notebook>
+                    <group colspan="4" col="6">
+                        <field name="name" select="1"/>
+                        <field name="employee_id" select="1"/>
+                        <field name="id" select="2"/>
+                        <field name="date" select="1"/>
+                        <field name="amount"/>
+                        <field name="currency_id"/>
+                    </group>
+                    <notebook colspan="4">
                         <page string="Expense Sheet">
-                            <field name="name" select="1"/>
-                            <field name="id" select="2"/>
-                            <field name="employee_id" select="1"/>
-                            <field name="date" select="1"/>
                             <field name="ref" select="2"/>
                             <newline/>
-                            <field name="amount"/>
-                            <field name="currency_id"/>
                             <field colspan="4" name="line_ids" nolabel="1">
                                 <form string="Expense Lines">
                                     <field name="product_id" on_change="onchange_product_id(product_id, uom_id)" select="2"/>