diff --git a/addons/project/project_view.xml b/addons/project/project_view.xml
index 2ee0bac76ab..b27e9dcbd1d 100644
--- a/addons/project/project_view.xml
+++ b/addons/project/project_view.xml
@@ -186,6 +186,10 @@
                                         <td width="60px" align="center" valign="top">
                                             <button name = "open_users" type="object" class="oe_project_buttons"><img t-att-src="kanban_image('res.users', 'avatar', record.user_id.raw_value[0])" height="40px" width="40px" /></button><br/>
                                             <div class="manager"><field name="user_id"/></div>
+                                            <t t-if="record.date.raw_value">
+                                                <kbd class="user">Deadline</kbd>
+                                                <div class="manager"><field name="date"/></div>
+                                            </t>
                                         </td>
                                         <td align="left" valign="middle" width="220px">
                                             <div class="oe_project_border">
@@ -204,26 +208,23 @@
                                             </div>
                                         </td>
                                         <td width="70px" valign="top" align="right">
-                                            <t t-if="record.date.raw_value">
-                                                <div class="sequence">
-                                                    <kbd class="user">Deadline</kbd>
-                                                    <div class="manager"><field name="date"/></div>
+                                                <div id="sequence">
+                                                    <!--<kbd class="user">Deadline</kbd>-->
+                                                    <!--<div class="manager"><field name="date"/></div>-->
                                                 </div>
-                                            </t>
                                         </td>
                                     </tr>
                                 </table>
                                 <table border="0" width="350px">
                                     <tr>
-                                        <td align="left" width="120px" valign="middle">
+                                        <td align="left" width="120px" valign="bottom">
                                             <div class="progress invoiced">
                                                 <t t-esc="Math.round(record.effective_hours.raw_value)"/> hrs
                                                 <progress t-att-value="record.effective_hours.raw_value" t-att-max="record.total_hours.raw_value"></progress>
                                                 <t t-esc="Math.round(record.total_hours.raw_value)"/> hrs
                                             </div>
-                                            
                                         </td>
-                                        <td align="right" valign="middle" width="130px">
+                                        <td align="right" valign="bottom" width="130px" height="20px">
                                             <t t-foreach="record.members.raw_value" t-as="member">
                                                 <img t-att-src="kanban_image('res.users', 'avatar', member)" height="20px" width=" 20px"/>
                                             </t>
diff --git a/addons/project/static/src/css/project.css b/addons/project/static/src/css/project.css
index 9d674163a7c..7e5869d80fe 100644
--- a/addons/project/static/src/css/project.css
+++ b/addons/project/static/src/css/project.css
@@ -1,3 +1,14 @@
+.oe_to_invoice_buttons {
+    min-height: 60px;
+    min-width: 50px;
+    vertical-align: top;
+  
+}
+
+.oe_to_invoice_buttons:hover {
+  cursor: pointer;
+}
+
 
 .oe_project_border{
   border-right: groove;
@@ -16,6 +27,7 @@
   
 }
 .sequence {
+  padding-bottom: 4px !important;
   border-bottom: groove;
   /*font-size: 20px;*/
   text-align: center;
@@ -74,5 +86,5 @@
 }
 
 div.oe_fold_column{
-  padding:2px !important;
+  padding:0px !important;
 }
\ No newline at end of file
diff --git a/addons/project_timesheet/project_timesheet.py b/addons/project_timesheet/project_timesheet.py
index c7c43f98bdd..ff64e08c5e1 100644
--- a/addons/project_timesheet/project_timesheet.py
+++ b/addons/project_timesheet/project_timesheet.py
@@ -63,7 +63,7 @@ class project_project(osv.osv):
             search_view = data_obj.get_object_reference(cr, uid, 'project_timesheet', 'view_account_analytic_line_search_account_inherit')
             context.update({
                 #'search_default_user_id': uid,
-                'search_default_project_id':project.id,
+                'search_default_account_id':project.id,
                 #'search_default_open':1,
             })
             value = {
@@ -74,7 +74,7 @@ class project_project(osv.osv):
                 'res_model': 'account.analytic.line',
                 'view_id': False,
             #    'domain':[('project_id','=', context.get('active_id',False))],
-                'context': context,
+                #'context': context,
                 'views': [(tree_view and tree_view[1] or False, 'tree'),(form_view and form_view[1] or False, 'form')],
                 'type': 'ir.actions.act_window',
                 'search_view_id': search_view and search_view[1] or False,
diff --git a/addons/project_timesheet/project_timesheet_view.xml b/addons/project_timesheet/project_timesheet_view.xml
index 43598ff2da1..2c586ace272 100644
--- a/addons/project_timesheet/project_timesheet_view.xml
+++ b/addons/project_timesheet/project_timesheet_view.xml
@@ -46,15 +46,17 @@
                         <button name="open_timesheets" class="oe_project_buttons" type="object" tooltip="timesheets"><img src="/project_timesheet/static/src/img/timesheet_icon.png" class="project_icon"/></button>
                     </t>
                 </xpath>
-                <xpath expr="//div[@class='sequence']" position="after">
-                	<div class="sequence">
-                   <kbd class="user">To invoice</kbd>
-                   <div class="manager"><field name="amount_invoiced"/> <field name="currency_id"/></div>
-                   </div>
-                   <div class="sequence">
-	                   <kbd class="user">Hours</kbd>
-	                   <div class="manager"><t t-esc="Math.round(record.total_hours.raw_value-record.effective_hours.raw_value)"/> h</div>
-                   </div>
+                <xpath expr="//div[@id='sequence']" position="inside">
+		    
+                    <div class="sequence">
+			<button name="open_timesheets" class="oe_to_invoice_buttons" type="object">
+			    <small>To invoice</small>
+			    <div class="manager">
+				<field name="amount_invoiced"/>
+			    </div>
+			</button>
+		    </div>
+			
                 </xpath>
             </field>
         </record>