diff --git a/addons/event/event.py b/addons/event/event.py
index 747981f854b..44def4f0c76 100644
--- a/addons/event/event.py
+++ b/addons/event/event.py
@@ -207,6 +207,8 @@ class event_event(osv.osv):
         'main_speaker_id': fields.many2one('res.partner','Main Speaker', readonly=False, states={'done': [('readonly', True)]}, help="Speaker who will be giving speech at the event."),
         'address_id': fields.many2one('res.partner','Location Address', readonly=False, states={'done': [('readonly', True)]}),
         'street': fields.related('address_id','street',type='char',string='Street'),
+        'street2': fields.related('address_id','street2',type='char',string='Street2'),
+        'state_id': fields.related('address_id','state_id',type='many2one', relation="res.country.state", string='State'),
         'zip': fields.related('address_id','zip',type='char',string='zip'),
         'city': fields.related('address_id','city',type='char',string='city'),
         'speaker_confirmed': fields.boolean('Speaker Confirmed', readonly=False, states={'done': [('readonly', True)]}),
@@ -265,16 +267,20 @@ class event_event(osv.osv):
     def on_change_address_id(self, cr, uid, ids, address_id, context=None):
         values = {
             'street' : False,
+            'street2' : False,
             'city' : False,
             'zip' : False,
+            'country_id' : False,
+            'state_id' : False,
         }
         if isinstance(address_id, (long, int)):
             address = self.pool.get('res.partner').browse(cr, uid, address_id, context=context)
-
             values.update({
                 'street' : address.street,
-
+                'street2' : address.street2,
                 'city' : address.city,
+                'country_id' : address.country_id and address.country_id.id,
+                'state_id' : address.state_id and address.state_id.id,
                 'zip' : address.zip,
             })
 
diff --git a/addons/event/event_view.xml b/addons/event/event_view.xml
index 2e50822cd7b..fd396053d5d 100644
--- a/addons/event/event_view.xml
+++ b/addons/event/event_view.xml
@@ -111,52 +111,54 @@
                     </header>
                     <sheet>
                         <div class="oe_right oe_button_box">
-                            <button name="%(event.act_event_list_register_event)d" type="action" string="Registration" icon="gtk-index" help="Register with this event"/>
+                            <button name="%(event.act_event_list_register_event)d" type="action" string="Registrations" help="Register with this event"/>
                         </div>
                         <div class="oe_title">
                             <label for="name" class="oe_edit_only"/>
                             <h1><field name="name"/></h1>
                         </div>
                         <div>
-                            <h2>From <field name="date_begin" class="oe_inline" /> to <field name="date_end" class="oe_inline"/>
-                            </h2>
                             <group>
                                 <group>
-                                    <label for="address_id" string="Location Address"/>
+                                    <label for="address_id" string="Location"/>
                                     <div>
-                                        <field name="address_id" widget="many2one_address_google_map" widget_option="{'placeholder':'.oe_google_map'}" on_change="on_change_address_id(address_id)" />
+                                        <field name="address_id" on_change="on_change_address_id(address_id)" />
                                         <field name="street" placeholder="Street..."/>
-                                        <div>
-                                            <field name="zip" class="oe_inline" placeholder="Zip"/>
-                                            <field name="city" class="oe_inline" placeholder="City"/>
+                                        <field name="street2"/>
+                                        <div class="address_format">
+                                            <field name="city" placeholder="City" style="width: 40%%"/>
+                                            <field name="state_id" class="oe_no_button" placeholder="State" style="width: 37%%" options='{"no_open": true}'/>
+                                            <field name="zip" placeholder="ZIP" style="width: 20%%"/>
                                         </div>
+                                        <field name="country_id" placeholder="Country" class="oe_no_button" options='{"no_open": true}'/>
                                     </div>
                                 </group>
                                 <group>
                                     <field name="type" on_change="onchange_event_type(type,context)"/>
-                                    <field name="register_min"/>
-                                    <field name="register_max"/>
-                                    <label for="register_current" string="Current Registrations" groups="base.group_user"/>
-                                    <div groups="base.group_user">
-                                       Confirmed: <field name="register_current" class="oe_inline"/>, Unconfirmed: <field name="register_prospect" class="oe_inline"/>
-                                    </div>
+                                    <field name="date_begin"/>
+                                    <field name="date_end"/>
                                 </group>
                             </group>
                         </div>
-                        <div class="oe_google_map" style="height: 200px"></div>
                         <notebook>
                             <page string="Event Description">
                                 <field name="note" colspan="4" nolabel="1"/>
                             </page>
-                            <page string="Internal Data">
+                            <page string="Registrations">
                                 <group>
+                                    <group>
+                                        <field name="register_min"/>
+                                        <field name="register_max"/>
+                                        <label for="register_current" string="Current Registrations" groups="base.group_user"/>
+                                        <div groups="base.group_user">
+                                             <field name="register_prospect" class="oe_inline"/> (confirmed: <field name="register_current" class="oe_inline"/>)
+                                        </div>
+                                        <field name="register_attended"/>
+                                    </group>
                                     <group>
                                         <field name="main_speaker_id" domain="[('speaker','=',True)]" context="{'default_speaker':1}"/>
                                         <field name="speaker_confirmed"/>
                                     </group>
-                                    <group>
-                                        <field name="register_attended"/>
-                                    </group>
                                 </group>
                                 <field name="registration_ids" colspan="4" nolabel="1" groups="event.group_event_manager,event.group_event_user">
                                     <tree string="Registration" editable="top">