diff --git a/src/Bundle/ChillPersonBundle/Resources/views/Household/members.html.twig b/src/Bundle/ChillPersonBundle/Resources/views/Household/members.html.twig
index 610f80cde..cc1c8f321 100644
--- a/src/Bundle/ChillPersonBundle/Resources/views/Household/members.html.twig
+++ b/src/Bundle/ChillPersonBundle/Resources/views/Household/members.html.twig
@@ -6,127 +6,127 @@
 <h1>{{ block('title') }}</h1>
 
 {% for p in positions %}
-<h3>{{ p.label|localize_translatable_string }}</h3>
+  <h3>{{ p.label|localize_translatable_string }}</h3>
 
-{% if false == p.shareHousehold %}
-<p>{{ 'household.Those members does not share address'|trans }}</p>
-{% endif %}
+  {% if false == p.shareHousehold %}
+    <p>{{ 'household.Those members does not share address'|trans }}</p>
+  {% endif %}
 
-{%- set members = household.currentMembersByPosition(p) %}
-{% if members|length > 0 %}
-<div class="flex-table list-household-members">
-  {% for m in members %}
-  <div class="item-bloc">
-    <div class="item-row person">
-      <div class="item-col box-person">
-        <div>
-          {{ m.person|chill_entity_render_box({'addLink': true}) }}
-          {% if m.holder %}
-            <span class="badge badge-primary">{{ 'household.holder'|trans }}</span>
+  {%- set members = household.currentMembersByPosition(p) %}
+  {% if members|length > 0 %}
+    <div class="flex-table list-household-members">
+      {% for m in members %}
+        <div class="item-bloc">
+          <div class="item-row person">
+            <div class="item-col box-person">
+              <div>
+                {{ m.person|chill_entity_render_box({'addLink': true}) }}
+                {% if m.holder %}
+                  <span class="badge badge-primary">{{ 'household.holder'|trans }}</span>
+                {% endif %}
+              </div>
+              <div>
+                {{ 'Born the date'|trans({ 'gender': m.person.gender, 'birthdate': m.person.birthdate|format_date('long') }) }}
+              </div>
+            </div>
+            <div class="item-col box-where">
+              <ul class="list-content fa-ul">
+                {% if m.startDate is not empty %}
+                  <li>{{ 'Since %date%'|trans({'%date%': m.startDate|format_date('long') }) }}</li>
+                {% endif %}
+                {% if m.endDate is not empty %}
+                  <li>{{ 'Until %date%'|trans({'%date%': m.endDate|format_date('long') }) }}</li>
+                {% endif %}
+              </ul>
+              <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 }}
+                  </a>
+                </li>
+                <li>
+                  <a href="#" class="sc-button" /><i class="fa fa-sign-out"></i>{{ 'household.Leave'|trans }}</a>
+                </li>
+              </ul>
+            </div>
+          </div>
+          {% if m.comment is not empty %}
+            <div class="item-row comment">
+              <blockquote class="chill-user-quote">
+                {{ m.comment|chill_markdown_to_html }}
+              </blockquote>
+            </div>
           {% endif %}
         </div>
-        <div>
-          {{ 'Born the date'|trans({ 'gender': m.person.gender, 'birthdate': m.person.birthdate|format_date('long') }) }}
-        </div>
-      </div>
-      <div class="item-col box-where">
-        <ul class="list-content fa-ul">
-          {% if m.startDate is not empty %}
-            <li>{{ 'Since %date%'|trans({'%date%': m.startDate|format_date('long') }) }}</li>
-          {% endif %}
-          {% if m.endDate is not empty %}
-            <li>{{ 'Until %date%'|trans({'%date%': m.endDate|format_date('long') }) }}</li>
-          {% endif %}
-        </ul>
-        <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 }}
-            </a>
-          </li>
-          <li>
-            <a href="#" class="sc-button" /><i class="fa fa-sign-out"></i>{{ 'household.Leave'|trans }}</a>
-          </li>
-        </ul>
+      {% endfor %}
+    </div>
+  {% else %}
+  <p class="chill-no-data-statement">{{ 'household.Any persons into this position'|trans }}</p>
+  {% endif %}
+
+  {% set members = household.nonCurrentMembersByPosition(p) %}
+  {% if members|length > 0 %}
+    <p><!-- force a space after table --></p>
+    <button class="sc-button bt-green" type="button" data-toggle="collapse" data-target="#nonCurrent_{{ p.id }}" aria-expanded="false" aria-controls="collapse non current members">
+      {{ 'household.Show future or past memberships'|trans({'length': members|length}) }}
+    </button>
+
+    <div id="nonCurrent_{{ p.id }}" class="collapse">
+      <div class="flex-table list-household-members">
+        {% for m in members %}
+          <div class="item-bloc">
+            <div class="item-row person">
+              <div class="item-col box-person">
+                <div>
+                  {{ m.person|chill_entity_render_box({'addLink': true}) }}
+                  {% if m.holder %}
+                    <span class="badge badge-primary">{{ 'household.holder'|trans }}</span>
+                  {% endif %}
+                </div>
+                <div>
+                  {{ 'Born the date'|trans({ 'gender': m.person.gender, 'birthdate': m.person.birthdate|format_date('long') }) }}
+                </div>
+              </div>
+              <div class="item-col box-where">
+                <ul class="list-content fa-ul">
+                  {% if m.startDate is not empty %}
+                    <li>{{ 'Since %date%'|trans({'%date%': m.startDate|format_date('long') }) }}</li>
+                  {% endif %}
+                  {% if m.endDate is not empty %}
+                    <li>{{ 'Until %date%'|trans({'%date%': m.endDate|format_date('long') }) }}</li>
+                  {% endif %}
+                </ul>
+                <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 }}
+                    </a>
+                  </li>
+                </ul>
+              </div>
+            </div>
+            {% if m.comment is not empty %}
+            <div class="item-row comment">
+              <blockquote class="chill-user-quote">
+                {{ m.comment|chill_markdown_to_html }}
+              </blockquote>
+            </div>
+            {% endif %}
+          </div>
+        {% endfor %}
       </div>
     </div>
-    {% if m.comment is not empty %}
-    <div class="item-row comment">
-      <blockquote class="chill-user-quote">
-        {{ m.comment|chill_markdown_to_html }}
-      </blockquote>
-    </div>
-    {% endif %}
-  </div>
-  {% endfor %}
-</div>
-{% else %}
-<p class="chill-no-data-statement">{{ 'household.Any persons into this position'|trans }}</p>
-{% endif %}
 
-{% set members = household.nonCurrentMembersByPosition(p) %}
-{% if members|length > 0 %}
-<p><!-- force a space after table --></p>
-<button class="sc-button bt-green" type="button" data-toggle="collapse" data-target="#nonCurrent_{{ p.id }}" aria-expanded="false" aria-controls="collapse non current members">
-  {{ 'household.Show future or past memberships'|trans({'length': members|length}) }}
-</button>
-
-<div id="nonCurrent_{{ p.id }}" class="collapse">
-  <div class="flex-table list-household-members">
-    {% for m in members %}
-  <div class="item-bloc">
-    <div class="item-row person">
-      <div class="item-col box-person">
-        <div>
-          {{ m.person|chill_entity_render_box({'addLink': true}) }}
-          {% if m.holder %}
-            <span class="badge badge-primary">{{ 'household.holder'|trans }}</span>
-          {% endif %}
-        </div>
-        <div>
-          {{ 'Born the date'|trans({ 'gender': m.person.gender, 'birthdate': m.person.birthdate|format_date('long') }) }}
-        </div>
-      </div>
-      <div class="item-col box-where">
-        <ul class="list-content fa-ul">
-          {% if m.startDate is not empty %}
-            <li>{{ 'Since %date%'|trans({'%date%': m.startDate|format_date('long') }) }}</li>
-          {% endif %}
-          {% if m.endDate is not empty %}
-            <li>{{ 'Until %date%'|trans({'%date%': m.endDate|format_date('long') }) }}</li>
-          {% endif %}
-        </ul>
-        <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 }}
-            </a>
-          </li>
-        </ul>
-      </div>
-    </div>
-    {% if m.comment is not empty %}
-    <div class="item-row comment">
-      <blockquote class="chill-user-quote">
-        {{ m.comment|chill_markdown_to_html }}
-      </blockquote>
-    </div>
-    {% endif %}
-  </div>
-
-    {% endfor %}
-  </div>
-</div>
-
-{% endif %}
+  {% endif %}
 
 {% endfor %}
+
 <ul class="record_actions sticky-form-buttons">
   <li>
     <a class="sc-button bt-create">