diff --git a/addons/website_event/views/website_event_sale_backend.xml b/addons/website_event/views/website_event_sale_backend.xml
index 3b3a28149cb..4dc8dced26a 100644
--- a/addons/website_event/views/website_event_sale_backend.xml
+++ b/addons/website_event/views/website_event_sale_backend.xml
@@ -8,7 +8,7 @@
         <field name="inherit_id" ref="event.view_event_form"/>
         <field name="arch" type="xml">
             <!-- add state field in header -->
-            <xpath expr="//sheet/div" position="before">
+            <xpath expr="//div[@class='oe_right oe_button_box']" position="before">
                 <field name="website_url" invisible="1"/>
                 <field name="website_published" class="pull-right" widget="website_button"/>
             </xpath>
diff --git a/addons/website_event_track/controllers/event.py b/addons/website_event_track/controllers/event.py
index 182ead33b46..e7a193491a0 100644
--- a/addons/website_event_track/controllers/event.py
+++ b/addons/website_event_track/controllers/event.py
@@ -19,6 +19,7 @@
 #
 ##############################################################################
 
+import openerp
 from openerp.addons.web import http
 from openerp.addons.web.http import request
 from openerp.addons.website.controllers.main import Website as controllers
@@ -106,7 +107,7 @@ class website_event(http.Controller):
 </section>''' % (e(post['track_name']), 
             e(post['description']), e(post['biography']))
 
-        track_id = tobj.create(cr, uid, {
+        track_id = tobj.create(cr, openerp.SUPERUSER_ID, {
             'name': post['track_name'],
             'event_id': event.id,
             'tag_ids': [(6, 0, tags)],
@@ -114,7 +115,7 @@ class website_event(http.Controller):
             'description': track_description
         }, context=context)
 
-        tobj.message_post(cr, uid, [track_id], body="""Proposed By: %s<br/>
+        tobj.message_post(cr, openerp.SUPERUSER_ID, [track_id], body="""Proposed By: %s<br/>
           Mail: <a href="mailto:%s">%s</a><br/>
           Phone: %s""" % (e(post['partner_name']), e(post['email_from']), 
             e(post['email_from']), e(post['phone'])), context=context)
diff --git a/addons/website_event_track/views/event_backend.xml b/addons/website_event_track/views/event_backend.xml
index aa0a2d10ced..ada3b701902 100644
--- a/addons/website_event_track/views/event_backend.xml
+++ b/addons/website_event_track/views/event_backend.xml
@@ -159,6 +159,9 @@
             <field name="inherit_id" ref="event.view_event_form"/>
             <field name="model">event.event</field>
             <field name="arch" type="xml">
+                <xpath expr="//div[@class='oe_right oe_button_box']" position="inside">
+                    <button name="%(website_event_track.act_event_list_tracks)d" type="action" string="Tracks"/>
+                </xpath>
                 <xpath expr="//div[@class='oe_title']" position="inside">
                     <label for="tag_ids" class="oe_edit_only"/>
                     <field name="tag_ids" widget="many2many_tags"/>
@@ -173,9 +176,6 @@
                 </xpath>
                 <xpath expr="//notebook" position="inside">
                     <page string="Tracks">
-                        <div class="oe_right oe_button_box">
-                            <button name="%(website_event_track.act_event_list_tracks)d" type="action" string="Tracks"/>
-                        </div>
                         <group col="2" class="oe_title">
                             <field name="allowed_track_tag_ids" widget="many2many_tags"/>
                         </group>
@@ -319,6 +319,8 @@
                                 <field name="tag_ids" widget="many2many_tags"/>
                             </group>
                         </group>
+                        <label for="description" class="oe_edit_only"/>
+                        <field name="description"/>
                     </sheet>
                     <div class="oe_chatter">
                         <field name="message_follower_ids" widget="mail_followers"/>