diff --git a/src/Bundle/ChillActivityBundle/Resources/public/chill/chillactivity.scss b/src/Bundle/ChillActivityBundle/Resources/public/chill/chillactivity.scss
index abc46c93a..528d75ded 100644
--- a/src/Bundle/ChillActivityBundle/Resources/public/chill/chillactivity.scss
+++ b/src/Bundle/ChillActivityBundle/Resources/public/chill/chillactivity.scss
@@ -48,42 +48,45 @@ div.activity-list {
                }
             }
          }
+         div.item-row.comment {
+            margin-left: 15%;
+            blockquote.chill-user-quote {
+               margin-top: 0.5em;
+               margin-bottom: 0.5em;
+            }
+         }
          div.item-row.details {
-            flex-direction: row;
-            & > div.item-col {
-               justify-content: flex-start;
-               align-self: center;
-               &:nth-child(1) {
-                  flex-grow: 1; flex-shrink: 0; flex-basis: 30%;
-               }
-               &:nth-child(2) {
-                  flex-grow: 0; flex-shrink: 1; flex-basis: 70%;
-               }
+            margin-left: 15%;
 
-               &:only-child {
-                  flex-grow: 0; flex-shrink: 0; flex-basis: 100%;
-                  & > div.concerned-groups {
-                     flex-grow: 0; flex-shrink: 0; flex-basis: 100%;
-                     display: flex;
-                     flex-direction: column; // TODO pas fini
-                     div.group {
-                        flex-grow: 1; flex-shrink: 0; flex-basis: 30%;
-                        h4 {}
-                        ul.list-content {
-                           li {
-                              display: inline;
+            // override flex-bloc to adapt in list
+            // TODO refund this
+            div.accompanyingCourse.flex-bloc.concerned-groups {
+               margin: 0;
+               width: 100%;
+               justify-content: space-around;
+               div.item-bloc {
+                  box-shadow: unset;
+                  padding: 0;
+                  flex-basis: 25%;
+                  div.item-row {
+                     flex-direction: column;
+                     div.item-col {
+                        &:first-child {
+                           width: unset;
+                        }
+                        &:last-child {
+                           border-top: 0;
+                           margin-top: 0;
+                           padding-top: 0;
+                           ul.list-content {
+                              padding: 0;
                            }
                         }
                      }
                   }
                }
             }
-            div.concerned-groups {
-               font-size: 85%;
-               h4 {
-                  text-transform: uppercase;
-               }
-            }
+
          }
          ul.list-content {
             list-style-type: none;
diff --git a/src/Bundle/ChillActivityBundle/Resources/views/Activity/concernedGroups.html.twig b/src/Bundle/ChillActivityBundle/Resources/views/Activity/concernedGroups.html.twig
index 2ee9eeba0..7d776b5de 100644
--- a/src/Bundle/ChillActivityBundle/Resources/views/Activity/concernedGroups.html.twig
+++ b/src/Bundle/ChillActivityBundle/Resources/views/Activity/concernedGroups.html.twig
@@ -59,7 +59,7 @@
                     {% for item in bloc.items %}
                     <li>
                         <a href="{{ _self.href(bloc.path, bloc.key, item.id) }}">
-                            <span class="badge bg-primary">
+                            <span class="{% if (badge_person is defined and badge_person == true) %}badge-person{% else %}badge bg-primary{% endif %}">
                                 {{ item|chill_entity_render_box({
                                     'render': 'raw',
                                     'addAltNames': false
@@ -86,7 +86,7 @@
                 {% for item in bloc.items %}
                 <li>
                     <a href="{{ _self.href(bloc.path, bloc.key, item.id) }}">
-                        <span class="badge bg-primary">
+                        <span class="{% if (badge_person is defined and badge_person == true) %}badge-person{% else %}badge bg-primary{% endif %}">
                             {{ item|chill_entity_render_box({
                                 'render': 'raw',
                                 'addAltNames': false
diff --git a/src/Bundle/ChillActivityBundle/Resources/views/Activity/list.html.twig b/src/Bundle/ChillActivityBundle/Resources/views/Activity/list.html.twig
index bf9c8d5ca..296b4620f 100644
--- a/src/Bundle/ChillActivityBundle/Resources/views/Activity/list.html.twig
+++ b/src/Bundle/ChillActivityBundle/Resources/views/Activity/list.html.twig
@@ -135,33 +135,31 @@
                         </div>
                     </div>
 
-                    {#
+
                     {%  if activity.comment.comment is not empty
                         or activity.persons|length > 0
                         or activity.thirdParties|length > 0
                         or activity.users|length > 0
                     %}
-                        <div class="item-row details">
-                            <div class="item-col">
-                                {% include 'ChillActivityBundle:Activity:concernedGroups.html.twig' with {
-                                    'context': context,
-                                    'with_display': 'row',
-                                    'entity': activity
-                                } %}
-                            </div>
-
+                        <div class="item-row comment separator">
                             {% if activity.comment.comment is not empty %}
-                                <div class="item-col">
-                                    {{ activity.comment|chill_entity_render_box({
-                                        'disable_markdown': false,
-                                        'limit_lines': 3,
-                                        'metadata': false,
-                                    }) }}
-                                </div>
+                                {{ activity.comment|chill_entity_render_box({
+                                    'disable_markdown': false,
+                                    'limit_lines': 3,
+                                    'metadata': false,
+                                }) }}
                             {% endif %}
                         </div>
+                        <div class="item-row details">
+                            {% include 'ChillActivityBundle:Activity:concernedGroups.html.twig' with {
+                                'context': context,
+                                'with_display': 'bloc',
+                                'entity': activity,
+                                'badge_person': true
+                            } %}
+                        </div>
                     {% endif %}
-                    #}
+
 
                 </div>
             {% endfor %}
diff --git a/src/Bundle/ChillPersonBundle/Resources/public/chill/scss/render_box.scss b/src/Bundle/ChillPersonBundle/Resources/public/chill/scss/render_box.scss
index 5a4a51de8..a08620919 100644
--- a/src/Bundle/ChillPersonBundle/Resources/public/chill/scss/render_box.scss
+++ b/src/Bundle/ChillPersonBundle/Resources/public/chill/scss/render_box.scss
@@ -29,8 +29,10 @@
 
 // specific chill badge for persons
 span.badge-person {
+    display: inline-block;
     padding: 0 0.5em !important;
     background-color: $white;
+    color: $dark;
     border: 1px solid $chill-ll-gray;
     border-bottom: 2px solid $chill-green;
     border-radius: 6px;
diff --git a/src/Bundle/ChillPersonBundle/Resources/public/vuejs/AccompanyingCourse/components/CourseLocation.vue b/src/Bundle/ChillPersonBundle/Resources/public/vuejs/AccompanyingCourse/components/CourseLocation.vue
index 83390f20f..59852263a 100644
--- a/src/Bundle/ChillPersonBundle/Resources/public/vuejs/AccompanyingCourse/components/CourseLocation.vue
+++ b/src/Bundle/ChillPersonBundle/Resources/public/vuejs/AccompanyingCourse/components/CourseLocation.vue
@@ -51,6 +51,7 @@
                   class="btn btn-remove"
                   @click="removeAddress"
                   :title="$t('courselocation.remove_button')">
+                  {{ $t('action.remove') }}
                </button>
             </li>
          </ul>