diff --git a/.gitignore b/.gitignore
index 38d06d315..ebdc16e56 100644
--- a/.gitignore
+++ b/.gitignore
@@ -3,6 +3,7 @@ composer
 composer.phar
 composer.lock
 docs/build/
+node_modules/*
 .php_cs.cache
 
 ###> symfony/framework-bundle ###
diff --git a/src/Bundle/ChillActivityBundle/Export/Filter/PersonFilters/ActivityReasonFilter.php b/src/Bundle/ChillActivityBundle/Export/Filter/PersonFilters/ActivityReasonFilter.php
index 5634358c7..c55d579e4 100644
--- a/src/Bundle/ChillActivityBundle/Export/Filter/PersonFilters/ActivityReasonFilter.php
+++ b/src/Bundle/ChillActivityBundle/Export/Filter/PersonFilters/ActivityReasonFilter.php
@@ -50,7 +50,7 @@ class ActivityReasonFilter implements ExportElementValidatedInterface, FilterInt
     {
         $where = $qb->getDQLPart('where');
         $join = $qb->getDQLPart('join');
-        $clause = $qb->expr()->in('reasons', ':selected_activity_reasons');
+        $clause = $qb->expr()->in('actreasons', ':selected_activity_reasons');
 
         if (!in_array('actreasons', $qb->getAllAliases(), true)) {
             $qb->join('activity.reasons', 'actreasons');
@@ -77,6 +77,7 @@ class ActivityReasonFilter implements ExportElementValidatedInterface, FilterInt
             'class' => ActivityReason::class,
             'choice_label' => fn (ActivityReason $reason) => $this->translatableStringHelper->localize($reason->getName()),
             'group_by' => fn (ActivityReason $reason) => $this->translatableStringHelper->localize($reason->getCategory()->getName()),
+            'attr' => ['class' => 'select2 '],
             'multiple' => true,
             'expanded' => false,
         ]);
diff --git a/src/Bundle/ChillActivityBundle/Menu/AdminMenuBuilder.php b/src/Bundle/ChillActivityBundle/Menu/AdminMenuBuilder.php
index 5e10c9a14..71a9e3c2a 100644
--- a/src/Bundle/ChillActivityBundle/Menu/AdminMenuBuilder.php
+++ b/src/Bundle/ChillActivityBundle/Menu/AdminMenuBuilder.php
@@ -36,7 +36,6 @@ final class AdminMenuBuilder implements LocalMenuBuilderInterface
             ->setAttribute('class', 'list-group-item-header')
             ->setExtras([
                 'order' => 5000,
-                'icons' => ['exchange'],
             ]);
 
         $menu->addChild('Activity Reasons', [
diff --git a/src/Bundle/ChillActivityBundle/Resources/views/Activity/show.html.twig b/src/Bundle/ChillActivityBundle/Resources/views/Activity/show.html.twig
index 49e71bfad..53bd3e8a7 100644
--- a/src/Bundle/ChillActivityBundle/Resources/views/Activity/show.html.twig
+++ b/src/Bundle/ChillActivityBundle/Resources/views/Activity/show.html.twig
@@ -156,7 +156,7 @@
                 <dd>
                     <section class="chill-entity entity-comment-embeddable">
                         <blockquote class="chill-user-quote private-quote">
-                            {{ entity.privateComment.comments[userId] }}
+                            {{ entity.privateComment.comments[userId]|chill_markdown_to_html }}
                         </blockquote>
                     </section>
                 </dd>
@@ -172,7 +172,7 @@
                             {% endfor %}
                         </ul>
                     {% else %}
-                        <span class="chill-no-data-statement">{{ 'Any document found'|trans }}</span>
+                        <span class="chill-no-data-statement">{{ 'No document found'|trans }}</span>
                     {% endif %}
                 </dd>
             {% endif %}
diff --git a/src/Bundle/ChillAsideActivityBundle/src/Form/AsideActivityFormType.php b/src/Bundle/ChillAsideActivityBundle/src/Form/AsideActivityFormType.php
index 5c438bd0a..c02e53c23 100644
--- a/src/Bundle/ChillAsideActivityBundle/src/Form/AsideActivityFormType.php
+++ b/src/Bundle/ChillAsideActivityBundle/src/Form/AsideActivityFormType.php
@@ -12,8 +12,7 @@ declare(strict_types=1);
 namespace Chill\AsideActivityBundle\Form;
 
 use Chill\AsideActivityBundle\Entity\AsideActivity;
-use Chill\AsideActivityBundle\Entity\AsideActivityCategory;
-use Chill\AsideActivityBundle\Templating\Entity\CategoryRender;
+use Chill\AsideActivityBundle\Form\Type\PickAsideActivityCategoryType;
 use Chill\MainBundle\Form\Type\ChillDateType;
 use Chill\MainBundle\Form\Type\ChillTextareaType;
 use Chill\MainBundle\Form\Type\PickUserDynamicType;
@@ -21,8 +20,6 @@ use DateInterval;
 use DateTime;
 use DateTimeImmutable;
 use DateTimeZone;
-use Doctrine\ORM\EntityRepository;
-use Symfony\Bridge\Doctrine\Form\Type\EntityType;
 use Symfony\Component\DependencyInjection\ParameterBag\ParameterBagInterface;
 use Symfony\Component\Form\AbstractType;
 use Symfony\Component\Form\Extension\Core\DataTransformer\DateTimeToTimestampTransformer;
@@ -37,20 +34,16 @@ use function in_array;
 
 final class AsideActivityFormType extends AbstractType
 {
-    private CategoryRender $categoryRender;
-
     private TokenStorageInterface $storage;
 
     private array $timeChoices;
 
     public function __construct(
         ParameterBagInterface $parameterBag,
-        TokenStorageInterface $storage,
-        CategoryRender $categoryRender
+        TokenStorageInterface $storage
     ) {
         $this->timeChoices = $parameterBag->get('chill_aside_activity.form.time_duration');
         $this->storage = $storage;
-        $this->categoryRender = $categoryRender;
     }
 
     public function buildForm(FormBuilderInterface $builder, array $options)
@@ -81,28 +74,10 @@ final class AsideActivityFormType extends AbstractType
                     'required' => true,
                 ]
             )
-            ->add(
-                'type',
-                EntityType::class,
-                [
-                    'label' => 'Type',
-                    'required' => true,
-                    'class' => AsideActivityCategory::class,
-                    'placeholder' => 'Choose the activity category',
-                    'query_builder' => static function (EntityRepository $er) {
-                        $qb = $er->createQueryBuilder('ac');
-                        $qb->where($qb->expr()->eq('ac.isActive', 'TRUE'))
-                            ->addOrderBy('ac.ordering', 'ASC');
-
-                        return $qb;
-                    },
-                    'choice_label' => function (AsideActivityCategory $asideActivityCategory) {
-                        $options = [];
-
-                        return $this->categoryRender->renderString($asideActivityCategory, $options);
-                    },
-                ]
-            )
+            ->add('type', PickAsideActivityCategoryType::class, [
+                'label' => 'Type',
+                'required' => true,
+            ])
             ->add('duration', ChoiceType::class, $durationTimeOptions)
             ->add('note', ChillTextareaType::class, [
                 'label' => 'Note',
diff --git a/src/Bundle/ChillAsideActivityBundle/src/Form/Type/PickAsideActivityCategoryType.php b/src/Bundle/ChillAsideActivityBundle/src/Form/Type/PickAsideActivityCategoryType.php
new file mode 100644
index 000000000..3ee392517
--- /dev/null
+++ b/src/Bundle/ChillAsideActivityBundle/src/Form/Type/PickAsideActivityCategoryType.php
@@ -0,0 +1,57 @@
+<?php
+
+declare(strict_types=1);
+
+/*
+ * Chill is a software for social workers
+ *
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
+ */
+
+namespace Chill\AsideActivityBundle\Form\Type;
+
+use Chill\AsideActivityBundle\Entity\AsideActivityCategory;
+use Chill\AsideActivityBundle\Templating\Entity\CategoryRender;
+use Doctrine\ORM\EntityRepository;
+use Symfony\Bridge\Doctrine\Form\Type\EntityType;
+use Symfony\Component\Form\AbstractType;
+use Symfony\Component\OptionsResolver\OptionsResolver;
+
+final class PickAsideActivityCategoryType extends AbstractType
+{
+    private CategoryRender $categoryRender;
+
+    public function __construct(
+        CategoryRender $categoryRender
+    ) {
+        $this->categoryRender = $categoryRender;
+    }
+
+    public function configureOptions(OptionsResolver $resolver)
+    {
+        $resolver
+            ->setDefaults([
+                'class' => AsideActivityCategory::class,
+                'placeholder' => 'Choose the activity category',
+                'query_builder' => static function (EntityRepository $er) {
+                    $qb = $er->createQueryBuilder('ac');
+                    $qb->where($qb->expr()->eq('ac.isActive', 'TRUE'))
+                        ->addOrderBy('ac.ordering', 'ASC');
+
+                    return $qb;
+                },
+                'choice_label' => function (AsideActivityCategory $asideActivityCategory) {
+                    $options = [];
+
+                    return $this->categoryRender->renderString($asideActivityCategory, $options);
+                },
+                'attr' => ['class' => 'select2'],
+            ]);
+    }
+
+    public function getParent(): string
+    {
+        return EntityType::class;
+    }
+}
diff --git a/src/Bundle/ChillAsideActivityBundle/src/Resources/views/asideActivity/_delete.html.twig b/src/Bundle/ChillAsideActivityBundle/src/Resources/views/asideActivity/_delete.html.twig
index 2f30b14cf..79c2e6919 100644
--- a/src/Bundle/ChillAsideActivityBundle/src/Resources/views/asideActivity/_delete.html.twig
+++ b/src/Bundle/ChillAsideActivityBundle/src/Resources/views/asideActivity/_delete.html.twig
@@ -1,4 +1,4 @@
-<div class="{% block crud_content_main_div_class %}col-10 centered{% endblock %}">
+
 	{% block crud_content_header %}
 		<h1>{{ ('crud.'~crud_name~'.title_delete')|trans({ '%as_string%': 'Aside Activity' }) }}</h1>
 	{% endblock crud_content_header %}
@@ -27,4 +27,4 @@
 	</ul>
 
 	{{ form_end(form) }}
-</div>
+
diff --git a/src/Bundle/ChillAsideActivityBundle/src/Resources/views/asideActivity/index.html.twig b/src/Bundle/ChillAsideActivityBundle/src/Resources/views/asideActivity/index.html.twig
index 4dd12e042..5ffc73684 100644
--- a/src/Bundle/ChillAsideActivityBundle/src/Resources/views/asideActivity/index.html.twig
+++ b/src/Bundle/ChillAsideActivityBundle/src/Resources/views/asideActivity/index.html.twig
@@ -87,5 +87,5 @@
 				</li>
 			</ul>
 		{% endif %}
-
+    </div>
 	{% endblock %}
diff --git a/src/Bundle/ChillAsideActivityBundle/src/Resources/views/asideActivity/new.html.twig b/src/Bundle/ChillAsideActivityBundle/src/Resources/views/asideActivity/new.html.twig
index 09acf9859..99ff217b1 100644
--- a/src/Bundle/ChillAsideActivityBundle/src/Resources/views/asideActivity/new.html.twig
+++ b/src/Bundle/ChillAsideActivityBundle/src/Resources/views/asideActivity/new.html.twig
@@ -1,4 +1,4 @@
-{% extends '@ChillMain/Admin/layout.html.twig' %}
+{% extends '@ChillMain/layout.html.twig' %}
 
 {% block js %}
     {{ parent() }}
@@ -14,7 +14,7 @@
 {% include('@ChillMain/CRUD/_new_title.html.twig') %}
 {% endblock %}
 
-{% block admin_content %}
+{% block content %}
 {% embed '@ChillMain/CRUD/_new_content.html.twig' %}
     {% block content_form_actions_save_and_show %}{% endblock %}
 {% endembed %}
diff --git a/src/Bundle/ChillCalendarBundle/Menu/AdminMenuBuilder.php b/src/Bundle/ChillCalendarBundle/Menu/AdminMenuBuilder.php
index ad00609e2..1658029a7 100644
--- a/src/Bundle/ChillCalendarBundle/Menu/AdminMenuBuilder.php
+++ b/src/Bundle/ChillCalendarBundle/Menu/AdminMenuBuilder.php
@@ -39,7 +39,6 @@ class AdminMenuBuilder implements LocalMenuBuilderInterface
             ->setAttribute('class', 'list-group-item-header')
             ->setExtras([
                 'order' => 6000,
-                'icons' => ['calendar'],
             ]);
 
         $menu->addChild('Cancel reason', [
diff --git a/src/Bundle/ChillCalendarBundle/Resources/views/Calendar/_documents.twig.html b/src/Bundle/ChillCalendarBundle/Resources/views/Calendar/_documents.twig.html
index a568ec009..499fb0a83 100644
--- a/src/Bundle/ChillCalendarBundle/Resources/views/Calendar/_documents.twig.html
+++ b/src/Bundle/ChillCalendarBundle/Resources/views/Calendar/_documents.twig.html
@@ -3,7 +3,7 @@
 {% import "@ChillDocStore/Macro/macro.html.twig" as m %}
 {% import "@ChillDocStore/Macro/macro_mimeicon.html.twig" as mm %}
 
-<div class="accompanying_course_work-list">
+<div class="accompanying-course-work">
     <table class="obj-res-eval my-3">
         <thead>
         <th class="eval">
diff --git a/src/Bundle/ChillCustomFieldsBundle/Menu/AdminMenuBuilder.php b/src/Bundle/ChillCustomFieldsBundle/Menu/AdminMenuBuilder.php
index 7ac745b12..db63ad6ac 100644
--- a/src/Bundle/ChillCustomFieldsBundle/Menu/AdminMenuBuilder.php
+++ b/src/Bundle/ChillCustomFieldsBundle/Menu/AdminMenuBuilder.php
@@ -39,7 +39,6 @@ class AdminMenuBuilder implements LocalMenuBuilderInterface
             ->setAttribute('class', 'list-group-item-header')
             ->setExtras([
                 'order' => 4500,
-                'icons' => ['plus'],
             ]);
 
         $menu->addChild('Custom fields group', [
diff --git a/src/Bundle/ChillDocStoreBundle/Menu/AdminMenuBuilder.php b/src/Bundle/ChillDocStoreBundle/Menu/AdminMenuBuilder.php
index 6848ed65a..466c3bace 100644
--- a/src/Bundle/ChillDocStoreBundle/Menu/AdminMenuBuilder.php
+++ b/src/Bundle/ChillDocStoreBundle/Menu/AdminMenuBuilder.php
@@ -39,7 +39,6 @@ class AdminMenuBuilder implements LocalMenuBuilderInterface
             ->setAttribute('class', 'list-group-item-header')
             ->setExtras([
                 'order' => 4000,
-                'icons' => ['file-pdf-o'],
             ]);
 
         $menu->addChild('Document category list', [
diff --git a/src/Bundle/ChillDocStoreBundle/Resources/views/AccompanyingCourseDocument/_workflow.html.twig b/src/Bundle/ChillDocStoreBundle/Resources/views/AccompanyingCourseDocument/_workflow.html.twig
index 299183cca..f914bd7f5 100644
--- a/src/Bundle/ChillDocStoreBundle/Resources/views/AccompanyingCourseDocument/_workflow.html.twig
+++ b/src/Bundle/ChillDocStoreBundle/Resources/views/AccompanyingCourseDocument/_workflow.html.twig
@@ -6,7 +6,7 @@
         {{ 'workflow.Document deleted'|trans }}
     </div>
 {% else %}
-    <div class="flex-table accompanying_course_work-list">
+    <div class="flex-table accompanying-course-work">
         <div class="item-bloc document-item bg-chill-llight-gray">
             <div class="row justify-content-center my-4">
                 <div class="col-2">
@@ -22,7 +22,6 @@
                             {{ document.description }}
                         </blockquote>
                     {% endif %}
-
                 </div>
             </div>
         </div>
diff --git a/src/Bundle/ChillDocStoreBundle/Resources/views/Macro/macro.html.twig b/src/Bundle/ChillDocStoreBundle/Resources/views/Macro/macro.html.twig
index 886544b1e..0e739d94b 100644
--- a/src/Bundle/ChillDocStoreBundle/Resources/views/Macro/macro.html.twig
+++ b/src/Bundle/ChillDocStoreBundle/Resources/views/Macro/macro.html.twig
@@ -13,3 +13,19 @@
             {{ 'Download'|trans }}</a>
     {% endif %}
 {% endmacro %}
+
+{% macro download_button_small(storedObject, filename = null) %}
+    {% if storedObject is null %}
+        <!-- No document to download -->
+    {% else %}
+        <a class="btn btn-sm btn-download"
+           data-label-preparing="{{ ('Preparing'|trans ~ '...')|escape('html_attr') }}"
+           data-label-ready="{{ 'Ready to show'|trans|escape('html_attr') }}"
+           data-download-button
+           data-key="{{ storedObject.keyInfos|json_encode|escape('html_attr') }}"
+           data-iv="{{ storedObject.iv|json_encode|escape('html_attr') }}"
+           data-temp-url-get-generator="{{ storedObject|generate_url|escape('html_attr') }}"
+           data-mime-type="{{ storedObject.type|escape('html_attr') }}" {% if filename is not null %}data-filename="{{ filename|escape('html_attr') }}"{% endif %}>
+            {{ 'Download'|trans }}</a>
+    {% endif %}
+{% endmacro %}
\ No newline at end of file
diff --git a/src/Bundle/ChillDocStoreBundle/Resources/views/Macro/macro_mimeicon.html.twig b/src/Bundle/ChillDocStoreBundle/Resources/views/Macro/macro_mimeicon.html.twig
index a9bc07e2f..7079a0d94 100644
--- a/src/Bundle/ChillDocStoreBundle/Resources/views/Macro/macro_mimeicon.html.twig
+++ b/src/Bundle/ChillDocStoreBundle/Resources/views/Macro/macro_mimeicon.html.twig
@@ -48,8 +48,8 @@
         {% endif %}
     {% endfor %}
     
-    <div class="metadata">
+    <span class="metadata">
         <i class="fa {{ icon }} fa-lg me-1"></i>
         {{ label|capitalize }}
-    </div>
+    </span>
 {% endmacro %}
\ No newline at end of file
diff --git a/src/Bundle/ChillDocStoreBundle/translations/messages.fr.yml b/src/Bundle/ChillDocStoreBundle/translations/messages.fr.yml
index 400e37236..4fbad1546 100644
--- a/src/Bundle/ChillDocStoreBundle/translations/messages.fr.yml
+++ b/src/Bundle/ChillDocStoreBundle/translations/messages.fr.yml
@@ -14,7 +14,7 @@ Edit attributes: Modifier les propriétés du document
 Existing document: Document existant
 No document to download: Aucun document à télécharger
 'Choose a document category': Choisissez une catégorie de document
-Any document found: Aucun document trouvé
+No document found: Aucun document trouvé
 The document is successfully registered: Le document est enregistré
 The document is successfully updated: Le document est mis à jour
 Any description: Aucune description
diff --git a/src/Bundle/ChillMainBundle/Controller/ScopeApiController.php b/src/Bundle/ChillMainBundle/Controller/ScopeApiController.php
new file mode 100644
index 000000000..85041f0f3
--- /dev/null
+++ b/src/Bundle/ChillMainBundle/Controller/ScopeApiController.php
@@ -0,0 +1,25 @@
+<?php
+
+declare(strict_types=1);
+
+/*
+ * Chill is a software for social workers
+ *
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
+ */
+
+namespace Chill\MainBundle\Controller;
+
+use Chill\MainBundle\CRUD\Controller\ApiController;
+use Symfony\Component\HttpFoundation\Request;
+
+class ScopeApiController extends ApiController
+{
+    protected function customizeQuery(string $action, Request $request, $query): void
+    {
+        if ('_index' === $action) {
+            $query->andWhere($query->expr()->eq('e.active', "'TRUE'"));
+        }
+    }
+}
diff --git a/src/Bundle/ChillMainBundle/Controller/UserApiController.php b/src/Bundle/ChillMainBundle/Controller/UserApiController.php
index b29fe7c8e..da873e118 100644
--- a/src/Bundle/ChillMainBundle/Controller/UserApiController.php
+++ b/src/Bundle/ChillMainBundle/Controller/UserApiController.php
@@ -12,6 +12,7 @@ declare(strict_types=1);
 namespace Chill\MainBundle\Controller;
 
 use Chill\MainBundle\CRUD\Controller\ApiController;
+use Chill\MainBundle\Pagination\PaginatorInterface;
 use Doctrine\ORM\QueryBuilder;
 use Symfony\Component\HttpFoundation\JsonResponse;
 use Symfony\Component\HttpFoundation\Request;
@@ -70,4 +71,13 @@ class UserApiController extends ApiController
             $query->andWhere($query->expr()->eq('e.enabled', "'TRUE'"));
         }
     }
+
+    /**
+     * @param mixed $query
+     * @param mixed $_format
+     */
+    protected function orderQuery(string $action, $query, Request $request, PaginatorInterface $paginator, $_format)
+    {
+        return $query->orderBy('e.label', 'ASC');
+    }
 }
diff --git a/src/Bundle/ChillMainBundle/DependencyInjection/ChillMainExtension.php b/src/Bundle/ChillMainBundle/DependencyInjection/ChillMainExtension.php
index 23a4bee89..69546016a 100644
--- a/src/Bundle/ChillMainBundle/DependencyInjection/ChillMainExtension.php
+++ b/src/Bundle/ChillMainBundle/DependencyInjection/ChillMainExtension.php
@@ -655,6 +655,7 @@ class ChillMainExtension extends Extension implements
                 ],
                 [
                     'class' => \Chill\MainBundle\Entity\Scope::class,
+                    'controller' => \Chill\MainBundle\Controller\ScopeApiController::class,
                     'name' => 'scope',
                     'base_path' => '/api/1.0/main/scope',
                     'base_role' => 'ROLE_USER',
diff --git a/src/Bundle/ChillMainBundle/Form/ScopeType.php b/src/Bundle/ChillMainBundle/Form/ScopeType.php
index 691328500..86335c554 100644
--- a/src/Bundle/ChillMainBundle/Form/ScopeType.php
+++ b/src/Bundle/ChillMainBundle/Form/ScopeType.php
@@ -13,6 +13,7 @@ namespace Chill\MainBundle\Form;
 
 use Chill\MainBundle\Form\Type\TranslatableStringFormType;
 use Symfony\Component\Form\AbstractType;
+use Symfony\Component\Form\Extension\Core\Type\ChoiceType;
 use Symfony\Component\Form\FormBuilderInterface;
 use Symfony\Component\OptionsResolver\OptionsResolver;
 
@@ -21,7 +22,12 @@ class ScopeType extends AbstractType
     public function buildForm(FormBuilderInterface $builder, array $options)
     {
         $builder
-            ->add('name', TranslatableStringFormType::class);
+            ->add('name', TranslatableStringFormType::class)
+            ->add('active', ChoiceType::class, [
+                'choices' => [
+                    'Active' => true,
+                    'Inactive' => false,
+                ], ]);
     }
 
     /**
diff --git a/src/Bundle/ChillMainBundle/Resources/public/chill/chillmain.scss b/src/Bundle/ChillMainBundle/Resources/public/chill/chillmain.scss
index aa1d24844..3c9fc8601 100644
--- a/src/Bundle/ChillMainBundle/Resources/public/chill/chillmain.scss
+++ b/src/Bundle/ChillMainBundle/Resources/public/chill/chillmain.scss
@@ -221,12 +221,8 @@ footer.footer {
  */
 
  div.admin {
-   flex-direction: row-reverse;
    div.vertical-menu {
-      font-size: 0.9em;
-      .list-group-item {
-         padding: 0.3rem 0.7rem;
-      }
+      .list-group-item {}
    }
  }
 
@@ -307,12 +303,12 @@ table.table-bordered {
 /// meta-data
 div.createdBy,
 div.updatedBy,
-div.metadata {
+.metadata {
     span.user, span.date {
         text-decoration: underline dotted;
     }
 }
-div.metadata {
+.metadata {
    font-size: smaller;
    color: $gray-600;
    span.user, span.date {
@@ -368,6 +364,19 @@ div#flashMessages {
     }
 }
 
+/// unbullet lists
+ul.unbullet {
+    list-style-type: none;
+    padding-left: 0;
+}
+/// libellé
+span.dt {
+    font-size: 90%;
+    font-weight: bolder;
+    background-color: var(--bs-chill-light-gray);
+}
+
+
 /*
  *    SPECIFIC RULES
  */
diff --git a/src/Bundle/ChillMainBundle/Resources/public/chill/scss/render_box.scss b/src/Bundle/ChillMainBundle/Resources/public/chill/scss/render_box.scss
index 4d0bfcf8e..19da5aed3 100644
--- a/src/Bundle/ChillMainBundle/Resources/public/chill/scss/render_box.scss
+++ b/src/Bundle/ChillMainBundle/Resources/public/chill/scss/render_box.scss
@@ -106,18 +106,5 @@ section.chill-entity {
     // used for comment-embeddable
     &.entity-comment-embeddable {
         width: 100%;
-        
-        /* already defined !!
-        div.metadata {
-            font-size: smaller;
-            color: $gray-600;
-            span.user, span.date {
-                text-decoration: underline dotted;
-                &:hover {
-                    color: $gray-700;
-                }
-            }
-        }
-        */
     }
 }
diff --git a/src/Bundle/ChillMainBundle/Resources/public/vuejs/Address/components/AddAddress.vue b/src/Bundle/ChillMainBundle/Resources/public/vuejs/Address/components/AddAddress.vue
index 30a240938..21ab5e3d0 100644
--- a/src/Bundle/ChillMainBundle/Resources/public/vuejs/Address/components/AddAddress.vue
+++ b/src/Bundle/ChillMainBundle/Resources/public/vuejs/Address/components/AddAddress.vue
@@ -48,33 +48,35 @@
 
       </modal>
    </teleport>
-   <div class="mt-4" v-else>
-      <suggest-pane v-if="flag.suggestPane"
-         v-bind:context="this.context"
-         v-bind:options="this.options"
-         v-bind:defaultz="this.defaultz"
-         v-bind:entity="this.entity"
-         v-bind:flag="this.flag"
-         v-bind:insideModal="false"
-         @pick-address="this.pickAddress"
-         ref="suggestAddress">
-
-         <template v-slot:before v-if="!bypassFirstStep">
-            <a class="btn btn-cancel" @click="resetPane">
-               {{ $t('action.cancel') }}
-            </a>
-         </template>
-         <template v-slot:action>
-            <li>
-               <button @click="openEditPane"
-                  class="btn btn-create">
-                  {{ $t('create_a_new_address')}}
-               </button>
-            </li>
-         </template>
-
-      </suggest-pane>
-   </div>
+   <template v-else>
+      <div v-if="flag.suggestPane" class="mt-4 flex-grow-1">
+         <suggest-pane
+            v-bind:context="this.context"
+            v-bind:options="this.options"
+            v-bind:defaultz="this.defaultz"
+            v-bind:entity="this.entity"
+            v-bind:flag="this.flag"
+            v-bind:insideModal="false"
+            @pick-address="this.pickAddress"
+            ref="suggestAddress">
+   
+            <template v-slot:before v-if="!bypassFirstStep">
+               <a class="btn btn-cancel" @click="resetPane">
+                  {{ $t('action.cancel') }}
+               </a>
+            </template>
+            <template v-slot:action>
+               <li>
+                  <button @click="openEditPane"
+                     class="btn btn-create">
+                     {{ $t('create_a_new_address')}}
+                  </button>
+               </li>
+            </template>
+   
+         </suggest-pane>
+      </div>
+   </template>
 
    <!-- step 2 -->
    <teleport to="body" v-if="inModal">
@@ -118,40 +120,42 @@
 
       </modal>
    </teleport>
-   <div class="mt-4" v-else>
-      <edit-pane v-if="flag.editPane"
-         v-bind:context="this.context"
-         v-bind:options="this.options"
-         v-bind:defaultz="this.defaultz"
-         v-bind:entity="this.entity"
-         v-bind:flag="this.flag"
-         v-bind:errors="this.errors"
-         v-bind:checkErrors="this.checkErrors"
-         v-bind:insideModal="false"
-         @getCities="getCities"
-         @getReferenceAddresses="getReferenceAddresses">
-
-         <template v-slot:before>
-            <a class="btn btn-cancel" @click="resetPane">
-               {{ $t('action.cancel') }}
-            </a>
-         </template>
-         <template v-slot:action>
-            <li v-if="!this.context.edit && this.useDatePane">
-               <button class="btn btn-update change-icon" @click="closeEditPane">
-                  {{ $t('nav.next')}}
-                  <i class="fa fa-fw fa-arrow-right"></i>
-               </button>
-            </li>
-            <li v-else>
-               <button class="btn btn-save" @click="closeEditPane">
-                  {{ $t('action.save')}}
-               </button>
-            </li>
-         </template>
-
-      </edit-pane>
-   </div>
+   <template v-else>
+      <div v-if="flag.editPane" class="mt-4 flex-grow-1">
+         <edit-pane
+            v-bind:context="this.context"
+            v-bind:options="this.options"
+            v-bind:defaultz="this.defaultz"
+            v-bind:entity="this.entity"
+            v-bind:flag="this.flag"
+            v-bind:errors="this.errors"
+            v-bind:checkErrors="this.checkErrors"
+            v-bind:insideModal="false"
+            @getCities="getCities"
+            @getReferenceAddresses="getReferenceAddresses">
+   
+            <template v-slot:before>
+               <a class="btn btn-cancel" @click="resetPane">
+                  {{ $t('action.cancel') }}
+               </a>
+            </template>
+            <template v-slot:action>
+               <li v-if="!this.context.edit && this.useDatePane">
+                  <button class="btn btn-update change-icon" @click="closeEditPane">
+                     {{ $t('nav.next')}}
+                     <i class="fa fa-fw fa-arrow-right"></i>
+                  </button>
+               </li>
+               <li v-else>
+                  <button class="btn btn-save" @click="closeEditPane">
+                     {{ $t('action.save')}}
+                  </button>
+               </li>
+            </template>
+   
+         </edit-pane>
+      </div>
+   </template>
 
    <!-- step 3 -->
    <teleport to="body" v-if="inModal">
@@ -192,32 +196,34 @@
 
       </modal>
    </teleport>
-   <div class="mt-4" v-else>
-      <date-pane v-if="flag.datePane"
-         v-bind:context="this.context"
-         v-bind:options="this.options"
-         v-bind:defaultz="this.defaultz"
-         v-bind:entity="this.entity"
-         v-bind:flag="this.flag"
-         v-bind:insideModal="false"
-         ref="dateAddress">
-
-         <template v-slot:before>
-            <button class="btn btn-misc" @click="openEditPane">
-               <i class="fa fa-fw fa-arrow-left"></i>
-               {{ $t('nav.previous')}}
-            </button>
-         </template>
-         <template v-slot:action>
-            <li>
-               <button class="btn btn-save" @click="closeDatePane">
-                  {{ $t('action.save')}}
+   <template v-else>
+      <div v-if="flag.datePane" class="mt-4 flex-grow-1">
+         <date-pane
+            v-bind:context="this.context"
+            v-bind:options="this.options"
+            v-bind:defaultz="this.defaultz"
+            v-bind:entity="this.entity"
+            v-bind:flag="this.flag"
+            v-bind:insideModal="false"
+            ref="dateAddress">
+         
+            <template v-slot:before>
+               <button class="btn btn-misc" @click="openEditPane">
+                  <i class="fa fa-fw fa-arrow-left"></i>
+                  {{ $t('nav.previous')}}
                </button>
-            </li>
-         </template>
-
-      </date-pane>
-   </div>
+            </template>
+            <template v-slot:action>
+               <li>
+                  <button class="btn btn-save" @click="closeDatePane">
+                     {{ $t('action.save')}}
+                  </button>
+               </li>
+            </template>
+      
+         </date-pane>
+      </div>
+   </template>
 
 </template>
 
diff --git a/src/Bundle/ChillMainBundle/Resources/public/vuejs/Address/components/AddAddress/AddressSelection.vue b/src/Bundle/ChillMainBundle/Resources/public/vuejs/Address/components/AddAddress/AddressSelection.vue
index 2c8e17687..f1cac5254 100644
--- a/src/Bundle/ChillMainBundle/Resources/public/vuejs/Address/components/AddAddress/AddressSelection.vue
+++ b/src/Bundle/ChillMainBundle/Resources/public/vuejs/Address/components/AddAddress/AddressSelection.vue
@@ -98,6 +98,11 @@ export default {
          }
       },
    },
+   mounted() {
+      if (typeof this.value.point !== 'undefined') {
+         this.updateMapCenter(this.value.point);
+      }
+   },
    methods: {
       transName(value) {
          return value.streetNumber === undefined ? value.street : `${value.streetNumber}, ${value.street}`
diff --git a/src/Bundle/ChillMainBundle/Resources/public/vuejs/Address/components/EditPane.vue b/src/Bundle/ChillMainBundle/Resources/public/vuejs/Address/components/EditPane.vue
index 4ab117395..c0e42a7b1 100644
--- a/src/Bundle/ChillMainBundle/Resources/public/vuejs/Address/components/EditPane.vue
+++ b/src/Bundle/ChillMainBundle/Resources/public/vuejs/Address/components/EditPane.vue
@@ -187,6 +187,7 @@ div.address-form {
    div#address_map {
       height: 400px;
       width: 100%;
+      z-index: 1;
    }
 }
 </style>
diff --git a/src/Bundle/ChillMainBundle/Resources/public/vuejs/Address/components/ShowPane.vue b/src/Bundle/ChillMainBundle/Resources/public/vuejs/Address/components/ShowPane.vue
index bc246d542..5048815e2 100644
--- a/src/Bundle/ChillMainBundle/Resources/public/vuejs/Address/components/ShowPane.vue
+++ b/src/Bundle/ChillMainBundle/Resources/public/vuejs/Address/components/ShowPane.vue
@@ -1,6 +1,6 @@
 <template>
 
-   <div v-if="!onlyButton">
+   <div v-if="!onlyButton" class="mt-4 flex-grow-1">
       <div class="loading">
          <i v-if="flag.loading" class="fa fa-circle-o-notch fa-spin fa-2x fa-fw"></i>
          <span class="sr-only">{{ $t('loading') }}</span>
@@ -36,21 +36,16 @@
             </action-buttons>
          </div>
       </div>
-
-      <div v-if="this.context.edit" class="mb-3 row">
-         <div class="col-sm-4"></div>
-         <div class="address-container col-sm-8">
-            <address-render-box :address="address" :isMultiline="false" :useDatePane="useDatePane"></address-render-box>
-         </div>
-      </div>
-
+   
+      <address-render-box :address="address" :isMultiline="false" :useDatePane="useDatePane"></address-render-box>
+   
       <div v-if="this.context.target.name === 'household' || this.context.edit">
          <action-buttons
             :options="this.options"
             :defaultz="this.defaultz">
             <template v-slot:action>
                <button @click.prevent="$emit('openEditPane')"
-                  class="btn btn-sm" :class="getClassButton"
+                  class="btn" :class="getClassButton"
                   type="button" name="button" :title="$t(getTextButton)">
                   <span v-if="displayTextButton">{{ $t(getTextButton) }}</span>
                </button>
@@ -58,10 +53,6 @@
          </action-buttons>
       </div>
 
-      <div v-if="!this.context.edit">
-         <address-render-box :address="address" :isMultiline="false" :useDatePane="useDatePane"></address-render-box>
-      </div>
-
    </div>
 
    <div v-if="onlyButton">
diff --git a/src/Bundle/ChillMainBundle/Resources/public/vuejs/HomepageWidget/MyEvaluations.vue b/src/Bundle/ChillMainBundle/Resources/public/vuejs/HomepageWidget/MyEvaluations.vue
index a872a2f43..bc043c666 100644
--- a/src/Bundle/ChillMainBundle/Resources/public/vuejs/HomepageWidget/MyEvaluations.vue
+++ b/src/Bundle/ChillMainBundle/Resources/public/vuejs/HomepageWidget/MyEvaluations.vue
@@ -1,5 +1,5 @@
 <template>
-<div class="accompanying_course_work">
+<div class="accompanying-course-work">
    <div class="alert alert-light">{{ $t('my_evaluations.description') }}</div>
    <span v-if="noResults" class="chill-no-data-statement">{{ $t('no_data') }}</span>
    <tab-table v-else>
diff --git a/src/Bundle/ChillMainBundle/Resources/public/vuejs/HomepageWidget/MyWorks.vue b/src/Bundle/ChillMainBundle/Resources/public/vuejs/HomepageWidget/MyWorks.vue
index 1a8e0bb76..78f78300f 100644
--- a/src/Bundle/ChillMainBundle/Resources/public/vuejs/HomepageWidget/MyWorks.vue
+++ b/src/Bundle/ChillMainBundle/Resources/public/vuejs/HomepageWidget/MyWorks.vue
@@ -1,6 +1,6 @@
 // CURRENTLY NOT IN USE
 <template>
-<div class="accompanying_course_work">
+<div class="accompanying-course-work">
    <div class="alert alert-light">{{ $t('my_works.description') }}</div>
    <span v-if="noResults" class="chill-no-data-statement">{{ $t('no_data') }}</span>
    <tab-table v-else>
diff --git a/src/Bundle/ChillMainBundle/Resources/views/Admin/layoutWithVerticalMenu.html.twig b/src/Bundle/ChillMainBundle/Resources/views/Admin/layoutWithVerticalMenu.html.twig
index 75494473a..7268c6cac 100644
--- a/src/Bundle/ChillMainBundle/Resources/views/Admin/layoutWithVerticalMenu.html.twig
+++ b/src/Bundle/ChillMainBundle/Resources/views/Admin/layoutWithVerticalMenu.html.twig
@@ -28,10 +28,15 @@
 
             </div>
             {% endif %}
-
-            {% block admin_content %}
-                <!-- block admin content empty -->
-            {% endblock %}
+    
+            <div class="row justify-content-center">
+                <div class="col-md-10 col-xxl">
+                    {% block admin_content %}
+                        <!-- block admin content empty -->
+                    {% endblock %}
+                </div>
+            </div>
+            
         </div>
         <div class="col-md-3">
             {% block vertical_menu_content %}
diff --git a/src/Bundle/ChillMainBundle/Resources/views/CRUD/_delete_content.html.twig b/src/Bundle/ChillMainBundle/Resources/views/CRUD/_delete_content.html.twig
index c47f4fbf4..8ba0a21f6 100644
--- a/src/Bundle/ChillMainBundle/Resources/views/CRUD/_delete_content.html.twig
+++ b/src/Bundle/ChillMainBundle/Resources/views/CRUD/_delete_content.html.twig
@@ -1,4 +1,4 @@
-<div class="{% block crud_content_main_div_class %}col-10 centered{% endblock %}">
+
     {% block crud_content_header %}
         <h1>{{ ('crud.'~crud_name~'.title_delete')|trans({ '%as_string%': entity|chill_entity_render_string }) }}</h1>
     {% endblock crud_content_header %}
@@ -34,4 +34,4 @@
     </ul>
 
     {{ form_end(form) }}
-</div>
+
diff --git a/src/Bundle/ChillMainBundle/Resources/views/CRUD/_edit_content.html.twig b/src/Bundle/ChillMainBundle/Resources/views/CRUD/_edit_content.html.twig
index a26eb2e4a..e23949162 100644
--- a/src/Bundle/ChillMainBundle/Resources/views/CRUD/_edit_content.html.twig
+++ b/src/Bundle/ChillMainBundle/Resources/views/CRUD/_edit_content.html.twig
@@ -1,5 +1,5 @@
-{% set formId = crudMainFormId|default('crud_main_form') %}
-<div class="{% block crud_content_main_div_class %}col-10 centered{% endblock %}">
+    {% set formId = crudMainFormId|default('crud_main_form') %}
+    
     {% block crud_content_header %}
         <h1>{{ ('crud.'~crud_name~'.title_edit')|trans }}</h1>
     {% endblock crud_content_header %}
@@ -64,4 +64,4 @@
         {% endblock %}
 
     {% endblock %}
-</div>
+
diff --git a/src/Bundle/ChillMainBundle/Resources/views/CRUD/_index.html.twig b/src/Bundle/ChillMainBundle/Resources/views/CRUD/_index.html.twig
index 15774bdf6..eaacc1f73 100644
--- a/src/Bundle/ChillMainBundle/Resources/views/CRUD/_index.html.twig
+++ b/src/Bundle/ChillMainBundle/Resources/views/CRUD/_index.html.twig
@@ -1,5 +1,3 @@
-<div class="col-10 centered">
-
 {% block index_header %}
 <h1>{{ ('crud.' ~ crud_name ~ '.index.title')|trans({'%crud_name%': crud_name}) }}</h1>
 {% endblock index_header %}
@@ -16,7 +14,7 @@
     {% endblock %}
 {% else %}
     {% block table_entities %}
-    <table>
+    <table class="table table-bordered border-dark">
         <thead>
             <tr>
                 {% block table_entities_thead_tr %}
@@ -54,4 +52,3 @@
         {% endblock %}
     </ul>
 {% endblock list_actions %}
-</div>
diff --git a/src/Bundle/ChillMainBundle/Resources/views/CRUD/_new_content.html.twig b/src/Bundle/ChillMainBundle/Resources/views/CRUD/_new_content.html.twig
index 906a77d0d..2854123fa 100644
--- a/src/Bundle/ChillMainBundle/Resources/views/CRUD/_new_content.html.twig
+++ b/src/Bundle/ChillMainBundle/Resources/views/CRUD/_new_content.html.twig
@@ -1,5 +1,5 @@
-{% set formId = crudMainFormId|default('crud_main_form') %}
-<div class="{% block crud_content_main_div_class %}col-10 centered{% endblock %}">
+    {% set formId = crudMainFormId|default('crud_main_form') %}
+
     {% block crud_content_header %}
         <h1>{{ ('crud.' ~ crud_name ~ '.title_new')|trans({'%crud_name%' : crud_name }) }}</h1>
     {% endblock crud_content_header %}
@@ -52,4 +52,4 @@
 
         {{ form_end(form) }}
     {% endblock %}
-</div>
+
diff --git a/src/Bundle/ChillMainBundle/Resources/views/CRUD/_view_content.html.twig b/src/Bundle/ChillMainBundle/Resources/views/CRUD/_view_content.html.twig
index b6f54cba0..203a24926 100644
--- a/src/Bundle/ChillMainBundle/Resources/views/CRUD/_view_content.html.twig
+++ b/src/Bundle/ChillMainBundle/Resources/views/CRUD/_view_content.html.twig
@@ -1,4 +1,4 @@
-<div class="{% block crud_content_main_div_class %}col-10 centered{% endblock %}">
+
     {% block crud_content_header %}
         <h1>{{ 'crud.%crud_name%.title_view'|trans({'%crud_name%' : crud_name }) }}</h1>
     {% endblock crud_content_header %}
@@ -60,4 +60,4 @@
         {% endblock crud_content_view_actions  %}
 
     {% endblock crud_content_view %}
-</div>
+
diff --git a/src/Bundle/ChillMainBundle/Resources/views/Center/edit.html.twig b/src/Bundle/ChillMainBundle/Resources/views/Center/edit.html.twig
index 30bea2d6e..1894a1402 100644
--- a/src/Bundle/ChillMainBundle/Resources/views/Center/edit.html.twig
+++ b/src/Bundle/ChillMainBundle/Resources/views/Center/edit.html.twig
@@ -7,8 +7,6 @@
 
     {{ form_start(edit_form) }}
     {{ form_row(edit_form.name) }}
-    {{ form_row(edit_form.submit, { 'attr' : { 'class' : 'btn btn-chill-green' } } ) }}
-    {{ form_end(edit_form) }}
 
     <ul class="record_actions sticky-form-buttons">
         <li class='cancel'>
@@ -16,5 +14,10 @@
                 {{ 'Back to the list'|trans }}
             </a>
         </li>
+        <li>
+            {{ form_widget(edit_form.submit, { 'attr' : { 'class' : 'btn btn-update' }}) }}
+        </li>
     </ul>
+    
+    {{ form_end(edit_form) }}
 {% endblock %}
diff --git a/src/Bundle/ChillMainBundle/Resources/views/Center/index.html.twig b/src/Bundle/ChillMainBundle/Resources/views/Center/index.html.twig
index d6d4bb4cd..cb2da8a62 100644
--- a/src/Bundle/ChillMainBundle/Resources/views/Center/index.html.twig
+++ b/src/Bundle/ChillMainBundle/Resources/views/Center/index.html.twig
@@ -1,39 +1,50 @@
-{% extends '@ChillMain/Admin/layoutWithVerticalMenu.html.twig' %}
+{% extends '@ChillMain/CRUD/Admin/index.html.twig' %}
 
 {% block title %}{{ 'Center list'|trans }}{% endblock %}
 
 {% block admin_content -%}
-    <h1>{{ 'Center list'|trans }}</h1>
-
-    <table class="records_list">
-        <thead>
-            <tr>
-                <th>{{ 'Name'|trans }}</th>
-                <th>{{ 'Actions'|trans }}</th>
-            </tr>
-        </thead>
-        <tbody>
-        {% for entity in entities %}
-            <tr>
-                <td>{{ entity.name }}</td>
-                <td>
-                    <ul class="record_actions">
-                        <li>
-                            <a href="{{ path('admin_center_edit', { 'id': entity.id }) }}" class="btn btn-edit">{{ 'edit'|trans }}</a>
-                        </li>
-                    </ul>
-                </td>
-            </tr>
-        {% endfor %}
-        </tbody>
-    </table>
-
-    <ul class="record_actions sticky-form-buttons">
-        <li class='cancel'>
-            <a href="{{ path('chill_main_admin_central') }}" class="btn btn-cancel">{{'Back to the admin'|trans}}</a>
-        </li>
-        <li>
-            <a href="{{ path('admin_center_new') }}" class="btn btn-create">{{ 'Create a new center'|trans }}</a>
-        </li>
-    </ul>
+    {% embed '@ChillMain/CRUD/_index.html.twig' %}
+    
+        {% block index_header %}
+            <h1>{{ 'Center list'|trans }}</h1>
+        {% endblock %}
+    
+        {% block filter_order %}{% endblock %}
+    
+        {% block table_entities_thead_tr %}
+            <th>id</th>
+            <th>{{ 'Name'|trans }}</th>
+            <th>{{ 'Actions'|trans }}</th>
+        {% endblock %}
+    
+        {% block table_entities_tbody %}
+            {% for entity in entities %}
+                <tr>
+                    <td>{{ entity.id }}</td>
+                    <td>{{ entity.name }}</td>
+                    <td>
+                        <ul class="record_actions">
+                            <li>
+                                <a href="{{ path('admin_center_edit', { 'id': entity.id }) }}" class="btn btn-edit">{{ 'edit'|trans }}</a>
+                            </li>
+                        </ul>
+                    </td>
+                </tr>
+            {% endfor %}
+        {% endblock %}
+    
+        {% block pagination %}{% endblock %}
+    
+        {% block list_actions %}
+            <ul class="record_actions sticky-form-buttons">
+                <li class='cancel'>
+                    <a href="{{ path('chill_main_admin_central') }}" class="btn btn-cancel">{{'Back to the admin'|trans}}</a>
+                </li>
+                <li>
+                    <a href="{{ path('admin_center_new') }}" class="btn btn-create">{{ 'Create a new center'|trans }}</a>
+                </li>
+            </ul>
+        {% endblock list_actions %}
+    
+    {% endembed %}
 {% endblock %}
diff --git a/src/Bundle/ChillMainBundle/Resources/views/Center/new.html.twig b/src/Bundle/ChillMainBundle/Resources/views/Center/new.html.twig
index ef614722b..cc64b37c2 100644
--- a/src/Bundle/ChillMainBundle/Resources/views/Center/new.html.twig
+++ b/src/Bundle/ChillMainBundle/Resources/views/Center/new.html.twig
@@ -7,8 +7,6 @@
 
     {{ form_start(form) }}
     {{ form_row(form.name) }}
-    {{ form_row(form.submit, { 'attr' : { 'class' : 'btn btn-chill-green' } } ) }}
-    {{ form_end(form) }}
 
     <ul class="record_actions sticky-form-buttons">
         <li class='cancel'>
@@ -16,5 +14,10 @@
                 {{ 'Back to the list'|trans }}
             </a>
         </li>
+        <li>
+            {{ form_widget(form.submit, { 'attr' : { 'class' : 'btn btn-save' }}) }}
+        </li>
     </ul>
+    
+    {{ form_end(form) }}
 {% endblock %}
diff --git a/src/Bundle/ChillMainBundle/Resources/views/Scope/edit.html.twig b/src/Bundle/ChillMainBundle/Resources/views/Scope/edit.html.twig
index 6330f2b26..a80792dc6 100644
--- a/src/Bundle/ChillMainBundle/Resources/views/Scope/edit.html.twig
+++ b/src/Bundle/ChillMainBundle/Resources/views/Scope/edit.html.twig
@@ -7,8 +7,7 @@
 
     {{ form_start(edit_form) }}
     {{ form_row(edit_form.name) }}
-    {{ form_row(edit_form.submit, { 'attr' : { 'class' : 'btn btn-chill-green' } } ) }}
-    {{ form_end(edit_form) }}
+    {{ form_row(edit_form.active) }}
 
     <ul class="record_actions sticky-form-buttons">
         <li class='cancel'>
@@ -16,5 +15,11 @@
                 {{ 'Back to the list'|trans }}
             </a>
         </li>
+        <li>
+            {{ form_widget(edit_form.submit, { 'attr' : { 'class' : 'btn btn-update' }}) }}
+        </li>
     </ul>
+    
+    {{ form_end(edit_form) }}
+    
 {% endblock %}
diff --git a/src/Bundle/ChillMainBundle/Resources/views/Scope/index.html.twig b/src/Bundle/ChillMainBundle/Resources/views/Scope/index.html.twig
index 444ba2cc5..60beb7ed7 100644
--- a/src/Bundle/ChillMainBundle/Resources/views/Scope/index.html.twig
+++ b/src/Bundle/ChillMainBundle/Resources/views/Scope/index.html.twig
@@ -1,39 +1,58 @@
-{% extends '@ChillMain/Admin/layoutWithVerticalMenu.html.twig' %}
+{% extends '@ChillMain/CRUD/Admin/index.html.twig' %}
 
 {% block title %}{{ 'List circles'|trans }}{% endblock %}
 
 {% block admin_content -%}
-    <h1>{{ 'List circles'|trans }}</h1>
+    {% embed '@ChillMain/CRUD/_index.html.twig' %}
+    
+        {% block index_header %}
+            <h1>{{ 'List circles'|trans }}</h1>
+        {% endblock %}
+        
+        {% block filter_order %}{% endblock %}
+    
+        {% block table_entities_thead_tr %}
+            <th>id</th>
+            <th>{{ 'Name'|trans }}</th>
+            <th>{{ 'Active'|trans }}</th>
+            <th>{{ 'Actions'|trans }}</th>
+        {% endblock %}
+    
+        {% block table_entities_tbody %}
+            {% for entity in entities %}
+                <tr>
+                    <td>{{ entity.id }}</td>
+                    <td>{{ entity.name|localize_translatable_string }}</td>
+                    <td style="text-align:center;">
+                        {%- if entity.active -%}
+                            <i class="fa fa-check-square-o"></i>
+                        {%- else -%}
+                            <i class="fa fa-square-o"></i>
+                        {%- endif -%}
+                    </td>
+                    <td>
+                        <ul class="record_actions">
+                            <li>
+                                <a href="{{ path('admin_scope_edit', { 'id': entity.id }) }}" class="btn btn-edit">{{ 'edit'|trans }}</a>
+                            </li>
+                        </ul>
+                    </td>
+                </tr>
+            {% endfor %}
+        {% endblock %}
+    
+        {% block pagination %}{% endblock %}
+    
+        {% block list_actions %}
+            <ul class="record_actions sticky-form-buttons">
+                <li class='cancel'>
+                    <a href="{{ path('chill_main_admin_central') }}" class="btn btn-cancel">{{'Back to the admin'|trans}}</a>
+                </li>
+                <li>
+                    <a href="{{ path('admin_scope_new') }}" class="btn btn-create">{{ 'Create a new circle'|trans }}</a>
+                </li>
+            </ul>
+        {% endblock list_actions %}
 
-    <table class="records_list">
-        <thead>
-            <tr>
-                <th>{{ 'Name'|trans }}</th>
-                <th>{{ 'Actions'|trans }}</th>
-            </tr>
-        </thead>
-        <tbody>
-        {% for entity in entities %}
-            <tr>
-                <td>{{ entity.name|localize_translatable_string }}</td>
-                <td>
-                    <ul class="record_actions">
-                        <li>
-                            <a href="{{ path('admin_scope_edit', { 'id': entity.id }) }}" class="btn btn-edit">{{ 'edit'|trans }}</a>
-                        </li>
-                    </ul>
-                </td>
-            </tr>
-        {% endfor %}
-        </tbody>
-    </table>
-
-     <ul class="record_actions sticky-form-buttons">
-        <li class='cancel'>
-            <a href="{{ path('chill_main_admin_central') }}" class="btn btn-cancel">{{'Back to the admin'|trans}}</a>
-        </li>
-        <li>
-            <a href="{{ path('admin_scope_new') }}" class="btn btn-create">{{ 'Create a new circle'|trans }}</a>
-        </li>
-    </ul>
+    {% endembed %}
 {% endblock %}
diff --git a/src/Bundle/ChillMainBundle/Resources/views/Scope/new.html.twig b/src/Bundle/ChillMainBundle/Resources/views/Scope/new.html.twig
index 56eb110d0..0c28a396e 100644
--- a/src/Bundle/ChillMainBundle/Resources/views/Scope/new.html.twig
+++ b/src/Bundle/ChillMainBundle/Resources/views/Scope/new.html.twig
@@ -7,8 +7,7 @@
 
     {{ form_start(form) }}
     {{ form_row(form.name) }}
-    {{ form_row(form.submit, { 'attr' : { 'class' : 'btn btn-chill-green' } } ) }}
-    {{ form_end(form) }}
+    {{ form_row(form.active) }}
 
     <ul class="record_actions sticky-form-buttons">
         <li class='cancel'>
@@ -16,5 +15,9 @@
                 {{ 'Back to the list'|trans }}
             </a>
         </li>
+        <li>
+            {{ form_widget(form.submit, { 'attr' : { 'class' : 'btn btn-save' }}) }}
+        </li>
     </ul>
+    {{ form_end(form) }}
 {% endblock %}
diff --git a/src/Bundle/ChillMainBundle/Resources/views/User/index.html.twig b/src/Bundle/ChillMainBundle/Resources/views/User/index.html.twig
index ec93cf8a7..0f1168113 100644
--- a/src/Bundle/ChillMainBundle/Resources/views/User/index.html.twig
+++ b/src/Bundle/ChillMainBundle/Resources/views/User/index.html.twig
@@ -1,83 +1,99 @@
-{% extends '@ChillMain/Admin/layoutWithVerticalMenu.html.twig' %}
+{% extends '@ChillMain/CRUD/Admin/index.html.twig' %}
 
 {% block admin_content %}
-
-    <h1>{{"Users"|trans}}</h1>
-
-    {{ filter_order|chill_render_filter_order_helper }}
-
-    {% for entity in entities %}
-    <div class="flex-table">
-        <div class="item-bloc">
-            <div class="item-row">
-                <div class="item-col">
-                    {% if entity.civility is not null %}
-                        {% if entity.civility.name|length > 0 %}
-                            {{ entity.civility.name|first }}
+    {% embed '@ChillMain/CRUD/_index.html.twig' %}
+    
+        {% block index_header %}
+            <h1>{{"Users"|trans}}</h1>
+        {% endblock %}
+    
+        {% block filter_order %}{{ filter_order|chill_render_filter_order_helper }}{% endblock %}
+    
+        {% block table_entities_thead_tr %}
+            <th>{{ 'Active'|trans }}</th>
+            <th>{{ 'Username'|trans }}</th>
+            <th>{{ 'Datas'|trans }}</th>
+            <th>{{ 'Actions'|trans }}</th>
+        {% endblock %}
+    
+        {% block table_entities_tbody %}
+            {% for entity in entities %}
+                <tr>
+                    <td>
+                        {% if entity.isEnabled %}
+                            <i class="fa fa-check-square-o"></i>
+                        {% else %}
+                            <i class="fa fa-square-o"></i>
                         {% endif %}
-                    {% endif %}
-                    {{ entity.label }}
-                    {% if entity.isEnabled %}
-                        <i class="fa fa-check chill-green"></i>
-                    {% else %}
-                        <i class="fa fa-times chill-red"></i>
-                    {% endif %}
-                </div>
-                <div class="item-col"><i>{{ entity.email }}</i></div>
-            </div>
-            <div class="item-row">
-                <div class="item-col">
-                    login: {{ entity.username|e('html_attr') }}
-                </div>
-                <div class="item-col">
-                    {% if entity.userJob %}
-                        {{ entity.userJob.label|localize_translatable_string }}
-                    {% endif %}
-                </div>
-            </div>
-            <div class="item-row">
-                <div class="item-col">
-                    {% if entity.mainScope %}
-                        {{ entity.mainScope.name|localize_translatable_string }}
-                    {% endif %}
-                    {% if entity.mainCenter %}
-                        , {{ entity.mainCenter.name }}
-                    {% endif %}
-                </div>
-            </div>
-            <div class="item-row">
-               <ul class="record_actions">
-                    <li>
-                        <a class="btn btn-edit" href="{{ path('chill_crud_admin_user_edit', { 'id': entity.id }) }}"></a>
-                    </li>
-
-                    {% if allow_change_password is same as(true) %}
-                    <li>
-                        <a class="btn btn-chill-red" href="{{ path('admin_user_edit_password',  { 'id' : entity.id }) }}" title="{{ 'Edit password'|trans|e('html_attr') }}"><i class="fa fa-ellipsis-h"></i></a>
-                    </li>
-                    {% endif %}
-
-                    {% if is_granted('ROLE_ALLOWED_TO_SWITCH') %}
-                        <li>
-                            <a class="btn btn-chill-blue" href="{{ path('chill_main_homepage', {'_switch_user': entity.username }) }}" title="{{ "Impersonate"|trans|e('html_attr') }}"><i class="fa fa-user-secret"></i></a>
-                        </li>
-                    {% endif %}
-                </ul>
-            </div>
-        </div>
-
-    </div>
-    {% endfor %}
-
-    {{ chill_pagination(paginator) }}
-
-    <ul class="record_actions sticky-form-buttons">
-        <li class='cancel'>
-            <a href="{{ path('chill_main_admin_central') }}" class="btn btn-cancel">{{'Back to the admin'|trans}}</a>
-        </li>
-        <li>
-            <a href="{{ path('chill_crud_admin_user_new') }}" class="btn btn-create">{{ 'Create'|trans }}</a>
-        </li>
-    </ul>
-
+                    </td>
+                    <td>
+                        {#
+                        {% if entity.civility is not null %}
+                            {% if entity.civility.name|length > 0 %}
+                                {{ entity.civility.name|first }}
+                            {% endif %}
+                        {% endif %}
+                        #}
+                        {{ entity.label }}
+                    </td>
+                    <td>
+                        <ul class="unbullet">
+                            <li>
+                                <span class="dt">login:</span>
+                                {{ entity.username|e('html_attr') }}
+                            </li>
+                            <li>
+                                <span class="dt">email:</span>
+                                {{ entity.email }}
+                            </li>
+                            <li>
+                                <span class="dt">métier:</span>
+                                {% if entity.userJob %}{{ entity.userJob.label|localize_translatable_string }}{% endif %}
+                            </li>
+                            <li>
+                                <span class="dt">cercle/centre:</span>
+                                {% if entity.mainScope %}
+                                    {{ entity.mainScope.name|localize_translatable_string }}
+                                {% endif %}
+                                {% if entity.mainCenter %}, {{ entity.mainCenter.name }}{% endif %}
+                            </li>
+                        </ul>
+                    </td>
+                    <td>
+                        <ul class="record_actions">
+                            <li>
+                                <a class="btn btn-edit" title="{{ 'Edit'|trans }}" href="{{ path('chill_crud_admin_user_edit', { 'id': entity.id }) }}"></a>
+                            </li>
+        
+                            {% if allow_change_password is same as(true) %}
+                                <li>
+                                    <a class="btn btn-chill-red" href="{{ path('admin_user_edit_password',  { 'id' : entity.id }) }}" title="{{ 'Edit password'|trans|e('html_attr') }}"><i class="fa fa-ellipsis-h"></i></a>
+                                </li>
+                            {% endif %}
+        
+                            {% if is_granted('ROLE_ALLOWED_TO_SWITCH') %}
+                                <li>
+                                    <a class="btn btn-chill-blue" href="{{ path('chill_main_homepage', {'_switch_user': entity.username }) }}" title="{{ "Impersonate"|trans|e('html_attr') }}"><i class="fa fa-user-secret"></i></a>
+                                </li>
+                            {% endif %}
+                        </ul>
+                    </td>
+                </tr>
+            {% endfor %}
+        {% endblock %}
+    
+        {% block pagination %}{{ chill_pagination(paginator) }}{% endblock %}
+    
+        {% block list_actions %}
+            <ul class="record_actions sticky-form-buttons">
+                <li class='cancel'>
+                    <a href="{{ path('chill_main_admin_central') }}" class="btn btn-cancel">{{'Back to the admin'|trans}}</a>
+                </li>
+                <li>
+                    <a href="{{ path('chill_crud_admin_user_new') }}" class="btn btn-create">{{ 'Create'|trans }}</a>
+                </li>
+            </ul>
+        {% endblock list_actions %}
+    
+    {% endembed %}
 {% endblock %}
diff --git a/src/Bundle/ChillMainBundle/Resources/views/UserJob/index.html.twig b/src/Bundle/ChillMainBundle/Resources/views/UserJob/index.html.twig
index 3d56265dc..e8ea9ec38 100644
--- a/src/Bundle/ChillMainBundle/Resources/views/UserJob/index.html.twig
+++ b/src/Bundle/ChillMainBundle/Resources/views/UserJob/index.html.twig
@@ -2,12 +2,14 @@
 
 {% block admin_content %}
     {% embed '@ChillMain/CRUD/_index.html.twig' %}
+        
         {% block table_entities_thead_tr %}
             <th>id</th>
-            <th>{{ 'label'|trans }}</th>
-            <th>{{ 'active'|trans }}</th>
-            <th>&nbsp;</th>
+            <th>{{ 'Label'|trans }}</th>
+            <th>{{ 'Active'|trans }}</th>
+            <th>{{ 'Actions'|trans }}</th>
         {% endblock %}
+        
         {% block table_entities_tbody %}
             {% for entity in entities %}
                 <tr>
@@ -30,11 +32,12 @@
                 </tr>
              {% endfor %}
         {% endblock %}
-
+        
         {% block actions_before %}
             <li class='cancel'>
                 <a href="{{ path('chill_main_admin_central') }}" class="btn btn-cancel">{{'Back to the admin'|trans}}</a>
             </li>
         {% endblock %}
+        
     {% endembed %}
 {% endblock %}
diff --git a/src/Bundle/ChillMainBundle/Resources/views/Workflow/_attachment.html.twig b/src/Bundle/ChillMainBundle/Resources/views/Workflow/_attachment.html.twig
index b825e4d43..24cf3cab4 100644
--- a/src/Bundle/ChillMainBundle/Resources/views/Workflow/_attachment.html.twig
+++ b/src/Bundle/ChillMainBundle/Resources/views/Workflow/_attachment.html.twig
@@ -1,4 +1,7 @@
-{# TODO Adapt condition #}
+{# TODO
+    Check if this template is used
+    Adapt condition or Delete it
+#}
 {% if random(1) == 0 %}
 
     {# For a document #}
@@ -22,7 +25,7 @@
     {# For an action #}
     <h2>{{ 'Accompanying Course Action'|trans ~ 'target'|trans }}</h2>
 
-    <div class="flex-table accompanying_course_work-list">
+    <div class="flex-table accompanying-course-work">
         {# dynamic insertion
             ::: TODO delete all static insertion, remove condition and pass work object in inclusion
         #}{% if dynamic is defined %}
diff --git a/src/Bundle/ChillMainBundle/Routing/MenuBuilder/AdminLanguageMenuBuilder.php b/src/Bundle/ChillMainBundle/Routing/MenuBuilder/AdminLanguageMenuBuilder.php
index a13b33a1e..0d91a0438 100644
--- a/src/Bundle/ChillMainBundle/Routing/MenuBuilder/AdminLanguageMenuBuilder.php
+++ b/src/Bundle/ChillMainBundle/Routing/MenuBuilder/AdminLanguageMenuBuilder.php
@@ -40,7 +40,6 @@ class AdminLanguageMenuBuilder implements LocalMenuBuilderInterface
             ->setAttribute('class', 'list-group-item-header')
             ->setExtras([
                 'order' => 1200,
-                'icons' => ['globe-w'],
             ]);
         $menu->addChild('Language list', [
             'route' => 'chill_crud_main_language_index',
diff --git a/src/Bundle/ChillMainBundle/Routing/MenuBuilder/AdminLocationMenuBuilder.php b/src/Bundle/ChillMainBundle/Routing/MenuBuilder/AdminLocationMenuBuilder.php
index 081d5d84a..b69399daf 100644
--- a/src/Bundle/ChillMainBundle/Routing/MenuBuilder/AdminLocationMenuBuilder.php
+++ b/src/Bundle/ChillMainBundle/Routing/MenuBuilder/AdminLocationMenuBuilder.php
@@ -40,7 +40,6 @@ class AdminLocationMenuBuilder implements LocalMenuBuilderInterface
             ->setAttribute('class', 'list-group-item-header')
             ->setExtras([
                 'order' => 1300,
-                'icons' => ['map-marker'],
             ]);
 
         $menu->addChild('Location type list', [
diff --git a/src/Bundle/ChillMainBundle/Routing/MenuBuilder/AdminUserMenuBuilder.php b/src/Bundle/ChillMainBundle/Routing/MenuBuilder/AdminUserMenuBuilder.php
index 96fdcb60d..7bd23c81f 100644
--- a/src/Bundle/ChillMainBundle/Routing/MenuBuilder/AdminUserMenuBuilder.php
+++ b/src/Bundle/ChillMainBundle/Routing/MenuBuilder/AdminUserMenuBuilder.php
@@ -46,7 +46,6 @@ class AdminUserMenuBuilder implements LocalMenuBuilderInterface
             ->setAttribute('class', 'list-group-item-header')
             ->setExtras([
                 'order' => 1000,
-                'icons' => ['key'],
             ]);
 
         $menu->addChild('Center list', [
diff --git a/src/Bundle/ChillMainBundle/translations/messages.fr.yml b/src/Bundle/ChillMainBundle/translations/messages.fr.yml
index f779cf87f..b092805c6 100644
--- a/src/Bundle/ChillMainBundle/translations/messages.fr.yml
+++ b/src/Bundle/ChillMainBundle/translations/messages.fr.yml
@@ -41,6 +41,7 @@ Last updated on: Dernière mise à jour le
 by_user: "par "
 lifecycleUpdate: Evenements de création et mise à jour
 address_fields: Données liées à l'adresse
+Datas: Données
 
 inactive: inactif
 
@@ -70,6 +71,7 @@ Centers: Centres
 center: centre
 comment: commentaire
 Comment: Commentaire
+Comments: Commentaires
 Pinned comment: Commentaire épinglé
 Any comment: Aucun commentaire
 Read more: Lire la suite
diff --git a/src/Bundle/ChillPersonBundle/Controller/AccompanyingCourseWorkController.php b/src/Bundle/ChillPersonBundle/Controller/AccompanyingCourseWorkController.php
index 7b77252be..8d15ca30f 100644
--- a/src/Bundle/ChillPersonBundle/Controller/AccompanyingCourseWorkController.php
+++ b/src/Bundle/ChillPersonBundle/Controller/AccompanyingCourseWorkController.php
@@ -178,6 +178,27 @@ class AccompanyingCourseWorkController extends AbstractController
         ]);
     }
 
+    /**
+     * @Route(
+     *     "{_locale}/person/accompanying-period/work/{id}/show",
+     *     name="chill_person_accompanying_period_work_show",
+     *     methods={"GET"}
+     * )
+     */
+    public function showWork(AccompanyingPeriodWork $work): Response
+    {
+        if (null === $work) {
+            throw $this->createNotFoundException('Unable to find Work entity.');
+        }
+
+        $this->denyAccessUnlessGranted(AccompanyingPeriodWorkVoter::SEE, $work);
+
+        return $this->render('@ChillPerson/AccompanyingCourseWork/show.html.twig', [
+            'accompanyingCourse' => $work->getAccompanyingPeriod(),
+            'work' => $work,
+        ]);
+    }
+
     private function createDeleteForm(int $id): Form
     {
         $params = [];
diff --git a/src/Bundle/ChillPersonBundle/Controller/SocialWorkSocialActionApiController.php b/src/Bundle/ChillPersonBundle/Controller/SocialWorkSocialActionApiController.php
index a0d15b6db..3ae5c5b7c 100644
--- a/src/Bundle/ChillPersonBundle/Controller/SocialWorkSocialActionApiController.php
+++ b/src/Bundle/ChillPersonBundle/Controller/SocialWorkSocialActionApiController.php
@@ -14,6 +14,7 @@ namespace Chill\PersonBundle\Controller;
 use Chill\MainBundle\CRUD\Controller\ApiController;
 use Chill\MainBundle\Pagination\PaginatorFactory;
 use Chill\MainBundle\Serializer\Model\Collection;
+use Chill\PersonBundle\Entity\SocialWork\SocialAction;
 use Chill\PersonBundle\Repository\SocialWork\SocialIssueRepository;
 use Symfony\Component\HttpFoundation\JsonResponse;
 use Symfony\Component\HttpFoundation\Request;
@@ -41,7 +42,12 @@ class SocialWorkSocialActionApiController extends ApiController
             throw $this->createNotFoundException('socialIssue not found');
         }
 
-        $socialActions = $socialIssue->getRecursiveSocialActions();
+        $socialActions = $socialIssue->getRecursiveSocialActions()->toArray();
+
+        usort($socialActions, static function (SocialAction $sa, SocialAction $sb) {
+            return $sa->getOrdering() <=> $sb->getOrdering();
+        });
+
         $pagination = $this->paginator->create(count($socialActions));
         // max one page
         $pagination->setItemsPerPage(count($socialActions));
diff --git a/src/Bundle/ChillPersonBundle/Menu/AdminAccompanyingCourseMenuBuilder.php b/src/Bundle/ChillPersonBundle/Menu/AdminAccompanyingCourseMenuBuilder.php
index f75d2844b..42c5dd4c2 100644
--- a/src/Bundle/ChillPersonBundle/Menu/AdminAccompanyingCourseMenuBuilder.php
+++ b/src/Bundle/ChillPersonBundle/Menu/AdminAccompanyingCourseMenuBuilder.php
@@ -39,7 +39,6 @@ class AdminAccompanyingCourseMenuBuilder implements LocalMenuBuilderInterface
             ->setAttribute('class', 'list-group-item-header')
             ->setExtras([
                 'order' => 2200,
-                'icons' => ['random'],
             ]);
 
         $menu->addChild('person_admin.closing motives', [
diff --git a/src/Bundle/ChillPersonBundle/Menu/AdminHouseholdMenuBuilder.php b/src/Bundle/ChillPersonBundle/Menu/AdminHouseholdMenuBuilder.php
index 6a9e9dedc..0cbc48330 100644
--- a/src/Bundle/ChillPersonBundle/Menu/AdminHouseholdMenuBuilder.php
+++ b/src/Bundle/ChillPersonBundle/Menu/AdminHouseholdMenuBuilder.php
@@ -39,7 +39,6 @@ class AdminHouseholdMenuBuilder implements LocalMenuBuilderInterface
             ->setAttribute('class', 'list-group-item-header')
             ->setExtras([
                 'order' => 2100,
-                'icons' => ['home'],
             ]);
 
         $menu->addChild('Position', [
diff --git a/src/Bundle/ChillPersonBundle/Menu/AdminPersonMenuBuilder.php b/src/Bundle/ChillPersonBundle/Menu/AdminPersonMenuBuilder.php
index 8459e4b89..ee2dad9dc 100644
--- a/src/Bundle/ChillPersonBundle/Menu/AdminPersonMenuBuilder.php
+++ b/src/Bundle/ChillPersonBundle/Menu/AdminPersonMenuBuilder.php
@@ -39,7 +39,6 @@ class AdminPersonMenuBuilder implements LocalMenuBuilderInterface
             ->setAttribute('class', 'list-group-item-header')
             ->setExtras([
                 'order' => 2000,
-                'icons' => ['child'],
             ]);
 
         $menu->addChild('Civility', [
diff --git a/src/Bundle/ChillPersonBundle/Menu/AdminSocialWorkMenuBuilder.php b/src/Bundle/ChillPersonBundle/Menu/AdminSocialWorkMenuBuilder.php
index cec672dd2..2b98c98a6 100644
--- a/src/Bundle/ChillPersonBundle/Menu/AdminSocialWorkMenuBuilder.php
+++ b/src/Bundle/ChillPersonBundle/Menu/AdminSocialWorkMenuBuilder.php
@@ -39,7 +39,6 @@ class AdminSocialWorkMenuBuilder implements LocalMenuBuilderInterface
             ->setAttribute('class', 'list-group-item-header')
             ->setExtras([
                 'order' => 2300,
-                'icons' => ['handshake-o'],
             ]);
 
         $menu->addChild('person_admin.social_action', [
diff --git a/src/Bundle/ChillPersonBundle/Resources/public/chill/scss/accompanying_period_work.scss b/src/Bundle/ChillPersonBundle/Resources/public/chill/scss/accompanying_period_work.scss
index ed474911f..eeb2eb2be 100644
--- a/src/Bundle/ChillPersonBundle/Resources/public/chill/scss/accompanying_period_work.scss
+++ b/src/Bundle/ChillPersonBundle/Resources/public/chill/scss/accompanying_period_work.scss
@@ -1,13 +1,16 @@
-/// AccompanyingCourse Work list Page
-div.accompanying_course_work-list {
+/// AccompanyingCourse Work Pages
+div.accompanying-course-work {
 
     table.obj-res-eval {
         border-collapse: collapse;
         border-radius: 5px;
         width: 100%;
+        margin-top: 1em;
+        margin-bottom: 1em;
         &, tr, th, td {
             border: 1px solid lightgray;
             padding: 0.3em;
+            background-color: $white;
         }
         th {
             h4.title_label {
@@ -26,6 +29,11 @@ div.accompanying_course_work-list {
         }
         td.eval {
             width: 100%;
+            div.download {
+                .row > * {
+                    transform: scale(0.85);
+                }
+            }
         }
     }
 
@@ -47,10 +55,32 @@ div.accompanying_course_work-list {
         }
     }
 
+    div.item-bloc {
+        &.short {}
+        &.long {}
+        &.uniq {}
+        &.extended {
+            table.obj-res-eval {
+                margin-top: 0;
+                &:last-child {
+                    margin-bottom: 0;
+                }
+            }
+        }
+        &.colored {
+            background-color: $chill-llight-gray;
+        }
+    }
+
 }
 
-div.flex-table div.item-bloc:nth-child(2n) table.obj-res-eval {
-    &, tr, th, td {
-        background-color:  $chill-llight-gray;
+/// item-bloc with background-color altern: even case
+div.flex-table div.item-bloc:nth-child(2n) {
+
+    // set table background
+    table.obj-res-eval {
+        &, tr, th, td {
+            background-color:  $chill-llight-gray;
+        }
     }
 }
diff --git a/src/Bundle/ChillPersonBundle/Resources/public/chill/scss/badge.scss b/src/Bundle/ChillPersonBundle/Resources/public/chill/scss/badge.scss
index b359f84d6..072f13949 100644
--- a/src/Bundle/ChillPersonBundle/Resources/public/chill/scss/badge.scss
+++ b/src/Bundle/ChillPersonBundle/Resources/public/chill/scss/badge.scss
@@ -128,7 +128,7 @@ ul.columns { // XS:1  SM:2  MD:1  LG:2  XL:2  XXL:2
 }
 
 /// dashboard_like_badge in AccompanyingCourse Work list Page
-div[class*='accompanying_course_work'] {
+div[class*='accompanying-course-work'] {
     div.dashboard,
     h4.badge-title,
     h3.badge-title,
diff --git a/src/Bundle/ChillPersonBundle/Resources/public/vuejs/AccompanyingCourse/store/index.js b/src/Bundle/ChillPersonBundle/Resources/public/vuejs/AccompanyingCourse/store/index.js
index 8324a3d82..c2ded503b 100644
--- a/src/Bundle/ChillPersonBundle/Resources/public/vuejs/AccompanyingCourse/store/index.js
+++ b/src/Bundle/ChillPersonBundle/Resources/public/vuejs/AccompanyingCourse/store/index.js
@@ -785,7 +785,7 @@ let initPromise = (root) => Promise.all([getScopesPromise(root), accompanyingCou
                return makeFetch('PATCH', url, body)
                   .then((response) => {
                      commit('updateReferrer', response.user);
-                     if (null !== payload.user_job && payload.user_job !== state.accompanyingCourse.job) {
+                     if (null !== payload && null !== payload.user_job && payload.user_job !== state.accompanyingCourse.job) {
                         this.dispatch('updateJob', payload.user_job);
                      }
                      // commit('setFilteredReferrersSuggested'); // this mutation doesn't exist?
diff --git a/src/Bundle/ChillPersonBundle/Resources/public/vuejs/AccompanyingCourseWorkEdit/App.vue b/src/Bundle/ChillPersonBundle/Resources/public/vuejs/AccompanyingCourseWorkEdit/App.vue
index 04c753358..9a105dd8d 100644
--- a/src/Bundle/ChillPersonBundle/Resources/public/vuejs/AccompanyingCourseWorkEdit/App.vue
+++ b/src/Bundle/ChillPersonBundle/Resources/public/vuejs/AccompanyingCourseWorkEdit/App.vue
@@ -1,5 +1,5 @@
 <template>
-   <div id="workEditor" class="accompanying_course_work_edit my-4">
+   <div id="workEditor" class="my-4">
       <div id="title" class="action-row">
          <div>
             <p class="wl-item social-issues">
diff --git a/src/Bundle/ChillPersonBundle/Resources/views/AccompanyingCourseWork/_item.html.twig b/src/Bundle/ChillPersonBundle/Resources/views/AccompanyingCourseWork/_item.html.twig
index 3d4f46425..8ab7a932c 100644
--- a/src/Bundle/ChillPersonBundle/Resources/views/AccompanyingCourseWork/_item.html.twig
+++ b/src/Bundle/ChillPersonBundle/Resources/views/AccompanyingCourseWork/_item.html.twig
@@ -1,4 +1,10 @@
-<div class="item-bloc accompanying_course_work-item{% if itemBlocClass is defined %} {{ itemBlocClass }}{% endif %}">
+{#
+#  OPTIONS
+#  - itemBlocClass: [uniq|colored|extended]
+#  - displayContent: [short|long] default: short
+#  - displayAction: [true|false] default: false
+#}
+<div class="item-bloc{% if displayContent is defined %} {{ displayContent }}{% endif %}{% if itemBlocClass is defined %} {{ itemBlocClass }}{% endif %}">
 
     <div class="item-row">
         <h2 class="badge-title">
@@ -15,6 +21,13 @@
                             <span class="item-key">{{ 'accompanying_course_work.end_date'|trans ~ ' : ' }}</span>
                             <b>{{ w.endDate|format_date('short') }}</b>
                         </li>
+                    {% else %}
+                        {% if displayContent is defined and displayContent == 'long' %}
+                            <li>
+                                <span class="item-key">{{ 'accompanying_course_work.end_date'|trans ~ ' : ' }}</span>
+                                <span class="chill-no-data-statement">{{ 'Not given'|trans }}</span>
+                            </li>
+                        {% endif %}
                     {% endif %}
                 </ul>
 
@@ -25,7 +38,7 @@
     <div class="item-row separator">
         <div class="wrap-list">
 
-            {%- if w.persons -%}
+            {%- if w.persons -%}{# Usagers du parcours #}
                 <div class="wl-row">
                     <div class="wl-col title">
                         <h3>{{ 'Persons in accompanying course'|trans }}</h3>
@@ -45,7 +58,7 @@
                 </div>
             {% endif %}
 
-            {%- if w.handlingThierParty -%}
+            {%- if w.handlingThierParty -%}{# Tiers traitant #}
                 <div class="wl-row">
                     <div class="wl-col title">
                         <h3>{{ 'Thirdparty handling'|trans }}</h3>
@@ -62,23 +75,25 @@
                 </div>
             {% endif %}
 
-            {%- if w.referrers -%}
-                <div class="wl-row">
-                    <div class="wl-col title">
-                        <h3>{{ 'Referrers'|trans }}</h3>
-                    </div>
-                    <div class="wl-col list">
+            <div class="wl-row">{# Agents traitants #}
+                <div class="wl-col title">
+                    <h3>{%- if w.referrers|length > 1 -%}{{ 'Referrers'|trans }}{% else %}{{ 'Referrer2'|trans }}{% endif %}</h3>
+                </div>
+                <div class="wl-col list">
+                    {%- if w.referrers|length > 0 -%}
                         {% for u in w.referrers %}
                             <span class="wl-item">
                                 {{ u|chill_entity_render_box }}
                                 {% if not loop.last %}, {% endif %}
                             </span>
                         {% endfor %}
-                    </div>
+                    {% else %}
+                        <span class="chill-no-data-statement">{{ 'No referrer'|trans }}</span>
+                    {% endif %}
                 </div>
-            {% endif %}
+            </div>
 
-            {%- if w.socialAction.issue -%}
+            {%- if w.socialAction.issue -%}{# Problématique sociale #}
                 <div class="wl-row">
                     <div class="wl-col title">
                         <h3>{{ 'Social issue'|trans }}</h3>
@@ -94,56 +109,94 @@
         </div>
     </div>
 
-    <div class="item-row column">
-        {% include 'ChillPersonBundle:AccompanyingCourseWork:_objectifs_results_evaluations.html.twig' %}
-    </div>
-
-    <div class="item-row separator">
-        <div class="item-col item-meta">
-            {% set notif_counter = chill_count_notifications('Chill\\PersonBundle\\Entity\\AccompanyingPeriod\\AccompanyingPeriodWork', w.id) %}
-            {% if notif_counter.total > 0 %}
-                {{ chill_counter_notifications('Chill\\PersonBundle\\Entity\\AccompanyingPeriod\\AccompanyingPeriodWork', w.id) }}
-            {% endif %}
-
-            {% import '@ChillPerson/Macro/updatedBy.html.twig' as macro %}
-            {{ macro.updatedBy(w) }}
+    {% if displayContent is not defined or displayContent == 'short' %}
+        <div class="item-row column">
+            {% include 'ChillPersonBundle:AccompanyingCourseWork:_objectifs_results_evaluations.html.twig' with {
+                'displayContent': displayContent
+            } %}
         </div>
+    {% endif %}
 
-        {% if displayAction is defined and displayAction == true %}
-        <ul class="item-col record_actions">
-            {% set suppEvaluations = [] %}
-            {% for e in w.accompanyingPeriodWorkEvaluations %}
-                {% set suppEvaluations = suppEvaluations|merge([
-                    {'relatedEntityClass': 'Chill\\PersonBundle\\Entity\\AccompanyingPeriod\\AccompanyingPeriodWorkEvaluation', 'relatedEntityId': e.id }
-                ]) %}
+    {% if displayContent is not defined or displayContent == 'short' %}
+        <div class="item-row separator">
 
-                {% for d in e.documents %}
-                    {% set suppEvaluations = suppEvaluations|merge([
-                        {'relatedEntityClass': 'Chill\\PersonBundle\\Entity\\AccompanyingPeriod\\AccompanyingPeriodWorkEvaluationDocument', 'relatedEntityId': d.id }
-                    ]) %}
-                {% endfor %}
-            {% endfor %}
-            <li>
-                {{ chill_entity_workflow_list(
-                    'Chill\\PersonBundle\\Entity\\AccompanyingPeriod\\AccompanyingPeriodWork',
-                    w.id, [], suppEvaluations) }}
-            </li>
-            {% if is_granted('CHILL_MAIN_ACCOMPANYING_PERIOD_WORK_UPDATE', w) %}
+            {% import '@ChillPerson/AccompanyingCourseWork/_macros.html.twig' as macro  %}
+
+            <div class="item-col item-meta">
+                {{ macro.metadata(w) }}
+            </div>
+
+            {% if displayAction is defined and displayAction == true %}
+            <ul class="item-col record_actions">
+                <li>{{ macro.workflowButton(w) }}</li>
                 <li>
-                    <a class="btn btn-edit" title="{{ 'Edit'|trans }}"
-                    href="{{ chill_path_add_return_path('chill_person_accompanying_period_work_edit', { 'id': w.id }) }}"
+                    <a class="btn btn-show" title="{{ 'Show'|trans }}"
+                       href="{{ chill_path_add_return_path('chill_person_accompanying_period_work_show', {'id': w.id }) }}"
                     ></a>
                 </li>
+                {% if is_granted('CHILL_MAIN_ACCOMPANYING_PERIOD_WORK_UPDATE', w) %}
+                    <li>
+                        <a class="btn btn-edit" title="{{ 'Edit'|trans }}"
+                           href="{{ chill_path_add_return_path('chill_person_accompanying_period_work_edit', { 'id': w.id }) }}"
+                        ></a>
+                    </li>
+                {% endif %}
+                {% if is_granted('CHILL_MAIN_ACCOMPANYING_PERIOD_WORK_DELETE', w) %}
+                    <li>
+                        <a class="btn btn-delete" title="{{ 'Delete'|trans }}"
+                           href="{{ path('chill_person_accompanying_period_work_delete', { 'id': w.id } ) }}"
+                        ></a>
+                    </li>
+                {% endif %}
+            </ul>
             {% endif %}
-            {% if is_granted('CHILL_MAIN_ACCOMPANYING_PERIOD_WORK_DELETE', w) %}
-                <li>
-                    <a class="btn btn-delete" title="{{ 'Delete'|trans }}"
-                       href="{{ path('chill_person_accompanying_period_work_delete', { 'id': w.id } ) }}"
-                    ></a>
-                </li>
-            {% endif %}
-        </ul>
-        {% endif %}
-    </div>
+        </div>
+    {% endif %}
 
 </div>
+
+{#
+ #   This is for 'long' version of content
+ #   Note: this include is wrapped in a flex-table container.
+ #   We start by closing the flex-table so we can add more.
+ #   At the end we leave the last flex-table open, as it will be closed in the container.
+#}
+{% if displayContent is defined and displayContent == 'long' %}
+    </div>
+
+    {% if w.results|length > 0 or w.goals|length > 0 or w.accompanyingPeriodWorkEvaluations|length > 0 %}
+        <h2 class="chill-blue">{{ 'Dispositifs' }}</h2>
+
+        <div class="flex-table">{# new flex-table wrapper #}
+            <div class="item-bloc colored{% if displayContent is defined %} {{ displayContent }}{% endif %}{% if itemBlocClass is defined %} {{ itemBlocClass }}{% endif %}">
+                {% include 'ChillPersonBundle:AccompanyingCourseWork:_objectifs_results_evaluations.html.twig' with {
+                    'displayContent': displayContent
+                } %}
+            </div>
+        </div>
+    {% endif %}
+
+    <h2 class="chill-blue">{{ 'Comments'|trans }}</h2>
+
+    <div class="flex-table">
+        <div class="item-bloc no-altern{% if displayContent is defined %} {{ displayContent }}{% endif %}{% if itemBlocClass is defined %} {{ itemBlocClass }}{% endif %}">
+            <h3 class="chill-beige">Public</h3>
+            {% if w.note is not empty %}
+                <blockquote class="chill-user-quote">
+                    {{ w.note|chill_entity_render_box({'metadata': true }) }}
+                </blockquote>
+            {% else %}
+                <span class="chill-no-data-statement">{{ 'No comment associated'|trans }}</span>
+            {% endif %}
+        </div>
+        {% if w.privateComment.hasCommentForUser(app.user) %}
+            <div class="item-bloc no-altern{% if displayContent is defined %} {{ displayContent }}{% endif %}{% if itemBlocClass is defined %} {{ itemBlocClass }}{% endif %}">
+                <h3 class="chill-beige">Privé</h3>
+                <blockquote class="chill-user-quote private-quote">
+                    {{ w.privateComment.commentForUser(app.user)|chill_markdown_to_html }}
+                </blockquote>
+            </div>
+        {% endif %}
+    {# Here flex-table stay open ! read above #}
+
+{% endif %}
diff --git a/src/Bundle/ChillPersonBundle/Resources/views/AccompanyingCourseWork/_macros.html.twig b/src/Bundle/ChillPersonBundle/Resources/views/AccompanyingCourseWork/_macros.html.twig
new file mode 100644
index 000000000..10a0f94c7
--- /dev/null
+++ b/src/Bundle/ChillPersonBundle/Resources/views/AccompanyingCourseWork/_macros.html.twig
@@ -0,0 +1,23 @@
+{% macro metadata(w) %}
+    {% set notif_counter = chill_count_notifications('Chill\\PersonBundle\\Entity\\AccompanyingPeriod\\AccompanyingPeriodWork', w.id) %}
+    {% if notif_counter.total > 0 %}
+        {{ chill_counter_notifications('Chill\\PersonBundle\\Entity\\AccompanyingPeriod\\AccompanyingPeriodWork', w.id) }}
+    {% endif %}
+    {% import '@ChillPerson/Macro/updatedBy.html.twig' as macro %}
+    {{ macro.updatedBy(w) }}
+{% endmacro %}
+
+{% macro workflowButton(w) %}
+    {% set suppEvaluations = [] %}
+    {% for e in w.accompanyingPeriodWorkEvaluations %}
+        {% set suppEvaluations = suppEvaluations|merge([
+            {'relatedEntityClass': 'Chill\\PersonBundle\\Entity\\AccompanyingPeriod\\AccompanyingPeriodWorkEvaluation', 'relatedEntityId': e.id }
+        ]) %}
+        {% for d in e.documents %}
+            {% set suppEvaluations = suppEvaluations|merge([
+                {'relatedEntityClass': 'Chill\\PersonBundle\\Entity\\AccompanyingPeriod\\AccompanyingPeriodWorkEvaluationDocument', 'relatedEntityId': d.id }
+            ]) %}
+        {% endfor %}
+    {% endfor %}
+    {{ chill_entity_workflow_list('Chill\\PersonBundle\\Entity\\AccompanyingPeriod\\AccompanyingPeriodWork', w.id, [], suppEvaluations) }}
+{% endmacro %}
\ No newline at end of file
diff --git a/src/Bundle/ChillPersonBundle/Resources/views/AccompanyingCourseWork/_objectifs_results_evaluations.html.twig b/src/Bundle/ChillPersonBundle/Resources/views/AccompanyingCourseWork/_objectifs_results_evaluations.html.twig
index ffa5da9ca..aa3838348 100644
--- a/src/Bundle/ChillPersonBundle/Resources/views/AccompanyingCourseWork/_objectifs_results_evaluations.html.twig
+++ b/src/Bundle/ChillPersonBundle/Resources/views/AccompanyingCourseWork/_objectifs_results_evaluations.html.twig
@@ -1,6 +1,9 @@
-
+{#
+#  OPTIONS
+#  - displayContent: [short|long] default: short
+#}
 {% if w.results|length > 0 %}
-    <table class="obj-res-eval my-3">
+    <table class="obj-res-eval">
         <thead>
         <th class="obj"><h4 class="title_label">{{ 'accompanying_course_work.goal'|trans }}</h4></th>
         <th class="res"><h4 class="title_label">{{ 'accompanying_course_work.results'|trans }}</h4></th>
@@ -23,7 +26,7 @@
 {% endif %}
 
 {% if w.goals|length > 0 %}
-    <table class="obj-res-eval my-3">
+    <table class="obj-res-eval">
         <thead>
         <th class="obj"><h4 class="title_label">{{ 'accompanying_course_work.goal'|trans }}</h4></th>
         <th class="res"><h4 class="title_label">{{ 'accompanying_course_work.results'|trans }}</h4></th>
@@ -54,7 +57,7 @@
 {% endif %}
 
 {% if w.accompanyingPeriodWorkEvaluations|length > 0 %}
-    <table class="obj-res-eval my-3">
+    <table class="obj-res-eval">
         <thead>
         <th class="eval">
             <h4 class="title_label">{{ 'accompanying_course_work.evaluations'|trans }}</h4>
@@ -72,28 +75,84 @@
                                     <span class="item-key">{{ 'accompanying_course_work.start_date'|trans ~ ' : ' }}</span>
                                     <b>{{ e.startDate|format_date('short') }}</b>
                                 </li>
+
                                 {% if e.endDate %}
                                     <li>
                                         <span class="item-key">{{ 'accompanying_course_work.end_date'|trans ~ ' : ' }}</span>
                                         <b>{{ e.endDate|format_date('short') }}</b>
                                     </li>
+                                {% else %}
+                                    {% if displayContent is defined and displayContent == 'long' %}
+                                        <li>
+                                            <span class="item-key">{{ 'accompanying_course_work.end_date'|trans ~ ' : ' }}</span>
+                                            <span class="chill-no-data-statement">{{ 'Not given'|trans }}</span>
+                                        </li>
+                                    {% endif %}
                                 {% endif %}
+
                                 {% if e.maxDate %}
                                     <li>
                                         <span class="item-key">{{ 'accompanying_course_work.max_date'|trans ~ ' : ' }}</span>
                                         <b>{{ e.maxDate|format_date('short') }}</b>
                                     </li>
+                                {% else %}
+                                    {% if displayContent is defined and displayContent == 'long' %}
+                                        <li>
+                                            <span class="item-key">{{ 'accompanying_course_work.max_date'|trans ~ ' : ' }}</span>
+                                            <span class="chill-no-data-statement">{{ 'Not given'|trans }}</span>
+                                        </li>
+                                    {% endif %}
                                 {% endif %}
+
                                 {% if e.warningInterval and e.warningInterval.d > 0 %}
                                     <li>
                                         {% set days = (e.warningInterval.d + e.warningInterval.m * 30) %}
                                         <span class="item-key">{{ 'accompanying_course_work.warning_interval'|trans ~ ' : ' }}</span>
                                         {{ 'accompanying_course_work.%days% days before max_date'|trans({'%days%': days }) }}
                                     </li>
+                                {% else %}
+                                    {% if displayContent is defined and displayContent == 'long' %}
+                                        <li>
+                                            <span class="item-key">{{ 'accompanying_course_work.warning_interval'|trans ~ ' : ' }}</span>
+                                            <span class="chill-no-data-statement">{{ 'Not given'|trans }}</span>
+                                        </li>
+                                    {% endif %}
                                 {% endif %}
                             </ul>
                         </li>
                     </ul>
+                    {% if displayContent is defined and displayContent == 'long' %}
+
+                        {% if e.comment is not empty %}
+                            <blockquote class="chill-user-quote">{{ e.comment|chill_entity_render_box }}</blockquote>
+                        {% endif %}
+
+                        {% import "@ChillDocStore/Macro/macro.html.twig" as m %}
+                        {% import "@ChillDocStore/Macro/macro_mimeicon.html.twig" as mm %}
+
+                        <div class="download mb-4 container">
+                            {% if e.documents|length > 0 %}
+
+                                {% for d in e.documents %}
+                                    <div class="row">
+                                        <div class="col text-start">
+                                            {{ d.title }}
+                                        </div>
+                                        <div class="col-md-auto text-center">
+                                            {{ mm.mimeIcon(d.storedObject.type) }}
+                                        </div>
+                                        <div class="col col-lg-4 text-end">
+                                            {{ m.download_button_small(d.storedObject, d.title) }}
+                                        </div>
+                                    </div>
+                                {% endfor %}
+
+                            {% else %}
+                                <span class="chill-no-data-statement">{{ 'No document found'|trans }}</span>
+                            {% endif %}
+                        </div>
+
+                    {% endif %}
                 </td>
             </tr>
         {% endfor %}
diff --git a/src/Bundle/ChillPersonBundle/Resources/views/AccompanyingCourseWork/create.html.twig b/src/Bundle/ChillPersonBundle/Resources/views/AccompanyingCourseWork/create.html.twig
index b09f91cfd..eb358a651 100644
--- a/src/Bundle/ChillPersonBundle/Resources/views/AccompanyingCourseWork/create.html.twig
+++ b/src/Bundle/ChillPersonBundle/Resources/views/AccompanyingCourseWork/create.html.twig
@@ -4,11 +4,11 @@
 
 
 {% block content %}
-<div class="accompanying_course_work-create">
+<div class="accompanying-course-work">
 
-            <h1>{{ block('title') }}</h1>
+    <h1>{{ block('title') }}</h1>
 
-            <div id="accompanying_course_work_create"></div>
+    <div id="accompanying_course_work_create"></div>
 
 </div>
 {% endblock %}
diff --git a/src/Bundle/ChillPersonBundle/Resources/views/AccompanyingCourseWork/delete.html.twig b/src/Bundle/ChillPersonBundle/Resources/views/AccompanyingCourseWork/delete.html.twig
index 37a6812bb..46954323a 100644
--- a/src/Bundle/ChillPersonBundle/Resources/views/AccompanyingCourseWork/delete.html.twig
+++ b/src/Bundle/ChillPersonBundle/Resources/views/AccompanyingCourseWork/delete.html.twig
@@ -6,7 +6,7 @@
 
 {% block content %}
 
-    <div class="accompanying_course_work-list">
+    <div class="accompanying-course-work">
         <h2 class="badge-title">
             <span class="title_label"></span>
             <span class="title_action">{{ work.socialAction|chill_entity_render_string }}</span>
diff --git a/src/Bundle/ChillPersonBundle/Resources/views/AccompanyingCourseWork/edit.html.twig b/src/Bundle/ChillPersonBundle/Resources/views/AccompanyingCourseWork/edit.html.twig
index d5ded06cf..c478abfd4 100644
--- a/src/Bundle/ChillPersonBundle/Resources/views/AccompanyingCourseWork/edit.html.twig
+++ b/src/Bundle/ChillPersonBundle/Resources/views/AccompanyingCourseWork/edit.html.twig
@@ -9,7 +9,7 @@
 {% endblock %}
 
 {% block content %}
-<div class="accompanying_course_work-edit">
+<div class="accompanying-course-work">
     <h1>{{ block('title') }}</h1>
     <div id="accompanying_course_work_edit"></div>
 </div>
diff --git a/src/Bundle/ChillPersonBundle/Resources/views/AccompanyingCourseWork/index.html.twig b/src/Bundle/ChillPersonBundle/Resources/views/AccompanyingCourseWork/index.html.twig
index 3efaa2251..b12466e18 100644
--- a/src/Bundle/ChillPersonBundle/Resources/views/AccompanyingCourseWork/index.html.twig
+++ b/src/Bundle/ChillPersonBundle/Resources/views/AccompanyingCourseWork/index.html.twig
@@ -13,16 +13,20 @@
 {% endblock %}
 
 {% block content %}
-    <div class="accompanying_course_work">
+    <div class="accompanying-course-work">
 
         <h1>{{ block('title') }}</h1>
 
         {% if works|length == 0 %}
             <p class="chill-no-data-statement">{{ 'accompanying_course_work.Any work'|trans }}</p>
         {% else %}
-            <div class="flex-table accompanying_course_work-list">
+            <div class="flex-table">
                 {% for w in works %}
-                    {% include '@ChillPerson/AccompanyingCourseWork/_item.html.twig' with { 'displayAction': true } %}
+                    {% include '@ChillPerson/AccompanyingCourseWork/_item.html.twig' with {
+                        'displayAction': true,
+                        'displayContent': 'short',
+                        'itemBlocClass': ''
+                    } %}
                 {% endfor %}
             </div>
         {% endif %}
diff --git a/src/Bundle/ChillPersonBundle/Resources/views/AccompanyingCourseWork/list_recent_by_accompanying_period.html.twig b/src/Bundle/ChillPersonBundle/Resources/views/AccompanyingCourseWork/list_recent_by_accompanying_period.html.twig
index 4621cb97a..51c9bf926 100644
--- a/src/Bundle/ChillPersonBundle/Resources/views/AccompanyingCourseWork/list_recent_by_accompanying_period.html.twig
+++ b/src/Bundle/ChillPersonBundle/Resources/views/AccompanyingCourseWork/list_recent_by_accompanying_period.html.twig
@@ -1,4 +1,4 @@
-  <div class="accompanying_course_work-list">
+  <div class="accompanying-course-work">
     {% for w in works | slice(0,5) %}
 
     <a href="{{ chill_path_add_return_path('chill_person_accompanying_period_work_edit', { 'id': w.id }) }}"
diff --git a/src/Bundle/ChillPersonBundle/Resources/views/AccompanyingCourseWork/show.html.twig b/src/Bundle/ChillPersonBundle/Resources/views/AccompanyingCourseWork/show.html.twig
new file mode 100644
index 000000000..9e47b61d1
--- /dev/null
+++ b/src/Bundle/ChillPersonBundle/Resources/views/AccompanyingCourseWork/show.html.twig
@@ -0,0 +1,60 @@
+{% extends '@ChillPerson/AccompanyingCourse/layout.html.twig' %}
+
+{% import '@ChillPerson/AccompanyingCourseWork/_macros.html.twig' as macro  %}
+
+{% block title 'accompanying_course_work.Show accompanying course work'|trans %}
+
+{% block css %}
+    {{ parent() }}
+    {{ encore_entry_link_tags('mod_async_upload') }}
+    {{ encore_entry_link_tags('mod_entity_workflow_pick') }}
+{% endblock %}
+
+{% block js %}
+    {{ parent() }}
+    {{ encore_entry_script_tags('mod_async_upload') }}
+    {{ encore_entry_script_tags('mod_entity_workflow_pick') }}
+{% endblock %}
+
+{% block content %}
+    <div class="accompanying-course-work">
+        <h1>{{ block('title') }}</h1>
+    
+        <div class="flex-table mt-4">
+            {% include '@ChillPerson/AccompanyingCourseWork/_item.html.twig' with {
+                'w': work,
+                'displayAction': false,
+                'displayContent': 'long',
+                'itemBlocClass': 'uniq extended',
+            } %}
+            <div class="p-3 mt-3">{{ macro.metadata(work) }}</div>
+        </div>
+    
+        <ul class="record_actions sticky-form-buttons">
+            <li class="cancel">
+                <a href="{{ path('chill_person_accompanying_period_work_list', { 'id': accompanyingCourse.id }) }}"
+                   class="btn btn-cancel">{{ 'Back to the list'|trans }}</a>
+            </li>
+            <li>{{ macro.workflowButton(work) }}</li>
+            {% if is_granted('CHILL_MAIN_ACCOMPANYING_PERIOD_WORK_UPDATE', work) %}
+                <li>
+                    <a class="btn btn-edit"
+                       href="{{ chill_path_add_return_path('chill_person_accompanying_period_work_edit', { 'id': work.id }) }}"
+                    >{{ 'Edit'|trans }}</a>
+                </li>
+            {% endif %}
+            {% if is_granted('CHILL_MAIN_ACCOMPANYING_PERIOD_WORK_DELETE', work) %}
+                <li>
+                    <a class="btn btn-delete"
+                       href="{{ path('chill_person_accompanying_period_work_delete', { 'id': work.id } ) }}"
+                    >{{ 'Delete'|trans }}</a>
+                </li>
+            {% endif %}
+        </ul>
+        
+    </div>
+{% endblock %}
+
+{% block block_post_menu %}
+    <div class="post-menu pt-4"></div>
+{% endblock %}
diff --git a/src/Bundle/ChillPersonBundle/Resources/views/Household/address_edit.html.twig b/src/Bundle/ChillPersonBundle/Resources/views/Household/address_edit.html.twig
index 828f69ef5..35d2d0ddc 100644
--- a/src/Bundle/ChillPersonBundle/Resources/views/Household/address_edit.html.twig
+++ b/src/Bundle/ChillPersonBundle/Resources/views/Household/address_edit.html.twig
@@ -4,17 +4,15 @@
 
 {% block content %}
     <h1>{{ block('title') }}</h1>
-
-    <div>
-        {# include vue_address component #}
-        {% include '@ChillMain/Address/_insert_vue_address.html.twig' with {
-            targetEntity: { name: 'household', id: household.id },
-            backUrl: path('chill_person_household_addresses', { 'household_id': household.id }),
-            openPanesInModal: false,
-            stickyActions: true,
-            useValidFrom: true,
-            useValidTo: true,
-        } %}
-    </div>
+    
+    {# include vue_address component #}
+    {% include '@ChillMain/Address/_insert_vue_address.html.twig' with {
+        targetEntity: { name: 'household', id: household.id },
+        backUrl: path('chill_person_household_addresses', { 'household_id': household.id }),
+        openPanesInModal: false,
+        stickyActions: true,
+        useValidFrom: true,
+        useValidTo: true,
+    } %}
 
 {% endblock %}
diff --git a/src/Bundle/ChillPersonBundle/Resources/views/Household/address_move.html.twig b/src/Bundle/ChillPersonBundle/Resources/views/Household/address_move.html.twig
index b10ef7942..a0844cbec 100644
--- a/src/Bundle/ChillPersonBundle/Resources/views/Household/address_move.html.twig
+++ b/src/Bundle/ChillPersonBundle/Resources/views/Household/address_move.html.twig
@@ -4,18 +4,14 @@
 
 {% block content %}
     <h1>{{ block('title') }}</h1>
-
-    <div>
-        {# include vue_address component #}
-        {% include '@ChillMain/Address/_insert_vue_address.html.twig' with {
-            targetEntity: { name: 'household', id: household.id },
-            backUrl: path('chill_person_household_addresses', { 'household_id': household.id }),
-            openPanesInModal: false,
-            stickyActions: true,
-            useValidFrom: true,
-        } %}
-        {#
-        #}
-    </div>
+    
+    {# include vue_address component #}
+    {% include '@ChillMain/Address/_insert_vue_address.html.twig' with {
+        targetEntity: { name: 'household', id: household.id },
+        backUrl: path('chill_person_household_addresses', { 'household_id': household.id }),
+        openPanesInModal: false,
+        stickyActions: true,
+        useValidFrom: true,
+    } %}
 
 {% endblock %}
diff --git a/src/Bundle/ChillPersonBundle/Resources/views/SocialWork/SocialAction/index.html.twig b/src/Bundle/ChillPersonBundle/Resources/views/SocialWork/SocialAction/index.html.twig
index d159c7193..e78216f04 100644
--- a/src/Bundle/ChillPersonBundle/Resources/views/SocialWork/SocialAction/index.html.twig
+++ b/src/Bundle/ChillPersonBundle/Resources/views/SocialWork/SocialAction/index.html.twig
@@ -3,10 +3,10 @@
 {% block admin_content %}
     {% embed '@ChillMain/CRUD/_index.html.twig' %}
         {% block table_entities_thead_tr %}
-            <th>{{ 'Id'|trans }}</th>
+            <th>{{ 'Id' }}</th>
             <th>{{ 'Title'|trans }}</th>
             <th>{{ 'Social issue'|trans }}</th>
-            <th>{{ 'Ordering'|trans }}</th>
+            <th>{{ 'Order'|trans }}</th>
             <th>{{ 'goal.desactivationDate'|trans }}</th>
             <th>&nbsp;</th>
         {% endblock %}
diff --git a/src/Bundle/ChillPersonBundle/Resources/views/Workflow/_accompanying_period_work.html.twig b/src/Bundle/ChillPersonBundle/Resources/views/Workflow/_accompanying_period_work.html.twig
index 17ecb9072..49cd37180 100644
--- a/src/Bundle/ChillPersonBundle/Resources/views/Workflow/_accompanying_period_work.html.twig
+++ b/src/Bundle/ChillPersonBundle/Resources/views/Workflow/_accompanying_period_work.html.twig
@@ -3,13 +3,6 @@
         {{ 'workflow.SocialAction deleted'|trans }}
     </div>
 {% else %}
-    <div class="flex-table accompanying_course_work-list">
-        {% include '@ChillPerson/AccompanyingCourseWork/_item.html.twig' with {
-            'w': work,
-            'itemBlocClass': 'bg-chill-llight-gray'
-        } %}
-    </div>
-
     {% if display_action is defined and display_action == true %}
         <ul class="record_actions">
             <li>
diff --git a/src/Bundle/ChillPersonBundle/Resources/views/Workflow/_evaluation.html.twig b/src/Bundle/ChillPersonBundle/Resources/views/Workflow/_evaluation.html.twig
index 488f31661..ca95760dd 100644
--- a/src/Bundle/ChillPersonBundle/Resources/views/Workflow/_evaluation.html.twig
+++ b/src/Bundle/ChillPersonBundle/Resources/views/Workflow/_evaluation.html.twig
@@ -1,4 +1,4 @@
-<div class="flex-table accompanying_course_work-list">
+<div class="flex-table accompanying-course-work">
     <div class="item-bloc evaluation-item bg-chill-llight-gray">
         <div class="item-row mb-2">
             <h2 class="badge-title">
diff --git a/src/Bundle/ChillPersonBundle/Resources/views/Workflow/_evaluation_document.html.twig b/src/Bundle/ChillPersonBundle/Resources/views/Workflow/_evaluation_document.html.twig
index 984277297..5ab93896a 100644
--- a/src/Bundle/ChillPersonBundle/Resources/views/Workflow/_evaluation_document.html.twig
+++ b/src/Bundle/ChillPersonBundle/Resources/views/Workflow/_evaluation_document.html.twig
@@ -5,7 +5,7 @@
         {{ 'workflow.doc for evaluation deleted'|trans }}
     </div>
 {% else %}
-    <div class="flex-table accompanying_course_work-list">
+    <div class="flex-table accompanying-course-work">
         <div class="item-bloc evaluation-item bg-chill-llight-gray">
             <div class="item-row mb-2">
                 <h1>{{ doc.title }}</h1>
diff --git a/src/Bundle/ChillPersonBundle/translations/messages.fr.yml b/src/Bundle/ChillPersonBundle/translations/messages.fr.yml
index 65beed811..5178a042c 100644
--- a/src/Bundle/ChillPersonBundle/translations/messages.fr.yml
+++ b/src/Bundle/ChillPersonBundle/translations/messages.fr.yml
@@ -232,6 +232,8 @@ No resources: "Pas d'interlocuteurs privilégiés"
 Persons associated: Personnes concernés
 Referrer: Référent
 Referrers: Agents traitants
+Referrer2: Agent traitant
+No referrer: Pas d'agent traitant
 Some peoples does not belong to any household currently. Add them to an household soon: Certaines personnes n'appartiennent à aucun ménage actuellement. Renseignez leur ménage dès que possible.
 Add to household now: Ajouter à un ménage
 Any resource for this accompanying course: Aucun interlocuteur privilégié pour ce parcours
@@ -886,6 +888,7 @@ accompanying_course_work:
     create: Créer une action
     Create accompanying course work: Créer une action d'accompagnement
     Edit accompanying course work: Modifier une action d'accompagnement
+    Show accompanying course work: Action d'accompagnement
     List accompanying course work: Liste des actions d'accompagnement
     action: Action
     create_date: Date de création
diff --git a/src/Bundle/ChillTaskBundle/Resources/views/SingleTask/List/index_my_tasks.html.twig b/src/Bundle/ChillTaskBundle/Resources/views/SingleTask/List/index_my_tasks.html.twig
index 5d7e88542..359d02ef0 100644
--- a/src/Bundle/ChillTaskBundle/Resources/views/SingleTask/List/index_my_tasks.html.twig
+++ b/src/Bundle/ChillTaskBundle/Resources/views/SingleTask/List/index_my_tasks.html.twig
@@ -1,4 +1,4 @@
-{% extends 'ChillMainBundle::layout.html.twig' %}
+{% extends '@ChillMain/layout.html.twig' %}
 
 {% block title 'My tasks'|trans %}
 
diff --git a/src/Bundle/ChillThirdPartyBundle/Menu/AdminMenuBuilder.php b/src/Bundle/ChillThirdPartyBundle/Menu/AdminMenuBuilder.php
index bc1e6ef08..75b6a0c64 100644
--- a/src/Bundle/ChillThirdPartyBundle/Menu/AdminMenuBuilder.php
+++ b/src/Bundle/ChillThirdPartyBundle/Menu/AdminMenuBuilder.php
@@ -39,7 +39,6 @@ class AdminMenuBuilder implements LocalMenuBuilderInterface
             ->setAttribute('class', 'list-group-item-header')
             ->setExtras([
                 'order' => 3000,
-                'icons' => ['male'],
             ]);
 
         $menu->addChild('Third party category', [
diff --git a/src/Bundle/ChillWopiBundle/src/Service/Wopi/ChillDocumentLockManager.php b/src/Bundle/ChillWopiBundle/src/Service/Wopi/ChillDocumentLockManager.php
index 185256238..fce25de58 100644
--- a/src/Bundle/ChillWopiBundle/src/Service/Wopi/ChillDocumentLockManager.php
+++ b/src/Bundle/ChillWopiBundle/src/Service/Wopi/ChillDocumentLockManager.php
@@ -22,7 +22,7 @@ class ChillDocumentLockManager implements DocumentLockManagerInterface
     private const LOCK_DURATION = 60 * 30;
 
     /**
-     * Number of seconds to keep the lock after the delete lock operation
+     * Number of seconds to keep the lock after the delete lock operation.
      */
     private const LOCK_GRACEFUL_DURATION_TIME = 3;