diff --git a/crm_claim_rma/__openerp__.py b/crm_claim_rma/__openerp__.py
index 24defb39..2dd4c991 100644
--- a/crm_claim_rma/__openerp__.py
+++ b/crm_claim_rma/__openerp__.py
@@ -43,9 +43,9 @@ It mainly contain the following features:
 
 Using this module make the logistic flow of return this way:
 
- * Returning product goes into Stock or Supplier location with a incoming shipment (depending
-   on the settings of the supplier info in the product form)
- * You can make a delivery from the RMA to send a new product to the Customer
+* Returning product goes into Stock or Supplier location with a incoming shipment (depending
+  on the settings of the supplier info in the product form)
+* You can make a delivery from the RMA to send a new product to the Customer
 
 """,
     'author': 'Akretion, Camptocamp',
diff --git a/crm_claim_rma/crm_claim_rma_view.xml b/crm_claim_rma/crm_claim_rma_view.xml
index d6313373..11a5c106 100644
--- a/crm_claim_rma/crm_claim_rma_view.xml
+++ b/crm_claim_rma/crm_claim_rma_view.xml
@@ -188,6 +188,56 @@
         </field>
     </record>
 
+
+<!-- Right side link to orders -->
+        <act_window 
+        id="act_crm_claim_rma_sale_orders" 
+        name="Quotations and Sales"
+        res_model="sale.order"
+        src_model="crm.claim"/>
+<!-- Right side link to invoices -->
+        <act_window 
+        domain="[('type', '=', 'out_invoice')]"
+        id="act_crm_claim_rma_invoice_out" 
+        name="Customer Invoices" 
+        res_model="account.invoice" 
+        src_model="crm.claim"/>
+<!-- Right side link to invoices -->
+        <act_window 
+        domain="[('type', '=', 'in_invoice')]"
+        id="act_crm_claim_rma_invoice_in" 
+        name="Supplier Invoices" 
+        res_model="account.invoice" 
+        src_model="crm.claim"/>
+<!-- Right side link to refunds -->
+        <act_window 
+        domain="[('type', '=', 'out_refund')]"
+        id="act_crm_claim_rma_refunds_out" 
+        name="Customer Refunds" 
+        res_model="account.invoice" 
+        src_model="crm.claim"/>    
+<!-- Right side link to refunds -->
+        <act_window 
+        domain="[('type', '=', 'in_refund')]"
+        id="act_crm_claim_rma_refunds_in" 
+        name="Supplier Refunds" 
+        res_model="account.invoice" 
+        src_model="crm.claim"/> 
+<!-- Right side link to picking in --> 
+        <act_window
+        domain="[('type', '=', 'in')]"
+        id="act_crm_claim_rma_picking_in" 
+        name="Incomming Shipment and Returns" 
+        res_model="stock.picking" 
+        src_model="crm.claim"/>  
+<!-- Right side link to picking out -->
+        <act_window 
+        domain="[('type', '=', 'out')]"
+        id="act_crm_claim_rma_picking_out" 
+        name="Deliveries" 
+        res_model="stock.picking" 
+        src_model="crm.claim"/>  
+
     <record model="ir.ui.view" id="crm_claim_rma_form_view2">
         <field name="name">CRM - Claim product return Form</field>
         <field name="model">crm.claim</field>
@@ -209,6 +259,35 @@
                     <field name="name" />
                     <field name="date"/>
                 </field>
+                <xpath expr="//sheet[@string='Claims']/group[1]" position="inside">
+                    <div class="oe_right oe_button_box" name="buttons">
+                        <button name="%(act_crm_claim_rma_sale_orders)d" type="action"
+                                string="Quotations and Sales"
+                                attrs="{'invisible': ['|',('partner_id','=', False),('claim_type','in', ['supplier','other'])]}"
+                                context="{'search_default_partner_id': [partner_id],'search_default_user_id':False}"
+                               />
+                        <button name="%(act_crm_claim_rma_invoice_out)d" type="action"
+                                string="Customer Invoices"
+                                attrs="{'invisible': ['|',('partner_id','=', False),('claim_type','in', ['supplier','other'])]}"
+                                context="{'search_default_partner_id': [partner_id],'search_default_user_id':False}"
+                               />
+                        <button name="%(act_crm_claim_rma_refunds_out)d" type="action"
+                                string="Customer Refunds"
+                                attrs="{'invisible': ['|',('partner_id','=', False),('claim_type','in', ['supplier','other'])]}"
+                                context="{'search_default_partner_id': [partner_id],'search_default_user_id':False}"
+                               />
+                        <button name="%(act_crm_claim_rma_invoice_in)d" type="action"
+                                string="Supplier Invoices"
+                                attrs="{'invisible': ['|',('partner_id','=', False),('claim_type','in', ['customer','other'])]}"
+                                context="{'search_default_partner_id': [partner_id],'search_default_user_id':False}"
+                               />
+                        <button name="%(act_crm_claim_rma_refunds_in)d" type="action"
+                                string="Supplier Refunds"
+                                attrs="{'invisible': ['|',('partner_id','=', False),('claim_type','in', ['customer','other'])]}"
+                                context="{'search_default_partner_id': [partner_id],'search_default_user_id':False}"
+                               />
+                    </div>
+                </xpath>
             </field>
     </record>
 
@@ -227,61 +306,6 @@
         </field>
     </record>
 
-<!-- Right side link to orders -->
-        <act_window 
-        context="{'search_default_partner_id': [partner_id]}"
-        id="act_crm_claim_rma_sale_orders" 
-        name="Partner sale orders" 
-        res_model="sale.order" 
-        src_model="crm.claim"/>
-<!-- Right side link to invoices -->
-        <act_window 
-        context="{'search_default_partner_id': [partner_id],}"
-        domain="[('type', '=', 'out_invoice')]"
-        id="act_crm_claim_rma_invoice_out" 
-        name="Partner invoices out" 
-        res_model="account.invoice" 
-        src_model="crm.claim"/>
-<!-- Right side link to invoices -->
-        <act_window 
-        context="{'search_default_partner_id': [partner_id],}"
-        domain="[('type', '=', 'in_invoice')]"
-        id="act_crm_claim_rma_invoice_in" 
-        name="Partner invoices in" 
-        res_model="account.invoice" 
-        src_model="crm.claim"/>
-<!-- Right side link to refunds -->
-        <act_window 
-        context="{'search_default_partner_id': [partner_id],}"
-        domain="[('type', '=', 'out_refund')]"
-        id="act_crm_claim_rma_refunds_out" 
-        name="Partner refunds out" 
-        res_model="account.invoice" 
-        src_model="crm.claim"/>    
-<!-- Right side link to refunds -->
-        <act_window 
-        context="{'search_default_partner_id': [partner_id],}"
-        domain="[('type', '=', 'in_refund')]"
-        id="act_crm_claim_rma_refunds_in" 
-        name="Partner refunds in" 
-        res_model="account.invoice" 
-        src_model="crm.claim"/> 
-<!-- Right side link to picking in --> 
-        <act_window
-        context="{'search_default_partner_id': [partner_id]}"
-        domain="[('type', '=', 'in')]"
-        id="act_crm_claim_rma_picking_in" 
-        name="Partner picking IN" 
-        res_model="stock.picking" 
-        src_model="crm.claim"/>  
-<!-- Right side link to picking out -->
-        <act_window 
-        context="{'search_default_partner_id': [partner_id]}"
-        domain="[('type', '=', 'out')]"
-        id="act_crm_claim_rma_picking_out" 
-        name="Partner picking OUT" 
-        res_model="stock.picking" 
-        src_model="crm.claim"/>  
        
 <!-- Menu -->
         <record model="ir.actions.act_window" id="crm_claim.crm_case_categ_claim0">
diff --git a/crm_claim_rma/wizard/claim_make_picking.py b/crm_claim_rma/wizard/claim_make_picking.py
index 2438ae9e..1f7138e2 100644
--- a/crm_claim_rma/wizard/claim_make_picking.py
+++ b/crm_claim_rma/wizard/claim_make_picking.py
@@ -1,25 +1,24 @@
 # -*- coding: utf-8 -*-
-#########################################################################
-#                                                                       #
-#                                                                       #
-#########################################################################
-#                                                                       #
-# crm_claim_rma for OpenERP                                             #
-# Copyright (C) 2009-2012  Akretion, Emmanuel Samyn,                    #
-#       Benoît GUILLOT <benoit.guillot@akretion.com>                    #
-#This program is free software: you can redistribute it and/or modify   #
-#it under the terms of the GNU General Public License as published by   #
-#the Free Software Foundation, either version 3 of the License, or      #
-#(at your option) any later version.                                    #
-#                                                                       #
-#This program is distributed in the hope that it will be useful,        #
-#but WITHOUT ANY WARRANTY; without even the implied warranty of         #
-#MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the          #
-#GNU General Public License for more details.                           #
-#                                                                       #
-#You should have received a copy of the GNU General Public License      #
-#along with this program.  If not, see <http://www.gnu.org/licenses/>.  #
-#########################################################################
+##############################################################################
+#
+#    Copyright 2013 Camptocamp
+#    Copyright 2009-2013 Akretion, 
+#    Author: Emmanuel Samyn, Raphaël Valyi, Sébastien Beau, Joel Grand-Guillaume
+#
+#    This program is free software: you can redistribute it and/or modify
+#    it under the terms of the GNU Affero General Public License as
+#    published by the Free Software Foundation, either version 3 of the
+#    License, or (at your option) any later version.
+#
+#    This program is distributed in the hope that it will be useful,
+#    but WITHOUT ANY WARRANTY; without even the implied warranty of
+#    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+#    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/>.
+#
+##############################################################################
 from openerp.osv import fields, orm, osv
 from openerp.tools import DEFAULT_SERVER_DATE_FORMAT, DEFAULT_SERVER_DATETIME_FORMAT
 from openerp import netsvc
diff --git a/product_warranty/__openerp__.py b/product_warranty/__openerp__.py
index 9b519260..a866f5cb 100644
--- a/product_warranty/__openerp__.py
+++ b/product_warranty/__openerp__.py
@@ -34,7 +34,7 @@ Extend the product warranty management with warranty details on product / suppli
 * supplier warranty duration
 * return product to company, supplier, other
 
-Thos informationy are used in the RMA Claim (Product Return Management) module.
+Those informations are used in the RMA Claim (Product Return Management) module.
 
 """,
     'author': 'Akretion',