diff --git a/addons/account/account.py b/addons/account/account.py
index 6e96ce73962..1804c7835ad 100644
--- a/addons/account/account.py
+++ b/addons/account/account.py
@@ -2347,7 +2347,7 @@ class account_subscription(osv.osv):
         'ref': fields.char('Reference', size=16),
         'model_id': fields.many2one('account.model', 'Model', required=True),
         'date_start': fields.date('Start Date', required=True),
-        'period_total': fields.integer('Number of Periods', required=True),
+        'period_total': fields.integer('Number of Period(s)', required=True),
         'period_nbr': fields.integer('Period', required=True),
         'period_type': fields.selection([('day','days'),('month','month'),('year','year')], 'Period Type', required=True),
         'state': fields.selection([('draft','Draft'),('running','Running'),('done','Done')], 'Status', required=True, readonly=True),
diff --git a/addons/account/account_view.xml b/addons/account/account_view.xml
index ab46f7519f8..18b5e88899b 100644
--- a/addons/account/account_view.xml
+++ b/addons/account/account_view.xml
@@ -1830,22 +1830,19 @@
                     </header>
                     <sheet>
                         <group>
-                            <group>
+                            <group col="2">
                                 <field name="name"/>
                                 <field name="model_id"/>
                                 <field name="ref"/>
                             </group>
-                            <newline/>
     
-                            <group string="Starts on">
+                            <group col="2">
                                 <field name="date_start"/>
+                                <field name="period_type"/>
+                                <field name="period_nbr"/>
                                 <field name="period_total"/>
                             </group>
     
-                            <group string="Valid Up to">
-                                <field name="period_nbr"/>
-                                <field name="period_type"/>
-                            </group>
                         </group>
                         <separator string="Subscription Lines"/>
                         <field name="lines_id" widget="one2many_list"/>
diff --git a/addons/account/wizard/account_subscription_generate.py b/addons/account/wizard/account_subscription_generate.py
index 8efcd25b789..dc5209ebea0 100644
--- a/addons/account/wizard/account_subscription_generate.py
+++ b/addons/account/wizard/account_subscription_generate.py
@@ -28,7 +28,7 @@ class account_subscription_generate(osv.osv_memory):
     _name = "account.subscription.generate"
     _description = "Subscription Compute"
     _columns = {
-       'date': fields.date('Date', required=True),
+       'date': fields.date('Generate Entries Before', required=True),
     }
     _defaults = {
         'date': lambda *a: time.strftime('%Y-%m-%d'),
diff --git a/addons/account/wizard/account_subscription_generate_view.xml b/addons/account/wizard/account_subscription_generate_view.xml
index bf848bb3776..bd5ba404cdd 100644
--- a/addons/account/wizard/account_subscription_generate_view.xml
+++ b/addons/account/wizard/account_subscription_generate_view.xml
@@ -9,12 +9,9 @@
             <field name="arch" type="xml">
                 <form string="Subscription Compute" version="7.0">
                     <header>
-                        <button icon="gtk-cancel" special="cancel" string="Cancel" />
                         <button icon="gtk-execute" string="Generate Entries"
                             name="action_generate" type="object" />
                     </header>
-                    <separator string="Generate Entries before:"/>
-                    <label string ="Automatically generate entries based on what has been entered in the  system before a specific date."/>
                     <group>
                         <field name="date"/>
                     </group>