diff --git a/golem_activity/views/golem_activity_view.xml b/golem_activity/views/golem_activity_view.xml
index 3036b1f..ddcdd65 100644
--- a/golem_activity/views/golem_activity_view.xml
+++ b/golem_activity/views/golem_activity_view.xml
@@ -24,8 +24,10 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
       <field name="model">golem.activity</field>
       <field name="arch" type="xml">
         <form>
+          <header />
           <sheet>
-            <div class="oe_right oe_button_box" style="width: 300px;"
+            <div class="oe_clear oe_right oe_button_box"
+              style="width: 300px;"
               name="buttons"></div>
             <div class="oe_left" style="width: 500px;">
               <field name="image" widget="image" class="oe_avatar oe_left"/>
diff --git a/golem_activity_registration_export/controllers/controllers.py b/golem_activity_registration_export/controllers/controllers.py
index 1106b67..8fc12df 100644
--- a/golem_activity_registration_export/controllers/controllers.py
+++ b/golem_activity_registration_export/controllers/controllers.py
@@ -26,8 +26,8 @@ class ExportGolemActivityMembers(CSVExport):
     @http.route('/web/export/golem/activity_members', type='http', auth='user')
     def export_csv_view(self, data):
         data = json.loads(data)
-        FIELDS = ['number', 'lastname', 'firstname', 'contact_address', 'zip',
-                  'city', 'birthdate_date', 'email', 'phone', 'mobile']
+        FIELDS = ['number', 'lastname', 'firstname', 'street', 'zip', 'city',
+                  'birthdate_date', 'email', 'phone', 'mobile']
         aid = data.get('activity_id')
         a_model = request.env['golem.activity']
         activity = a_model.browse([aid])
diff --git a/golem_activity_registration_export/views/golem_activity_view.xml b/golem_activity_registration_export/views/golem_activity_view.xml
index 8122604..d6c77f0 100644
--- a/golem_activity_registration_export/views/golem_activity_view.xml
+++ b/golem_activity_registration_export/views/golem_activity_view.xml
@@ -23,13 +23,14 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
       <field name="name">Activity Registrations CSV Export</field>
       <field name="model">golem.activity</field>
       <field name="inherit_id"
-        ref="golem_activity_registration.activity_form" />
+        ref="golem_activity.view_form" />
       <field name="arch" type="xml">
-        <field name="activity_registration_ids" position="before">
-          <button name="do_export_csv" type="object"
-            string="Export members to CSV file"
-            attrs="{'invisible': [('activity_registration_ids', '=', False)]}" />
-        </field>
+        <header position="inside">
+          <div style="min-height: 30px;">
+            <button name="do_export_csv" type="object" class="oe_button"
+              string="Export members to CSV file" />
+          </div>
+        </header>
       </field>
     </record>