diff --git a/addons/account_followup/account_followup.py b/addons/account_followup/account_followup.py
index ac117c2b318..f0fa4862f55 100644
--- a/addons/account_followup/account_followup.py
+++ b/addons/account_followup/account_followup.py
@@ -166,16 +166,12 @@ class res_partner(osv.osv):
         res = super(res_partner, self).fields_view_get(cr, uid, view_id=view_id, view_type=view_type, context=context, 
                                                        toolbar=toolbar, submenu=submenu)
         
-        if context: 
-            for l in context:
-                print l, context[l]
-        if view_type == 'form' and context and 'search_default_todo' in context.keys():
+        if view_type == 'form' and context and 'Followupfirst' in context.keys() and context['Followupfirst'] == True:
             doc = etree.XML(res['arch'], parser=None, base_url=None)
-            first_node = doc.xpath("//page[@string='Payments Follow-up']")
-            first_node[0].set("position", "left")
-            first_node[0].getparent().append(first_node[0])
-            root = first_node[0].getparent()
-            root[0]= root[-1]
+            first_node = doc.xpath("//page[@string='Payments Follow-up']")            
+            #first_node[0].getparent().append(first_node[0])            
+            root = first_node[0].getparent()            
+            root.insert(0, first_node[0])
             res['arch'] = etree.tostring(doc)
         return res
         
@@ -454,7 +450,7 @@ class res_partner(osv.osv):
                                                  store={'account.move.line': (_get_aml_storeids, ['followup_line_id', 'followup_date'], 10)}),
         'payment_amount_overdue':fields.function(_get_amount_overdue, method=True, type='float', string="Amount Overdue", 
                                                  help="Amount Overdue: The amount the customer owns us", 
-                                                 store={'account.move.line': (_get_aml_storeids2, ['followup_line_id', 'followup_date', 'debit', 'credit', 'invoice'], 10)}, 
+                                                 store=True, #{'account.move.line': (_get_aml_storeids2, ['followup_line_id', 'followup_date', 'debit', 'credit', 'invoice'], 10)},
                                                  ),
         
     }
diff --git a/addons/account_followup/account_followup_customers.xml b/addons/account_followup/account_followup_customers.xml
index d44ccebc7c6..25a5fdb6054 100644
--- a/addons/account_followup/account_followup_customers.xml
+++ b/addons/account_followup/account_followup_customers.xml
@@ -99,8 +99,9 @@
  			<field name="res_model">res.partner</field>
  			<field name="view_type">form</field>
  			<field name="view_mode">tree,form</field>
+ 			<field name="context">{} </field>
  			<!--<field name="domain">[('payment_amount_overdue', '>', 0)]</field>-->  <!--('customer', '=', True), ('latest_followup_date','!=', False)-->
- 			<field name="context">{'search_default_todo': True, 'search_default_credits': True} </field>
+ 			<field name="context">{'Followupfirst':True, 'search_default_todo': True, 'search_default_credits': True} </field>
  			<field name="search_view_id" ref="customer_followup_search_view"/>
  		</record>
 
@@ -146,20 +147,21 @@
  					 		<field name="payment_note" string="The customer promised:"/> 
  					 	</group>
             			<p class="oe_grey"> <!--maybe only when accountmovelines empty-->
-            				By clicking on the light bulb, you can put an invoice as litigation.  This means you are still in discussion about it and it 
+            				Here is the history of the transactions of this customer. By clicking on the light bulb, you can put an invoice as litigation.  This means you are still in discussion about it and it 
             				won't be taken into account for going to the next follow-up level.        
             			</p>            		
  						<group>
- 					 <field name="accountmoveline_ids" nolabel="1" context="{'default_partner_id': active_id}" mode="kanban">
- 						<!--<tree string="Account Move line" editable="bottom" colors="red:date_maturity and date_maturity&lt;current_date or date&lt;current_date"> 
+ 					 <field name="accountmoveline_ids" nolabel="1" > <!--ontext="{'default_partner_id': active_id}" mode="kanban"-->
+ 						<tree string="Account Move line" editable="bottom" create="false" colors="red:date_maturity and date_maturity&lt;current_date or date&lt;current_date"> 
  							<field name="date" readonly="True"/>
                     		<field name="move_id" readonly="True"/> 							
  							<field name="blocked" string="Litigation"/>
  							<field name="date_maturity" readonly="True"/>
  							<field name="reconcile_partial_id" readonly="True"/>
  							<field name="result" readonly="True"/>
- 						</tree>-->
- 						<kanban default_group_by="followup_line_id" create="false">
+ 							<field name="followup_line_id" invisible='1'/>
+ 						</tree>
+ 					<!--	<kanban default_group_by="followup_line_id" create="false">
  							<field name="followup_line_id"/>
  							<field name="result"/>
  							<field name="date_maturity"/>
@@ -168,10 +170,10 @@
  							<field name="ref"/>
  							<field name="invoice"/>
  							 <templates>
-                        <t t-name="kanban-box">
+                        <t t-name="kanban-box">-->
                                             
                         <!--<a t-if="! read_only_mode" type="delete" style="position: absolute; right: 0; padding: 4px; diplay: inline-block">X</a>-->
-                        <div class="oe_module_vignette oe_semantic_html_override">                                 
+                        <!--<div class="oe_module_vignette oe_semantic_html_override">                                 
                         <h4><a type="open"><field name="ref"/></a></h4>
                         <a type="open"><field name="invoice"/></a>
                         <i><div t-if="record.result.raw_value">
@@ -180,11 +182,12 @@
                             <field name="date_maturity"/>
                         </a></div>
                         <a t-if="record.blocked.raw_value === true" type="object" string="Lit." name="set_kanban_state_litigation" class="oe_kanban_status oe_kanban_status_red"> </a>
-                        <a t-if="record.blocked.raw_value === false" type="object" string="Lit." name="set_kanban_state_litigation" class="oe_kanban_status oe_kanban_status_green"> </a>
+                        
+                        <a t-if="record.blocked.raw_value === false" type="object" string="Lit." name="set_kanban_state_litigation"  class="oe_kanban_status oe_kanban_status_green"></a>
                         </div>
                         </t>
                     </templates>
-						</kanban>
+						</kanban>-->
  					</field>
  						
  					</group>
@@ -201,10 +204,7 @@
  			<field name="sequence" eval="2"/>
  			<field name="view_mode">form</field>
  			<field name="view_id" ref="view_partner_inherit_followup_form"/>
- 			<field name="context">{'Followupfirst':True} </field>
  			<field name="act_window_id" ref="action_customer_followup"/>
- 			
- 			
  			</record>
 
  		<record id="action_view_customer_followup_tree" model="ir.actions.act_window.view">
diff --git a/addons/account_followup/account_followup_view.xml b/addons/account_followup/account_followup_view.xml
index da7ea67e4f1..54d0061ea73 100644
--- a/addons/account_followup/account_followup_view.xml
+++ b/addons/account_followup/account_followup_view.xml
@@ -87,14 +87,14 @@
                     
                     <h1><field name="company_id" widget="selection" class="oe_inline"/> Follow-up </h1><!--groups="base.group_multi_company"-->
                     <p class="oe_grey">
-                    	To remind our customers to pay their invoices when they are overdue, 
-                    	we define different levels of severity for paying the invoices.     	 
-                    	 Every level defines actions that need to be taken after a certain amount of days after the due date of an invoice     
+                    	To remind our customers of paying their invoices, 
+                    	we define different actions depending on how severely overdue the customer is.  These actions are bundled
+                    	into folow-up levels that are triggered when the due date of the most overdue invoice has passed a 
+                    	certain amount of days.         	                     	      
                     	</p>
                     		
                     	<p class ="oe_grey">
-                    	
-                    	When the wizard for processing the follow-ups is run, for every partner the most overdue invoice (without litigation) is checked.  
+                    	When the wizard for procesing the follow-ups is run, for every partner the most overdue invoice (without litigation) is checked.  
                     	If the amount of days overdue is greater or equal than the amount of days specified
                        		and the actions of the previous follow-up level were done, then the actions checked 
                        		for the new follow-up level will be executed.                       	
@@ -203,16 +203,6 @@
 
       <!-- <menuitem action="act_account_partner_account_move_payable_all" id="menu_account_move_open_unreconcile_payable" parent="account_followup.menu_action_followup_stat"/> -->
 
-      <!--COMPANY VIEW NOT NECESSARY ANYMORE  <record model="ir.ui.view" id="view_company_inherit_followup_form">
-            <field name="name">res.company.followup.form.inherit</field>
-            <field name="inherit_id" ref="account.view_company_inherit_form"/>
-            <field name="model">res.company</field>
-            <field name="arch" type="xml">
-                <field name="overdue_msg" nolabel="1" colspan="4" position="after">
-                    <separator string="Follow-up Message" colspan="4"/>
-                    <field name="follow_up_msg" nolabel="1" colspan="4"/>
-                </field>
-            </field>
-     </record> -->
+    
     </data>
 </openerp>
\ No newline at end of file