diff --git a/addons/event/event.py b/addons/event/event.py
index 7eacad489ff..5e948c1a59b 100644
--- a/addons/event/event.py
+++ b/addons/event/event.py
@@ -220,7 +220,7 @@ class event_event(osv.osv):
         'note': fields.text('Description', readonly=False, states={'done': [('readonly', True)]}),
         'company_id': fields.many2one('res.company', 'Company', required=False, change_default=True, readonly=False, states={'done': [('readonly', True)]}),
         'is_subscribed' : fields.function(_subscribe_fnc, type="boolean", string='Subscribed'),
-        'location_id': fields.many2one('res.company','Location Address', readonly=False, states={'done': [('readonly', True)]}),
+        'location_id': fields.many2one('res.company','Organization Address', readonly=False, states={'done': [('readonly', True)]}),
         
     }
 
diff --git a/addons/event/event_view.xml b/addons/event/event_view.xml
index efa5eb68384..4e61844db80 100644
--- a/addons/event/event_view.xml
+++ b/addons/event/event_view.xml
@@ -103,50 +103,33 @@
 		                    </div>
 		                    <newline/>
 		                    <group colspan="4" string="vanue">
-                            	<div class="sub1"> Venue   : </div> <separator orientation="vertical"/>
+                            	<div class="oe_sub1"> Venue   : </div> <separator orientation="vertical"/>
                             	<field name="location_id" nolabel="1"/> 
                         	</group>
 			             </group>	
 			             <group>
-			             	<div class="mapbox"> </div><newline/>
-		                    <!--table>
-		                        <tr>
-		                        <td width="70px" style="text-align:top;"  class="oe_td_border">
-		                            Where
-		                        </td>
-		                        <td width="150px">
-		                            <field name="address_id" nolabel="1"/>
-		                                
-		                        </td>
-		                        <td width="150px">
-									<span width="15px"> Start</span> <field name="date_begin" nolabel="1"/>   
-									<span width="15px"> End</span> <field name="date_end" nolabel="1"/>    
-		                        </td>
-		                        </tr>
-		                   </table-->   
-		                   <table>
-		                   	<tr>
-		                    	<td width="70px" class="oe_td_border">
-		                            Where
-		                        </td>
-		                        <td width="150px">
-		                            <field name="address_id" nolabel="1"/>
-		                        </td>
-		                        <td width="auto">
-                             		<table>
-										<tr>
-											<td class="oe_td_date_border">Start</td><td><field name="date_begin" nolabel="1"/></td>
-										</tr>
-										<tr>
-											<td class="oe_td_date_border">End</td><td><field name="date_end" nolabel="1"/></td>
-										</tr>
-									</table>
-                                 
-		                        </td>
-		                     </tr>
-		                   </table>   
-		                      <!--field name="date_end" label="To" string="end"/-->
-					       
+			             	<div class="oe_mapbox"> </div><newline/>
+		                    <table>
+			                   	<tr>
+			                    	<td width="70px" class="oe_td_border">
+			                            Where
+			                        </td>
+			                        <td width="150px">
+			                            <field name="address_id" nolabel="1"/>
+			                        </td>
+			                        <td width="auto">
+	                             		<table>
+											<tr>
+												<td class="oe_td_date_border">Start</td><td><field name="date_begin" nolabel="1"/></td>
+											</tr>
+											<tr>
+												<td class="oe_td_date_border">End</td><td><field name="date_end" nolabel="1"/></td>
+											</tr>
+										</table>
+	                                 
+			                        </td>
+			                     </tr>
+		                     </table>   
 			             </group>
                     </group>	
                     <notebook colspan="4">
diff --git a/addons/event/static/src/css/event.css b/addons/event/static/src/css/event.css
index f8fe5c04c86..d89131fe82f 100644
--- a/addons/event/static/src/css/event.css
+++ b/addons/event/static/src/css/event.css
@@ -122,16 +122,11 @@ div.oe_fold_column{
 .oe_event_title{
   font-size: 25px;
 }
-.sub1
+.oe_sub1
 {
     float:left;
 }
-.sub2
-{
-    padding-left:50px;
-    text-align:left;
-}
-.mapbox
+.oe_mapbox
 { 
     width:380px;
     height:200px;
diff --git a/addons/event_sale/__openerp__.py b/addons/event_sale/__openerp__.py
index be60ed3fdf6..fb7134f6070 100644
--- a/addons/event_sale/__openerp__.py
+++ b/addons/event_sale/__openerp__.py
@@ -39,10 +39,7 @@ It defines a new kind of service products that offers you the possibility to cho
         'event_sale_view.xml',
     ],
     'demo_xml': ['event_demo.xml'],
-    'js': ['static/src/js/*.js'],
-    'html': ['static/*.html'],
     'test':['test/confirm.yml'],
-    'css': ['static/src/css/*.css'],
     'installable': True,
     'active': False,
 }