diff --git a/src/Bundle/ChillActivityBundle/Form/ActivityType.php b/src/Bundle/ChillActivityBundle/Form/ActivityType.php
index 99279b099..d762aedd4 100644
--- a/src/Bundle/ChillActivityBundle/Form/ActivityType.php
+++ b/src/Bundle/ChillActivityBundle/Form/ActivityType.php
@@ -115,6 +115,7 @@ class ActivityType extends AbstractType
             $builder->add('attendee', EntityType::class, [
                 'label' => $activityType->getLabel('attendee'),
                 'required' => $activityType->isRequired('attendee'),
+                'expanded' => true,
                 'class' => ActivityPresence::class,
                 'choice_label' => function (ActivityPresence $activityPresence) {
                     return $this->translatableStringHelper->localize($activityPresence->getName());
diff --git a/src/Bundle/ChillActivityBundle/Resources/views/Activity/new.html.twig b/src/Bundle/ChillActivityBundle/Resources/views/Activity/new.html.twig
index b166a4a9e..067192ad5 100644
--- a/src/Bundle/ChillActivityBundle/Resources/views/Activity/new.html.twig
+++ b/src/Bundle/ChillActivityBundle/Resources/views/Activity/new.html.twig
@@ -3,6 +3,15 @@
 {{ form_start(form) }}
 {{ form_errors(form) }}
 
+
+{%- if form.emergency is defined -%}
+    {{ form_row(form.emergency) }}
+{% endif %}
+
+{%- if form.sentReceived is defined -%}
+    {{ form_row(form.sentReceived) }}
+{% endif %}
+
 {%- if form.user is defined -%}
     {{ form_row(form.user) }}
 {% endif %}
@@ -11,26 +20,14 @@
     {{ form_row(form.scope) }}
 {% endif %}
 
-<h2 class="chill-red">{{ 'Activity data'|trans }}</h2>
+type..
 
-{%- if form.date is defined -%}
-    {{ form_row(form.date) }}
-{% endif %}
-{%- if form.durationTime is defined -%}
-    {{ form_row(form.durationTime) }}
-{% endif %}
-{%- if form.travelTime is defined -%}
-    {{ form_row(form.travelTime) }}
-{% endif %}
-{%- if form.attendee is defined -%}
-    {{ form_row(form.attendee) }}
-{% endif %}
-{%- if form.comment is defined -%}
-    {{ form_row(form.comment) }}
-{% endif %}
-{%- if form.reasons is defined -%}
+{%- if form.reasons is defined -%} 
     {{ form_row(form.reasons) }}
 {% endif %}
+
+<h2 class="chill-red">Parties concernées</h2>
+
 {%- if form.persons is defined -%}
     {{ form_row(form.persons) }}
 {% endif %}
@@ -40,17 +37,38 @@
 {%- if form.users is defined -%}
     {{ form_row(form.users) }}
 {% endif %}
-{%- if form.emergency is defined -%}
-    {{ form_row(form.emergency) }}
+
+<h2 class="chill-red">{{ 'Activity data'|trans }}</h2>
+
+{%- if form.date is defined -%}
+    {{ form_row(form.date) }}
 {% endif %}
-{%- if form.sentReceived is defined -%}
-    {{ form_row(form.sentReceived) }}
+
+.. location
+
+{%- if form.durationTime is defined -%}
+    {{ form_row(form.durationTime) }}
+{% endif %}
+
+{%- if form.travelTime is defined -%}
+    {{ form_row(form.travelTime) }}
+{% endif %}
+
+{%- if form.comment is defined -%}
+    .. public and private
+    {{ form_row(form.comment) }}
 {% endif %}
 
 {%- if form.documents is defined -%}
     {{ form_row(form.documents) }}
 {% endif %}
 
+{%- if form.attendee is defined -%}
+    {{ form_row(form.attendee) }}
+{% endif %}
+
+.. status
+
 <div class="grid-12 centered sticky-form-buttons">
     <button class="sc-button green margin-10" type="submit"><i class="fa fa-save"></i> {{ 'Add a new activity'|trans }}</button>
 </div>