diff --git a/account_credit_control/account_view.xml b/account_credit_control/account_view.xml
index d70ebcf7e..5873e8ce3 100644
--- a/account_credit_control/account_view.xml
+++ b/account_credit_control/account_view.xml
@@ -15,14 +15,27 @@
       <field name="inherit_id" ref="account.invoice_form" />
       <field name="arch" type="xml">
         <notebook position="inside">
-        <page string="Credit Control"
-                 groups="account_credit_control.group_account_credit_control_manager,account_credit_control.group_account_credit_control_user,account_credit_control.group_account_credit_control_info">
-           <label string="Force credit control policy:" />
-            <field name="credit_policy_id" widget="selection"
-                   groups="account_credit_control.group_account_credit_control_manager,account_credit_control.group_account_credit_control_user,account_credit_control.group_account_credit_control_info"/>
-            <newline/>
+          <page string="Credit Control"
+            groups="account_credit_control.group_account_credit_control_manager,account_credit_control.group_account_credit_control_user,account_credit_control.group_account_credit_control_info">
+            <group>
+              <field name="credit_policy_id" widget="selection"
+                string="Manual Credit Control Policy"
+                attrs="{'invisible': [('credit_policy_id', '=', False)]}"
+                groups="account_credit_control.group_account_credit_control_manager,account_credit_control.group_account_credit_control_user,account_credit_control.group_account_credit_control_info"/>
+            </group>
+            <separator string="Issued Lines" colspan="4"/>
             <field name="credit_control_line_ids" colspan="4" nolabel="1"
-                   groups="account_credit_control.group_account_credit_control_manager,account_credit_control.group_account_credit_control_user,account_credit_control.group_account_credit_control_info"/>
+              groups="account_credit_control.group_account_credit_control_manager,account_credit_control.group_account_credit_control_user,account_credit_control.group_account_credit_control_info" >
+              <tree string="Credit Control Lines">
+                <field name="date"/>
+                <field name="level"/>
+                <field name="state"/>
+                <field name="channel"/>
+                <field name="balance_due"/>
+                <field name="policy_level_id"/>
+                <field name="policy_id"/>
+              </tree>
+            </field>
           </page>
         </notebook>
       </field>