diff --git a/Resources/views/Activity/edit.html.twig b/Resources/views/Activity/edit.html.twig
index 456bb3221..c0e082920 100644
--- a/Resources/views/Activity/edit.html.twig
+++ b/Resources/views/Activity/edit.html.twig
@@ -31,10 +31,11 @@
     <h2>{{ 'Activity data'|trans }}</h2>
     {{ form_row(edit_form.date) }}
     {{ form_row(edit_form.durationTime) }}
+    {{ form_row(edit_form.type) }}
     {{ form_row(edit_form.remark) }}
     {{ form_row(edit_form.attendee) }}
     {{ form_row(edit_form.reasons) }}
-    {{ form_row(edit_form.type) }}
+    
 
     {{ form_widget(edit_form) }}
         <div class="grid-12 centered sticky-form-buttons">
diff --git a/Resources/views/Activity/new.html.twig b/Resources/views/Activity/new.html.twig
index 33643c400..d380b61d5 100644
--- a/Resources/views/Activity/new.html.twig
+++ b/Resources/views/Activity/new.html.twig
@@ -25,7 +25,18 @@
 
     {{ form_start(form) }}
     
-    {{ form_widget(form) }}
+    {{ form_row(form.user) }}
+    {{ form_row(form.scope) }}
+    
+    <h2 class="chill-red">{{ 'Activity data'|trans }}</h2>
+    
+    {{ form_row(form.date) }}
+    {{ form_row(form.durationTime) }}
+    {{ form_row(form.type) }}
+    {{ form_row(form.remark) }}
+    {{ form_row(form.attendee) }}
+    {{ form_row(form.reasons) }}
+    
         <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>
diff --git a/Resources/views/Activity/show.html.twig b/Resources/views/Activity/show.html.twig
index b3c86aeb5..292a35aa4 100644
--- a/Resources/views/Activity/show.html.twig
+++ b/Resources/views/Activity/show.html.twig
@@ -23,6 +23,8 @@
         <dd>{{ entity.date|localizeddate('long', 'none') }}</dd>
         <dt class="inline">{{ 'Duration Time'|trans }}</dt>
         <dd>{{ entity.durationTime|date('H:i') }}</dd>
+        <dt class="inline">{{ 'Type'|trans }}</dt>
+        <dd>{{ entity.type.name | localize_translatable_string }}</dd>
         <dt class="inline">{{ 'Remark'|trans }}</dt>
         <dd>{% if entity.remark is empty %}{{ 'No remarks'|trans }}{% else %}<blockquote class="chill-user-quote">{{ entity.remark|nl2br }}</blockquote>{% endif %}</dd>
         
@@ -36,13 +38,6 @@
         <dd>{% for r in entity.reasons %}{{ m.reason(r) }} {% endfor %}</dd>
         {%- endif -%}
         
-        <dt class="inline">{{ 'Type'|trans }}</dt>
-        <dd>{{ entity.type.name | localize_translatable_string }}</dd>
-        
-        <dt class="inline">{{ ''|trans }}</dt>
-        <dd></dd>
-        <dt class="inline">{{ ''|trans }}</dt>
-        <dd></dd>
     </dl>
 
     <a class="sc-button bt-update" href="{{ path('chill_activity_activity_edit', { 'id': entity.id, 'person_id': person.id }) }}">