diff --git a/addons/account/account.py b/addons/account/account.py
index ac50c25cd6b..bf5e25a6f69 100644
--- a/addons/account/account.py
+++ b/addons/account/account.py
@@ -838,7 +838,7 @@ class account_period(osv.osv):
         'date_start': fields.date('Start of Period', required=True, states={'done':[('readonly',True)]}),
         'date_stop': fields.date('End of Period', required=True, states={'done':[('readonly',True)]}),
         'fiscalyear_id': fields.many2one('account.fiscalyear', 'Fiscal Year', required=True, states={'done':[('readonly',True)]}, select=True),
-        'state': fields.selection([('draft','Draft'), ('done','Done')], 'State', readonly=True,
+        'state': fields.selection([('draft','Open'), ('done','Closed')], 'State', readonly=True,
                                   help='When monthly periods are created. The state is \'Draft\'. At the end of monthly period it is in \'Done\' state.'),
         'company_id': fields.related('fiscalyear_id', 'company_id', type='many2one', relation='res.company', string='Company', store=True, readonly=True)
     }
diff --git a/addons/account/account_end_fy.xml b/addons/account/account_end_fy.xml
index a33544ffacc..76d40bc89dc 100644
--- a/addons/account/account_end_fy.xml
+++ b/addons/account/account_end_fy.xml
@@ -6,8 +6,8 @@
             <field name="name">Close a Period</field>
             <field name="res_model">account.period</field>
             <field name="view_type">form</field>
-            <field name="domain">[('state','=','draft')]</field>
             <field name="view_id" ref="view_account_period_tree"/>
+            <field name="context">{'search_default_draft': 1}</field>
             <field name="help"> After closing a period, you will no longer be able to post entries to the period once it has been closed.</field>
         </record>
         <menuitem
diff --git a/addons/account/account_view.xml b/addons/account/account_view.xml
index 27fd0d65b14..6612f628292 100644
--- a/addons/account/account_view.xml
+++ b/addons/account/account_view.xml
@@ -129,7 +129,7 @@
             <field name="arch" type="xml">
                 <search string="Search Period">
                     <group>
-                        <filter string="Draft" name="draft" domain="[('state','=','draft')]" icon="terp-document-new"/>
+                        <filter string="To Close" name="draft" domain="[('state','=','draft')]" icon="terp-document-new"/>
                         <separator orientation="vertical"/>
                         <field name="name"/>
                         <field name="code"/>
diff --git a/addons/account/wizard/account_period_close_view.xml b/addons/account/wizard/account_period_close_view.xml
index 161a3f424fc..5d3351246a3 100644
--- a/addons/account/wizard/account_period_close_view.xml
+++ b/addons/account/wizard/account_period_close_view.xml
@@ -34,7 +34,7 @@
         <record id="action_idea_post_vote_values" model="ir.values">
             <field name="model_id" ref="model_account_period" />
             <field name="object" eval="1" />
-            <field name="name"></field>
+            <field name="name">Close a Period</field>
             <field name="key2">client_action_multi</field>
             <field name="value" eval="'ir.actions.act_window,' + str(ref('action_account_period_close'))"/>
             <field name="key">action</field>
diff --git a/addons/event/event_demo.xml b/addons/event/event_demo.xml
index 3bf58691c0f..4603a9cf141 100644
--- a/addons/event/event_demo.xml
+++ b/addons/event/event_demo.xml
@@ -86,8 +86,8 @@
 		<field name="user_id" ref="base.user_root"/>
 		<field name="mail_auto_registr">True</field>
 		<field name="mail_auto_confirm">True</field>
-		<field name="mail_registr">Thanks for registrering. We will keep you informed of the modalities.</field>
-		<field name="mail_confirm">Thanks for registrering. The conference will begin at 2 PM and will be given by Mister Pinckaers.</field>
+		<field name="mail_registr">Thanks for registration. We will keep you informed of the modalities.</field>
+		<field name="mail_confirm">Thanks for registration. The conference will begin at 2 PM and will be given by Mr. Pinckaers.</field>
 	</record>
     <function model="event.event" name="button_confirm" eval="[ref('event_2')]"/>
     <function model="event.event" name="button_done" eval="[ref('event_2')]"/>
diff --git a/addons/event/event_view.xml b/addons/event/event_view.xml
index 185b1d33ec9..c34d6cfe475 100644
--- a/addons/event/event_view.xml
+++ b/addons/event/event_view.xml
@@ -76,10 +76,10 @@
                         <field name="note" colspan="4" nolabel="1"/>
                         <field name="state" select="1"/>
                         <group col="4" colspan="2">
-                           <button string="Confirm Event" name="button_confirm" states="draft" type="object" icon="gtk-apply"/>
                            <button string="Cancel Event" name="button_cancel" states="draft,confirm" type="object" icon="gtk-cancel"/>
+                           <button string="Confirm Event" name="button_confirm" states="draft" type="object" icon="gtk-apply"/>
                            <button string="Event Done" name="button_done" states="confirm" type="object" icon="gtk-jump-to"/>
-                           <button string="Set To Draft" name="button_draft" states="confirm,cancel,done" type="object" icon="gtk-convert"/>
+                           <button string="Set To Draft" name="button_draft" states="cancel" type="object" icon="gtk-convert"/>
                         </group>
                     </page>
                     <page string="Speakers">
@@ -319,8 +319,8 @@
                         <field name="event_id" on_change="onchange_event(event_id, partner_invoice_id)" domain="[('state','in',('draft','confirm'))]"/>
                         <field name="create_date" string="Registration Date"/>
                         <field name="name"/>
-                        <field name="partner_id" required="1" on_change="onchange_partner_id(partner_id,event_id)" />
-                        <field name="user_id"/>
+                        <field name="partner_id" attrs="{'readonly':[('state','!=', 'draft')]}" required="1" on_change="onchange_partner_id(partner_id,event_id)" />
+                        <field name="user_id" attrs="{'readonly':[('state','!=', 'draft')]}" />
                         <field name="tobe_invoiced"/>
                     </group>
                     <notebook colspan="4">