diff --git a/src/Bundle/ChillMainBundle/Resources/views/layout.html.twig b/src/Bundle/ChillMainBundle/Resources/views/layout.html.twig
index 3cc05e434..140557d69 100644
--- a/src/Bundle/ChillMainBundle/Resources/views/layout.html.twig
+++ b/src/Bundle/ChillMainBundle/Resources/views/layout.html.twig
@@ -53,31 +53,23 @@
{% block sublayout_content %}
- {# Flash messages ! #}
- {% if app.session.flashbag.keys()|length > 0 %}
-
+ {% for flashMessage in app.session.flashbag.get('success') %}
+
+ {{ flashMessage|raw }}
+
+ {% endfor %}
+ {% for flashMessage in app.session.flashbag.get('error') %}
+
+ {{ flashMessage|raw }}
+
+ {% endfor %}
- {% for flashMessage in app.session.flashbag.get('success') %}
-
- {{ flashMessage|raw }}
-
- {% endfor %}
-
- {% for flashMessage in app.session.flashbag.get('error') %}
-
- {{ flashMessage|raw }}
-
- {% endfor %}
-
- {% for flashMessage in app.session.flashbag.get('notice') %}
-
- {{ flashMessage|raw }}
-
- {% endfor %}
-
-
- {% endif %}
+ {% for flashMessage in app.session.flashbag.get('notice') %}
+
+ {{ flashMessage|raw }}
+
+ {% endfor %}
{% block content %}
diff --git a/src/Bundle/ChillMainBundle/Resources/views/layoutWithVerticalMenu.html.twig b/src/Bundle/ChillMainBundle/Resources/views/layoutWithVerticalMenu.html.twig
index be582ab3b..e11e5f51c 100644
--- a/src/Bundle/ChillMainBundle/Resources/views/layoutWithVerticalMenu.html.twig
+++ b/src/Bundle/ChillMainBundle/Resources/views/layoutWithVerticalMenu.html.twig
@@ -27,30 +27,23 @@
- {# Flash messages ! #}
- {% if app.session.flashbag.keys()|length > 0 %}
-
+ {% for flashMessage in app.session.flashbag.get('success') %}
+
+ {{ flashMessage|raw }}
+
+ {% endfor %}
- {% for flashMessage in app.session.flashbag.get('success') %}
-
- {{ flashMessage|raw }}
-
- {% endfor %}
+ {% for flashMessage in app.session.flashbag.get('error') %}
+
+ {{ flashMessage|raw }}
+
+ {% endfor %}
- {% for flashMessage in app.session.flashbag.get('error') %}
-
- {{ flashMessage|raw }}
-
- {% endfor %}
-
- {% for flashMessage in app.session.flashbag.get('notice') %}
-
- {{ flashMessage|raw }}
-
- {% endfor %}
-
-
- {% endif %}
+ {% for flashMessage in app.session.flashbag.get('notice') %}
+
+ {{ flashMessage|raw }}
+
+ {% endfor %}
{% block layout_wvm_content %}
{% endblock %}
diff --git a/src/Bundle/ChillPersonBundle/Resources/views/Person/banner.html.twig b/src/Bundle/ChillPersonBundle/Resources/views/Person/banner.html.twig
index 67c8375fc..b603dd70c 100644
--- a/src/Bundle/ChillPersonBundle/Resources/views/Person/banner.html.twig
+++ b/src/Bundle/ChillPersonBundle/Resources/views/Person/banner.html.twig
@@ -45,12 +45,13 @@
{% endif %}
+ {% set address = null %}
{%- if person.currentHouseholdAddress is not empty -%}
{% set address = person.currentHouseholdAddress %}
{%- elseif person.lastAddress is not empty -%}
{% set address = person.lastAddress %}
{%- endif -%}
- {%- if address -%}
+ {%- if address is not null -%}
{{ address|chill_entity_render_box({
'render': 'inline', 'multiline': false, 'with_picto': true, 'with_delimiter': true
diff --git a/src/Bundle/ChillPersonBundle/Resources/views/Person/create.html.twig b/src/Bundle/ChillPersonBundle/Resources/views/Person/create.html.twig
index a8c2d6356..036dc5d01 100644
--- a/src/Bundle/ChillPersonBundle/Resources/views/Person/create.html.twig
+++ b/src/Bundle/ChillPersonBundle/Resources/views/Person/create.html.twig
@@ -36,8 +36,6 @@
{{ form_row(form.gender, { 'label' : 'Gender'|trans }) }}
- {{ form_row(form.creation_date, { 'label' : 'Creation date'|trans }) }}
-
{{ form_rest(form) }}