diff --git a/src/Bundle/ChillPersonBundle/Resources/views/Household/banner.html.twig b/src/Bundle/ChillPersonBundle/Resources/views/Household/banner.html.twig
index 021bb4571..4da02165c 100644
--- a/src/Bundle/ChillPersonBundle/Resources/views/Household/banner.html.twig
+++ b/src/Bundle/ChillPersonBundle/Resources/views/Household/banner.html.twig
@@ -19,21 +19,21 @@
     <div class="grid-12 parent" id="header-household-details" >
         <div class="grid-10 push-1 grid-mobile-12 grid-tablet-12 push-mobile-0 push-tablet-0 parent">
             <div id="banner-misc">
-              {%- set persons = household.getCurrentPersons() -%}
-              {%- if persons|length > 0 -%}
-              <span class="current-members-explain">
-              {{- 'household.Current household members'|trans }}:
-              </span>
-              {%- for p in persons|slice(0, 5) -%}
-              {{- p|chill_entity_render_box({'addLink': false}) -}}
-              {%- if false == loop.last -%}, {% endif -%}
-              {%- endfor -%}
-              {% if persons|length > 5 %}
-              <span class="current-members-more">
-              {{ 'household.and x other persons'|trans({'x': persons|length-5}) }}
-              </span>
-              {% endif %} 
-              {%- endif -%}
+                {%- set persons = household.getCurrentPersons() -%}
+                {%- if persons|length > 0 -%}
+                    <span class="current-members-explain">
+                      {{- 'household.Current household members'|trans }}:
+                    </span>
+                    {%- for p in persons|slice(0, 5) -%}
+                        {{- p|chill_entity_render_box({'addLink': false}) -}}
+                        {%- if false == loop.last -%}, {% endif -%}
+                    {%- endfor -%}
+                    {% if persons|length > 5 %}
+                        <span class="current-members-more">
+                            {{ 'household.and x other persons'|trans({'x': persons|length-5}) }}
+                        </span>
+                    {% endif %} 
+                {%- endif -%}
             </div>
         </div>
     </div>
diff --git a/src/Bundle/ChillPersonBundle/Resources/views/Household/members.html.twig b/src/Bundle/ChillPersonBundle/Resources/views/Household/members.html.twig
index e586f3543..afffc2edb 100644
--- a/src/Bundle/ChillPersonBundle/Resources/views/Household/members.html.twig
+++ b/src/Bundle/ChillPersonBundle/Resources/views/Household/members.html.twig
@@ -95,25 +95,17 @@
               <ul class="record_actions">
                 <li>
                   <a 
-                  href="{{ chill_path_add_return_path('chill_person_household_member_edit', { 'id': m.id }) }}" 
-                  class="sc-button bt-edit" 
-                  />
-                    {{ 'household.Update membership'|trans }}
+                  href="{{ chill_path_add_return_path('chill_person_household_members_editor', {
+                      'persons': [ m.person.id ], 
+                      'allow_leave_without_household': true 
+                    } ) }}" class="sc-button" title="{{ 'household.Leave household'|trans }}" />
+                    <i class="fa fa-sign-out"></i>
+                    {{ 'household.Leave household'|trans }}
                   </a>
                 </li>
                 <li>
-                  <a 
-                  href="{{ chill_path_add_return_path(
-                    'chill_person_household_members_editor', 
-                    {
-                      'persons': [ m.person.id ], 
-                      'allow_leave_without_household': true 
-                    } ) }}"
-                    class="sc-button" 
-                    />
-                    <i class="fa fa-sign-out"></i>
-                    {{ 'household.Leave'|trans }}
-                  </a>
+                    <a href="{{ chill_path_add_return_path('chill_person_household_member_edit', { 'id': m.id }) }}" 
+                    class="sc-button bt-edit" title="{{ 'household.Update membership'|trans }}"/></a>
                 </li>
               </ul>
             </div>
@@ -168,10 +160,7 @@
                   <li>
                     <a 
                     href="{{ chill_path_add_return_path('chill_person_household_member_edit', { 'id': m.id }) }}" 
-                    class="sc-button bt-edit" 
-                    />
-                      {{ 'household.Update membership'|trans }}
-                    </a>
+                    class="sc-button bt-edit" title="{{ 'household.Update membership'|trans }}" /></a>
                   </li>
                 </ul>
               </div>