diff --git a/src/Bundle/ChillPersonBundle/Resources/views/Person/edit.html.twig b/src/Bundle/ChillPersonBundle/Resources/views/Person/edit.html.twig
index 9f65d150c..fd6baa846 100644
--- a/src/Bundle/ChillPersonBundle/Resources/views/Person/edit.html.twig
+++ b/src/Bundle/ChillPersonBundle/Resources/views/Person/edit.html.twig
@@ -21,10 +21,11 @@
 {% block title %}{{ 'Update details for %name%'|trans({ '%name%': person.firstName|capitalize ~ ' ' ~ person.lastName } )|capitalize }}{% endblock %}
 
 {% block personcontent %}
-
+<div class="person-edit">
+    
     <h1>{{ 'Update details for %name%'|trans({ '%name%': person.firstName|capitalize ~ ' ' ~ person.lastName|capitalize } ) }}</h1>
-    {% form_theme form '@ChillMain/Form/fields.html.twig' %}
 
+    {% form_theme form '@ChillMain/Form/fields.html.twig' %}
     {{ form_start(form) }}
 
     {% if form.memo is defined %}
@@ -42,6 +43,7 @@
             {{ form_widget(form.altNames, { 'label': 'Alternative names'}) }}
         {% endif %}
         {{ form_row(form.gender, {'label' : 'Gender'}) }}
+        {{ form_row(form.genderComment, { 'label' : 'Comment on the gender'} ) }}
     </fieldset>
 
     <fieldset>
@@ -53,9 +55,12 @@
         {%- if form.countryOfBirth is defined -%}
         {{ form_row(form.countryOfBirth, { 'label' : 'Country of birth' } ) }}
         {%- endif -%}
+        {%- if form.deathdate is defined -%}
+        {{ form_row(form.deathdate, { 'label' : 'Date of death' } ) }}
+        {%- endif -%}
     </fieldset>
 
-    {%- if form.nationality is defined or form.spokenLanguages is defined or form.maritalStatus is defined -%}
+    {%- if form.nationality is defined or form.spokenLanguages is defined -%}
     <fieldset>
         <legend><h2>{{ 'Administrative information'|trans }}</h2></legend>
         {%- if form.nationality is defined -%}
@@ -64,8 +69,21 @@
         {%- if form.spokenLanguages is defined -%}
         {{ form_row(form.spokenLanguages, {'label' : 'Spoken languages'}) }}
         {%- endif -%}
+    </fieldset>
+    {%- endif -%}
+
+    {%- if form.numberOfChildren is defined or form.maritalStatus is defined -%}
+    <fieldset>
+        <legend><h2>{{ 'Marital status'|trans }}</h2></legend>
+        {{ form_row(form.numberOfChildren, {'label' : 'Number of children'}) }}
         {%- if form.maritalStatus is defined -%}
-        {{ form_row(form.maritalStatus, { 'label' : 'Marital status'} ) }}
+        <div id="maritalStatus">
+            {{ form_row(form.maritalStatus, { 'label' : 'Marital status'} ) }}
+        </div>
+        <div id="maritalStatusDate">
+            {{ form_row(form.maritalStatusDate, { 'label' : 'Date of last marital status change'} ) }}
+            {{ form_row(form.maritalStatusComment, { 'label' : 'Comment on the marital status'} ) }}
+        </div>
         {%- endif -%}
     </fieldset>
     {%- endif -%}
@@ -74,13 +92,28 @@
     <fieldset>
         <legend><h2>{{ 'Contact information'|trans }}</h2></legend>
         {%- if form.email is defined -%}
-        {{ form_row(form.email, {'label': 'Email'}) }}
+        <div id="personEmail">
+            {{ form_row(form.email, {'label': 'Email'}) }}
+        </div>
+        <div id="personAcceptEmail">
+            {{ form_row(form.acceptEmail, {'label' : 'Accept emails ?'}) }}
+        </div>
         {%- endif -%}
+
         {%- if form.phonenumber is defined -%}
         {{ form_row(form.phonenumber, {'label': 'Phonenumber'}) }}
         {%- endif -%}
         {%- if form.mobilenumber is defined -%}
-        {{ form_row(form.mobilenumber, {'label': 'Mobilenumber'}) }}
+        <div id="personPhoneNumber">
+            {{ form_row(form.mobilenumber, {'label': 'Mobilenumber'}) }}
+        </div>
+        <div id="personAcceptSMS">
+            {{ form_row(form.acceptSMS, {'label' : 'Accept short text message ?'}) }}
+        </div>
+        {%- endif -%}
+        {%- if form.otherPhoneNumbers is defined -%}
+            {{ form_widget(form.otherPhoneNumbers) }}
+            {{ form_errors(form.otherPhoneNumbers) }}
         {%- endif -%}
         {%- if form.contactInfo is defined -%}
         {{ form_row(form.contactInfo, {'label': 'Notes on contact information'}) }}
@@ -103,13 +136,11 @@
         </li>
     </ul>
 
-
     {{ form_end(form) }}
 
-
+</div>
 {% endblock personcontent %}
 
-
 {% block js %}
     <script type="text/javascript" src="{{ asset('build/person.js') }}"></script>
 {% endblock js %}