diff --git a/golem_membership/views/report_golem_member.xml b/golem_membership/views/report_golem_member.xml
index b3632cc..6802c8a 100644
--- a/golem_membership/views/report_golem_member.xml
+++ b/golem_membership/views/report_golem_member.xml
@@ -22,10 +22,12 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
   <template id="golem_member_card_template_inherit_golem_membership"
     inherit_id="golem_member.golem_member_card_template">
-    <xpath expr="//div[@id='page_report_member']" position="after">
-      <div class="page">
-        <div class="row">
-          <h2>Membership</h2>
+    <xpath expr="//table[@id='table_activity_ref']" position="after">
+      <t t-if="member.membership_state != 'none'">
+        <div class="row" id="page_report_membership">
+            <div class="col-xs-12">
+              <h3>Memberships</h3>
+          </div>
         </div>
         <table class="table table-striped">
           <thead>
@@ -38,30 +40,28 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
             </tr>
           </thead>
           <tbody>
-            <t t-foreach="docs" t-as="member">
-              <t t-foreach="member.member_lines" t-as="mline">
-                <tr>
-                  <td class="col-xs-3">
-                    <spam t-field="mline.membership_id" />
-                  </td>
-                  <td class="col-xs-2">
-                    <spam t-field="mline.date_from" />
-                  </td>
-                  <td class="col-xs-2">
-                    <spam t-field="mline.date_to" />
-                  </td>
-                  <td class="col-xs-2">
-                    <spam t-field="mline.date" />
-                  </td>
-                  <td class="col-xs-3">
-                    <spam t-field="mline.state" />
-                  </td>
-                </tr>
-              </t>
+            <t t-foreach="member.member_lines" t-as="mline">
+              <tr>
+                <td class="col-xs-3">
+                  <spam t-field="mline.membership_id" />
+                </td>
+                <td class="col-xs-2">
+                  <spam t-field="mline.date_from" />
+                </td>
+                <td class="col-xs-2">
+                  <spam t-field="mline.date_to" />
+                </td>
+                <td class="col-xs-2">
+                  <spam t-field="mline.date" />
+                </td>
+                <td class="col-xs-3">
+                  <spam t-field="mline.state" />
+                </td>
+              </tr>
             </t>
           </tbody>
         </table>
-      </div>
+      </t>
     </xpath>
   </template>