diff --git a/golem_family/__openerp__.py b/golem_family/__openerp__.py
index 311789c..b5f2875 100644
--- a/golem_family/__openerp__.py
+++ b/golem_family/__openerp__.py
@@ -26,5 +26,5 @@
     'application': False,
     'installable': True,
     'depends': ['golem_member'],
-    'data': ['views/golem_family_view.xml']
+    'data': ['views/golem_family_view.xml', 'views/golem_member_view.xml']
 }
diff --git a/golem_family/i18n/fr.po b/golem_family/i18n/fr.po
index 43a87e6..50f49ac 100644
--- a/golem_family/i18n/fr.po
+++ b/golem_family/i18n/fr.po
@@ -6,8 +6,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Odoo Server 8.0\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2016-06-28 03:16+0000\n"
-"PO-Revision-Date: 2016-06-28 03:16+0000\n"
+"POT-Creation-Date: 2016-07-08 19:50+0000\n"
+"PO-Revision-Date: 2016-07-08 19:50+0000\n"
 "Last-Translator: <>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
@@ -17,140 +17,309 @@ msgstr ""
 "Plural-Forms: nplurals=2; plural=(n > 1);\n"
 
 #. module: golem_family
-#: view:golem.member.family:golem_family.view_filter
-msgid "By relation"
-msgstr "Par lien familial"
+#: view:golem.family:golem_family.family_tree
+msgid "# Members"
+msgstr "# de membres"
 
 #. module: golem_family
-#: field:golem.member.family,create_uid:0
-#: field:golem.member.family.relation,create_uid:0
+#: view:golem.family:golem_family.view_form
+msgid "0000000000"
+msgstr "0000000000"
+
+#. module: golem_family
+#: view:golem.family:golem_family.view_form
+msgid "Address"
+msgstr "Addresse"
+
+#. module: golem_family
+#: view:golem.family:golem_family.view_filter
+msgid "By city"
+msgstr "Par ville"
+
+#. module: golem_family
+#: view:golem.family:golem_family.view_form
+#: field:golem.family,city:0
+msgid "City"
+msgstr "Ville"
+
+#. module: golem_family
+#: view:golem.family:golem_family.view_form
+msgid "Communication"
+msgstr "Communication"
+
+#. module: golem_family
+#: field:golem.family,count:0
+msgid "Count"
+msgstr "Nombre"
+
+#. module: golem_family
+#: view:golem.family:golem_family.view_form
+#: field:golem.family,country_id:0
+msgid "Country"
+msgstr "Pays"
+
+#. module: golem_family
+#: field:golem.family,create_uid:0
+#: field:golem.member.family.role,create_uid:0
 msgid "Created by"
 msgstr "Créé par"
 
 #. module: golem_family
-#: field:golem.member.family,create_date:0
-#: field:golem.member.family.relation,create_date:0
+#: field:golem.family,create_date:0
+#: field:golem.member.family.role,create_date:0
 msgid "Created on"
 msgstr "Créé le"
 
 #. module: golem_family
-#: field:golem.member.family,display_name:0
-#: field:golem.member.family.relation,display_name:0
+#: help:golem.family,message_last_post:0
+msgid "Date of the last message posted on the record."
+msgstr "Date du dernier message posté sur l'enregistrement."
+
+#. module: golem_family
+#: field:golem.family,display_name:0
+#: field:golem.member.family.role,display_name:0
 msgid "Display Name"
 msgstr "Nom affiché"
 
 #. module: golem_family
-#: field:golem.member,family_count:0
+#: field:golem.family,email:0
+msgid "Email"
+msgstr "Email"
+
+#. module: golem_family
+#: model:ir.ui.menu,name:golem_family.family_menu_list
+msgid "Families"
+msgstr "Familles"
+
+#. module: golem_family
+#: view:golem.family:golem_family.view_form
+#: field:golem.member,family_id:0
+#: field:res.partner,family_id:0
 msgid "Family"
 msgstr "Famille"
 
 #. module: golem_family
-#: view:golem.member.family:golem_family.family_tree
-msgid "Family Member From"
-msgstr "Ce membre de la famille"
+#: field:golem.member,family_count:0
+#: field:res.partner,family_count:0
+msgid "Family Count"
+msgstr "Somme des membres de la famille"
 
 #. module: golem_family
-#: view:golem.member.family:golem_family.family_tree
-msgid "Family Member To"
-msgstr "ce membre de la famille"
-
-#. module: golem_family
-#: code:addons/golem_family/models/golem_family.py:36
+#: code:addons/golem_family/models/golem_family.py:37
 #, python-format
 msgid "Family Members"
 msgstr "Membres de la famille"
 
 #. module: golem_family
-#: view:golem.member:golem_family.member_tab_add
-msgid "Family Relations"
-msgstr "Liens familiaux"
+#: model:ir.ui.menu,name:golem_family.family_role_menu_list
+msgid "Family Roles"
+msgstr "Rôles familiaux"
 
 #. module: golem_family
-#: field:golem.member.family,partnerfrom_id:0
-msgid "Family member from"
-msgstr "Ce membre de la famille"
+#: view:golem.family:golem_family.view_form
+msgid "Family members"
+msgstr "Membres de la famille"
 
 #. module: golem_family
-#: field:golem.member.family,partnerto_id:0
-msgid "Family member to"
-msgstr "ce membre de la famille"
+#: sql_constraint:golem.member.family.role:0
+msgid "Family role must be unique."
+msgstr "Les rôles familiaux doivent être uniques."
 
 #. module: golem_family
-#: field:golem.member.family,relation_id:0
-msgid "Family relation"
-msgstr "Lien familial"
+#: field:golem.family,message_follower_ids:0
+msgid "Followers"
+msgstr "Abonnés"
 
 #. module: golem_family
-#: sql_constraint:golem.member.family.relation:0
-msgid "Family relation must be unique."
-msgstr "Le lien familial doit être unique"
-
-#. module: golem_family
-#: model:ir.ui.menu,name:golem_family.family_menu_list
-msgid "Family relations"
-msgstr "Liens familiaux"
-
-#. module: golem_family
-#: field:golem.member.family,fullrelation:0
-msgid "Full relation string"
-msgstr "Lien familial complet"
+#: model:ir.model,name:golem_family.model_golem_family
+msgid "GOLEM Family Entity"
+msgstr "GOLEM : famille"
 
 #. module: golem_family
 #: model:ir.actions.act_window,name:golem_family.family_action_list
-msgid "GOLEM Family Relations List"
-msgstr "GOLEM : liste des liens familiaux"
+msgid "GOLEM Family List"
+msgstr "GOLEM : liste des familles"
+
+#. module: golem_family
+#: model:ir.actions.act_window,name:golem_family.family_role_action
+msgid "GOLEM Family Role List"
+msgstr "GOLEM : liste des rôles familiaux"
 
 #. module: golem_family
 #: model:ir.model,name:golem_family.model_golem_member
 msgid "GOLEM Member"
-msgstr "GOLEM : Membre de famille"
+msgstr "GOLEM : Adhérent"
 
 #. module: golem_family
-#: model:ir.model,name:golem_family.model_golem_member_family
-msgid "GOLEM Member Family"
-msgstr "GOLEM : Membre de famille"
+#: model:ir.model,name:golem_family.model_golem_member_family_role
+msgid "GOLEM Member Family Role"
+msgstr "GOLEM : rôle du membre de la famille"
 
 #. module: golem_family
-#: model:ir.model,name:golem_family.model_golem_member_family_relation
-msgid "GOLEM Member Family Relation"
-msgstr "GOLEM : lien des membres de famille"
-
-#. module: golem_family
-#: view:golem.member.family:golem_family.view_filter
+#: view:golem.family:golem_family.view_filter
 msgid "Group By"
 msgstr "Grouper par"
 
 #. module: golem_family
-#: field:golem.member.family,id:0
-#: field:golem.member.family.relation,id:0
+#: help:golem.family,message_summary:0
+msgid "Holds the Chatter summary (number of messages, ...). This summary is directly in html format in order to be inserted in kanban views."
+msgstr "Contient le résumé des discussions (nombre de message...). Ce résumé peut être directement inséré dans les vues par cartes."
+
+#. module: golem_family
+#: field:golem.family,id:0
+#: field:golem.member.family.role,id:0
 msgid "ID"
 msgstr "ID"
 
 #. module: golem_family
-#: field:golem.member.family,__last_update:0
-#: field:golem.member.family.relation,__last_update:0
+#: help:golem.family,message_unread:0
+msgid "If checked new messages require your attention."
+msgstr "Si coché, les nouveaux messages vous seront notifiés."
+
+#. module: golem_family
+#: field:golem.family,message_is_follower:0
+msgid "Is a Follower"
+msgstr "Is a Follower"
+
+#. module: golem_family
+#: field:golem.family,message_last_post:0
+msgid "Last Message Date"
+msgstr "Last Message Date"
+
+#. module: golem_family
+#: field:golem.family,__last_update:0
+#: field:golem.member.family.role,__last_update:0
 msgid "Last Modified on"
 msgstr "Dernière modification le"
 
 #. module: golem_family
-#: field:golem.member.family,write_uid:0
-#: field:golem.member.family.relation,write_uid:0
+#: field:golem.family,write_uid:0
+#: field:golem.member.family.role,write_uid:0
 msgid "Last Updated by"
 msgstr "Dernière modification par"
 
 #. module: golem_family
-#: field:golem.member.family,write_date:0
-#: field:golem.member.family.relation,write_date:0
+#: field:golem.family,write_date:0
+#: field:golem.member.family.role,write_date:0
 msgid "Last Updated on"
 msgstr "Dernière modification le"
 
 #. module: golem_family
-#: field:golem.member.family.relation,name:0
-msgid "Relation"
-msgstr "Lien familial"
+#: field:golem.family,member_ids:0
+msgid "Members"
+msgstr "Adhérents"
 
 #. module: golem_family
-#: view:golem.member.family:golem_family.family_tree
-msgid "is the ... of"
-msgstr "est le ... de"
+#: field:golem.family,message_ids:0
+msgid "Messages"
+msgstr "Messages"
+
+#. module: golem_family
+#: help:golem.family,message_ids:0
+msgid "Messages and communication history"
+msgstr "Messages historique des communications"
+
+#. module: golem_family
+#: field:golem.family,mobile:0
+msgid "Mobile"
+msgstr "Mobile"
+
+#. module: golem_family
+#: view:golem.family:golem_family.view_form
+#: field:golem.family,name:0
+msgid "Name"
+msgstr "Nom"
+
+#. module: golem_family
+#: field:golem.family,note:0
+msgid "Note"
+msgstr "Note"
+
+#. module: golem_family
+#: view:golem.family:golem_family.view_form
+msgid "Others"
+msgstr "Autres"
+
+#. module: golem_family
+#: model:ir.model,name:golem_family.model_res_partner
+msgid "Partner"
+msgstr "Partenaire"
+
+#. module: golem_family
+#: field:golem.family,phone:0
+msgid "Phone"
+msgstr "Téléphone"
+
+#. module: golem_family
+#: view:golem.family:golem_family.view_form
+msgid "Put an internal note..."
+msgstr "Rédigez une note interne..."
+
+#. module: golem_family
+#: field:golem.member,family_role:0
+#: field:golem.member.family.role,name:0
+#: field:res.partner,family_role:0
+msgid "Role"
+msgstr "Rôle"
+
+#. module: golem_family
+#: view:golem.family:golem_family.view_form
+#: field:golem.family,state_id:0
+msgid "State"
+msgstr "Région"
+
+#. module: golem_family
+#: field:golem.family,street:0
+msgid "Street"
+msgstr "Rue"
+
+#. module: golem_family
+#: view:golem.family:golem_family.view_form
+msgid "Street..."
+msgstr "Rue..."
+
+#. module: golem_family
+#: field:golem.family,street2:0
+msgid "Street2"
+msgstr "Complément de rue"
+
+#. module: golem_family
+#: field:golem.family,message_summary:0
+msgid "Summary"
+msgstr "Résumé"
+
+#. module: golem_family
+#: field:golem.family,message_unread:0
+msgid "Unread Messages"
+msgstr "Messages non lus"
+
+#. module: golem_family
+#: field:golem.family,website:0
+msgid "Website"
+msgstr "Site Web"
+
+#. module: golem_family
+#: view:golem.family:golem_family.view_form
+msgid "ZIP"
+msgstr "Code postal"
+
+#. module: golem_family
+#: field:golem.family,zip:0
+msgid "Zip"
+msgstr "Code postal"
+
+#. module: golem_family
+#: view:golem.family:golem_family.view_form
+msgid "e.g. www.odoo.com"
+msgstr "par exemple www.yaltik.com"
+
+#. module: golem_family
+#: view:golem.member:golem_family.family_smartbtn_add
+msgid "family members"
+msgstr "famille"
+
+#. module: golem_family
+#: view:golem.family:golem_family.view_form
+msgid "name@example.org"
+msgstr "nom@exemple.ext"
 
diff --git a/golem_family/i18n/golem_family.pot b/golem_family/i18n/golem_family.pot
index 796be5d..9f43e23 100644
--- a/golem_family/i18n/golem_family.pot
+++ b/golem_family/i18n/golem_family.pot
@@ -6,8 +6,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Odoo Server 8.0\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2016-06-28 03:15+0000\n"
-"PO-Revision-Date: 2016-06-28 03:15+0000\n"
+"POT-Creation-Date: 2016-07-08 19:50+0000\n"
+"PO-Revision-Date: 2016-07-08 19:50+0000\n"
 "Last-Translator: <>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
@@ -16,87 +16,132 @@ msgstr ""
 "Plural-Forms: \n"
 
 #. module: golem_family
-#: view:golem.member.family:golem_family.view_filter
-msgid "By relation"
+#: view:golem.family:golem_family.family_tree
+msgid "# Members"
 msgstr ""
 
 #. module: golem_family
-#: field:golem.member.family,create_uid:0
-#: field:golem.member.family.relation,create_uid:0
+#: view:golem.family:golem_family.view_form
+msgid "0000000000"
+msgstr ""
+
+#. module: golem_family
+#: view:golem.family:golem_family.view_form
+msgid "Address"
+msgstr ""
+
+#. module: golem_family
+#: view:golem.family:golem_family.view_filter
+msgid "By city"
+msgstr ""
+
+#. module: golem_family
+#: view:golem.family:golem_family.view_form
+#: field:golem.family,city:0
+msgid "City"
+msgstr ""
+
+#. module: golem_family
+#: view:golem.family:golem_family.view_form
+msgid "Communication"
+msgstr ""
+
+#. module: golem_family
+#: field:golem.family,count:0
+msgid "Count"
+msgstr ""
+
+#. module: golem_family
+#: view:golem.family:golem_family.view_form
+#: field:golem.family,country_id:0
+msgid "Country"
+msgstr ""
+
+#. module: golem_family
+#: field:golem.family,create_uid:0
+#: field:golem.member.family.role,create_uid:0
 msgid "Created by"
 msgstr ""
 
 #. module: golem_family
-#: field:golem.member.family,create_date:0
-#: field:golem.member.family.relation,create_date:0
+#: field:golem.family,create_date:0
+#: field:golem.member.family.role,create_date:0
 msgid "Created on"
 msgstr ""
 
 #. module: golem_family
-#: field:golem.member.family,display_name:0
-#: field:golem.member.family.relation,display_name:0
+#: help:golem.family,message_last_post:0
+msgid "Date of the last message posted on the record."
+msgstr ""
+
+#. module: golem_family
+#: field:golem.family,display_name:0
+#: field:golem.member.family.role,display_name:0
 msgid "Display Name"
 msgstr ""
 
 #. module: golem_family
-#: field:golem.member,family_count:0
+#: field:golem.family,email:0
+msgid "Email"
+msgstr ""
+
+#. module: golem_family
+#: model:ir.ui.menu,name:golem_family.family_menu_list
+msgid "Families"
+msgstr ""
+
+#. module: golem_family
+#: view:golem.family:golem_family.view_form
+#: field:golem.member,family_id:0
+#: field:res.partner,family_id:0
 msgid "Family"
 msgstr ""
 
 #. module: golem_family
-#: view:golem.member.family:golem_family.family_tree
-msgid "Family Member From"
+#: field:golem.member,family_count:0
+#: field:res.partner,family_count:0
+msgid "Family Count"
 msgstr ""
 
 #. module: golem_family
-#: view:golem.member.family:golem_family.family_tree
-msgid "Family Member To"
-msgstr ""
-
-#. module: golem_family
-#: code:addons/golem_family/models/golem_family.py:36
+#: code:addons/golem_family/models/golem_family.py:37
 #, python-format
 msgid "Family Members"
 msgstr ""
 
 #. module: golem_family
-#: view:golem.member:golem_family.member_tab_add
-msgid "Family Relations"
+#: model:ir.ui.menu,name:golem_family.family_role_menu_list
+msgid "Family Roles"
 msgstr ""
 
 #. module: golem_family
-#: field:golem.member.family,partnerfrom_id:0
-msgid "Family member from"
+#: view:golem.family:golem_family.view_form
+msgid "Family members"
 msgstr ""
 
 #. module: golem_family
-#: field:golem.member.family,partnerto_id:0
-msgid "Family member to"
+#: sql_constraint:golem.member.family.role:0
+msgid "Family role must be unique."
 msgstr ""
 
 #. module: golem_family
-#: field:golem.member.family,relation_id:0
-msgid "Family relation"
+#: field:golem.family,message_follower_ids:0
+msgid "Followers"
 msgstr ""
 
 #. module: golem_family
-#: sql_constraint:golem.member.family.relation:0
-msgid "Family relation must be unique."
-msgstr ""
-
-#. module: golem_family
-#: model:ir.ui.menu,name:golem_family.family_menu_list
-msgid "Family relations"
-msgstr ""
-
-#. module: golem_family
-#: field:golem.member.family,fullrelation:0
-msgid "Full relation string"
+#: model:ir.model,name:golem_family.model_golem_family
+msgid "GOLEM Family Entity"
 msgstr ""
 
 #. module: golem_family
 #: model:ir.actions.act_window,name:golem_family.family_action_list
-msgid "GOLEM Family Relations List"
+msgid "GOLEM Family List"
+msgstr ""
+
+#. module: golem_family
+#: model:ir.actions.act_window,name:golem_family.family_role_action
+msgid "GOLEM Family Role List"
 msgstr ""
 
 #. module: golem_family
@@ -105,51 +150,175 @@ msgid "GOLEM Member"
 msgstr ""
 
 #. module: golem_family
-#: model:ir.model,name:golem_family.model_golem_member_family
-msgid "GOLEM Member Family"
+#: model:ir.model,name:golem_family.model_golem_member_family_role
+msgid "GOLEM Member Family Role"
 msgstr ""
 
 #. module: golem_family
-#: model:ir.model,name:golem_family.model_golem_member_family_relation
-msgid "GOLEM Member Family Relation"
-msgstr ""
-
-#. module: golem_family
-#: view:golem.member.family:golem_family.view_filter
+#: view:golem.family:golem_family.view_filter
 msgid "Group By"
 msgstr ""
 
 #. module: golem_family
-#: field:golem.member.family,id:0
-#: field:golem.member.family.relation,id:0
+#: help:golem.family,message_summary:0
+msgid "Holds the Chatter summary (number of messages, ...). This summary is directly in html format in order to be inserted in kanban views."
+msgstr ""
+
+#. module: golem_family
+#: field:golem.family,id:0
+#: field:golem.member.family.role,id:0
 msgid "ID"
 msgstr ""
 
 #. module: golem_family
-#: field:golem.member.family,__last_update:0
-#: field:golem.member.family.relation,__last_update:0
+#: help:golem.family,message_unread:0
+msgid "If checked new messages require your attention."
+msgstr ""
+
+#. module: golem_family
+#: field:golem.family,message_is_follower:0
+msgid "Is a Follower"
+msgstr ""
+
+#. module: golem_family
+#: field:golem.family,message_last_post:0
+msgid "Last Message Date"
+msgstr ""
+
+#. module: golem_family
+#: field:golem.family,__last_update:0
+#: field:golem.member.family.role,__last_update:0
 msgid "Last Modified on"
 msgstr ""
 
 #. module: golem_family
-#: field:golem.member.family,write_uid:0
-#: field:golem.member.family.relation,write_uid:0
+#: field:golem.family,write_uid:0
+#: field:golem.member.family.role,write_uid:0
 msgid "Last Updated by"
 msgstr ""
 
 #. module: golem_family
-#: field:golem.member.family,write_date:0
-#: field:golem.member.family.relation,write_date:0
+#: field:golem.family,write_date:0
+#: field:golem.member.family.role,write_date:0
 msgid "Last Updated on"
 msgstr ""
 
 #. module: golem_family
-#: field:golem.member.family.relation,name:0
-msgid "Relation"
+#: field:golem.family,member_ids:0
+msgid "Members"
 msgstr ""
 
 #. module: golem_family
-#: view:golem.member.family:golem_family.family_tree
-msgid "is the ... of"
+#: field:golem.family,message_ids:0
+msgid "Messages"
+msgstr ""
+
+#. module: golem_family
+#: help:golem.family,message_ids:0
+msgid "Messages and communication history"
+msgstr ""
+
+#. module: golem_family
+#: field:golem.family,mobile:0
+msgid "Mobile"
+msgstr ""
+
+#. module: golem_family
+#: view:golem.family:golem_family.view_form
+#: field:golem.family,name:0
+msgid "Name"
+msgstr ""
+
+#. module: golem_family
+#: field:golem.family,note:0
+msgid "Note"
+msgstr ""
+
+#. module: golem_family
+#: view:golem.family:golem_family.view_form
+msgid "Others"
+msgstr ""
+
+#. module: golem_family
+#: model:ir.model,name:golem_family.model_res_partner
+msgid "Partner"
+msgstr ""
+
+#. module: golem_family
+#: field:golem.family,phone:0
+msgid "Phone"
+msgstr ""
+
+#. module: golem_family
+#: view:golem.family:golem_family.view_form
+msgid "Put an internal note..."
+msgstr ""
+
+#. module: golem_family
+#: field:golem.member,family_role:0
+#: field:golem.member.family.role,name:0
+#: field:res.partner,family_role:0
+msgid "Role"
+msgstr ""
+
+#. module: golem_family
+#: view:golem.family:golem_family.view_form
+#: field:golem.family,state_id:0
+msgid "State"
+msgstr ""
+
+#. module: golem_family
+#: field:golem.family,street:0
+msgid "Street"
+msgstr ""
+
+#. module: golem_family
+#: view:golem.family:golem_family.view_form
+msgid "Street..."
+msgstr ""
+
+#. module: golem_family
+#: field:golem.family,street2:0
+msgid "Street2"
+msgstr ""
+
+#. module: golem_family
+#: field:golem.family,message_summary:0
+msgid "Summary"
+msgstr ""
+
+#. module: golem_family
+#: field:golem.family,message_unread:0
+msgid "Unread Messages"
+msgstr ""
+
+#. module: golem_family
+#: field:golem.family,website:0
+msgid "Website"
+msgstr ""
+
+#. module: golem_family
+#: view:golem.family:golem_family.view_form
+msgid "ZIP"
+msgstr ""
+
+#. module: golem_family
+#: field:golem.family,zip:0
+msgid "Zip"
+msgstr ""
+
+#. module: golem_family
+#: view:golem.family:golem_family.view_form
+msgid "e.g. www.odoo.com"
+msgstr ""
+
+#. module: golem_family
+#: view:golem.member:golem_family.family_smartbtn_add
+msgid "family members"
+msgstr ""
+
+#. module: golem_family
+#: view:golem.family:golem_family.view_form
+msgid "name@example.org"
 msgstr ""
 
diff --git a/golem_family/models/golem_family.py b/golem_family/models/golem_family.py
index eeeaa51..edca00d 100644
--- a/golem_family/models/golem_family.py
+++ b/golem_family/models/golem_family.py
@@ -27,6 +27,10 @@ class ResPartner(models.Model):
                                   string='Role', index=True)
     family_count = fields.Integer('Family Count', related='family_id.count')
 
+
+class GolemMember(models.Model):
+    _inherit = 'golem.member'
+
     @api.multi
     def button_family_members(self):
         self.ensure_one()
@@ -34,7 +38,7 @@ class ResPartner(models.Model):
                 'type': 'ir.actions.act_window',
                 'res_model': 'golem.family',
                 'view_mode': 'form',
-                'domain': [('id', '=', self.family_id.id)]}
+                'res_id': self.family_id.id}
 
 
 class GolemFamily(models.Model):
diff --git a/golem_family/views/golem_family_view.xml b/golem_family/views/golem_family_view.xml
index fdba849..29cff18 100644
--- a/golem_family/views/golem_family_view.xml
+++ b/golem_family/views/golem_family_view.xml
@@ -29,6 +29,7 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
             <group>
               <div class="oe_title">
                 <h1>
+                  <label for="name" string="Family" />
                   <field name="name" class="oe_inline" placeholder="Name" />
                 </h1>
               </div>
@@ -113,6 +114,24 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
     </record>
 
     <!-- Searches -->
+    <record id="view_filter" model="ir.ui.view">
+      <field name="name">GOLEM Family Filters</field>
+      <field name="model">golem.family</field>
+      <field name="arch" type="xml">
+        <search>
+          <field name="name" />
+          <field name="zip" />
+          <field name="city" />
+          <field name="phone" />
+          <field name="mobile" />
+          <field name="email" />
+          <group string="Group By">
+            <filter name="group_city" string="By city"
+              context="{'group_by': 'city'}"/>
+          </group>
+        </search>
+      </field>
+    </record>
 
     <!-- Actions -->
     <act_window id="family_action_list" name="GOLEM Family List"
diff --git a/golem_family/views/golem_member_view.xml b/golem_family/views/golem_member_view.xml
index f42df9b..0b344b2 100644
--- a/golem_family/views/golem_member_view.xml
+++ b/golem_family/views/golem_member_view.xml
@@ -20,65 +20,27 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 <openerp>
   <data>
     <!-- Form -->
-    <record model="ir.ui.view" id="member_tab_add">
-      <field name="name">Add family management to new tab</field>
+    <record model="ir.ui.view" id="family_smartbtn_add">
+      <field name="name">Add family management smart button</field>
       <field name="model">golem.member</field>
       <field name="inherit_id" ref="golem_member.view_form" />
       <field name="arch" type="xml">
         <div class="oe_title" position="after">
           <div class="oe_right oe_button_box">
-            <button
-              class="oe_inline oe_stat_button" type="object"
-              name="button_family_members" icon="fa-users">
-              <field string="Family Relations" name="family_count" widget="statinfo" />
+            <button class="oe_inline oe_stat_button" type="object"
+              name="button_family_members" icon="fa-users"
+              attrs="{'invisible': [('family_id', '=', False)]}">
+              <field string="family members" name="family_count"
+                widget="statinfo" />
             </button>
           </div>
         </div>
+        <field name="lastname" position="before">
+          <field name="family_id" />
+          <field name="family_role" />
+        </field>
       </field>
     </record>
 
-    <!-- Tree -->
-    <record id="family_tree" model="ir.ui.view">
-      <field name="name">Family list</field>
-      <field name="model">golem.member.family</field>
-      <field name="arch" type="xml">
-        <tree editable="top">
-          <field name="partnerfrom_id" string="Family Member From" />
-          <field name="relation_id" string="is the ... of" />
-          <field name="partnerto_id" string="Family Member To" />
-        </tree>
-      </field>
-    </record>
-
-    <!-- Searches -->
-    <record id="view_filter" model="ir.ui.view">
-      <field name="name">GOLEM Families Filters</field>
-      <field name="model">golem.member.family</field>
-      <field name="arch" type="xml">
-        <search>
-          <field name="fullrelation" />
-          <field name="relation_id" widget="many2one" />
-          <group string="Group By">
-            <filter name="group_relation" string="By relation"
-              context="{'group_by': 'relation_id'}"/>
-          </group>
-        </search>
-      </field>
-    </record>
-
-    <!-- Actions -->
-    <act_window id="family_action_list" name="GOLEM Family Relations List"
-      res_model="golem.member.family" view_mode="tree" />
-    <act_window id="family_relation_type_action"
-      name="GOLEM Family Relation Types List"
-      res_model="golem.member.family.relation" view_mode="tree" />
-    <!-- Menus -->
-    <menuitem id="family_menu_list" name="Family relations"
-      parent="membership.menu_membership" action="family_action_list"
-      sequence="10" />
-    <menuitem id="family_relation_type_menu_list" name="Family Rel. Types"
-      parent="base.menu_marketing_config_association"
-      action="family_relation_type_action" sequence="3" />
-
   </data>
 </openerp>