diff --git a/src/Bundle/ChillMainBundle/Resources/views/Workflow/delete.html.twig b/src/Bundle/ChillMainBundle/Resources/views/Workflow/delete.html.twig
index 64da4ea76..d11165fc6 100644
--- a/src/Bundle/ChillMainBundle/Resources/views/Workflow/delete.html.twig
+++ b/src/Bundle/ChillMainBundle/Resources/views/Workflow/delete.html.twig
@@ -3,6 +3,7 @@
 {% block title 'workflow.Delete workflow ?'|trans %}
 
 {% block display_content %}
+<div class="col-10 workflow">
     <h2>
         {{  handler.entityTitle(entityWorkflow) }}
     </h2>
@@ -10,6 +11,7 @@
     {% include handler.template(entityWorkflow) with handler.templateData(entityWorkflow)|merge({
         'display_action': false
     }) %}
+
 {% endblock %}
 
 {% block content %}
@@ -25,5 +27,5 @@
                 'form'              : delete_form
             } ) }}
     </div>
-
+</div>
 {% endblock %}
diff --git a/src/Bundle/ChillPersonBundle/Resources/views/AccompanyingCourse/_join_household.html.twig b/src/Bundle/ChillPersonBundle/Resources/views/AccompanyingCourse/_join_household.html.twig
index fda36da85..888ab8d43 100644
--- a/src/Bundle/ChillPersonBundle/Resources/views/AccompanyingCourse/_join_household.html.twig
+++ b/src/Bundle/ChillPersonBundle/Resources/views/AccompanyingCourse/_join_household.html.twig
@@ -1,16 +1,19 @@
 <div class="alert alert-warning alert-with-actions">
-    <div class="float-button bottom"><div class="box">
-        <div class="action">
-            <ul class="record_actions">
-                <li>
-                    <a class="btn btn-sm btn-update change-icon"
-                       href="{{ path('chill_person_accompanying_course_edit', { 'accompanying_period_id': accompanyingCourse.id, '_fragment': 'section-10' }) }}">
-                        <i class="fa fa-fw fa-crosshairs"></i>
-                        {{ 'fix it'|trans }}
-                    </a>
-                </li>
-            </ul>
+    <div class="float-button bottom">
+        <div class="box">
+
+            <div class="action">
+                <ul class="record_actions">
+                    <li>
+                        <a class="btn btn-sm btn-update change-icon"
+                        href="{{ path('chill_person_accompanying_course_edit', { 'accompanying_period_id': accompanyingCourse.id, '_fragment': 'section-10' }) }}">
+                            <i class="fa fa-fw fa-crosshairs"></i>
+                            {{ 'fix it'|trans }}
+                        </a>
+                    </li>
+                </ul>
+            </div>
+            <p>{{ 'Some peoples does not belong to any household currently. Add them to an household soon'|trans }}</p>
         </div>
-        {{ 'Some peoples does not belong to any household currently. Add them to an household soon'|trans }}
-    </div></div>
+    </div>
 </div>
diff --git a/src/Bundle/ChillPersonBundle/Resources/views/AccompanyingCourse/index.html.twig b/src/Bundle/ChillPersonBundle/Resources/views/AccompanyingCourse/index.html.twig
index 0a021997d..7a4f18b1d 100644
--- a/src/Bundle/ChillPersonBundle/Resources/views/AccompanyingCourse/index.html.twig
+++ b/src/Bundle/ChillPersonBundle/Resources/views/AccompanyingCourse/index.html.twig
@@ -184,25 +184,27 @@
                 </div>
             </div>
         {% endif %}
-        
-        <div class="mbloc col col-sm-6 col-lg-4">
-            <div class="notification-counter">
-                <h4 class="item-key">{{ 'notification.Notifications'|trans }}</h4>
-                {% set notif_counter = chill_count_notifications('Chill\\PersonBundle\\Entity\\AccompanyingPeriod', accompanyingCourse.id) %}
-                {% if notif_counter.total > 0 %}
-                    <div class="my-2">
-                        <a href="#notification-list">
-                            {{ chill_counter_notifications('Chill\\PersonBundle\\Entity\\AccompanyingPeriod', accompanyingCourse.id) }}
+
+        {% if accompanyingCourse.step != 'DRAFT' %}
+            <div class="mbloc col col-sm-6 col-lg-4">
+                <div class="notification-counter">
+                    <h4 class="item-key">{{ 'notification.Notifications'|trans }}</h4>
+                    {% set notif_counter = chill_count_notifications('Chill\\PersonBundle\\Entity\\AccompanyingPeriod', accompanyingCourse.id) %}
+                    {% if notif_counter.total > 0 %}
+                        <div class="my-2">
+                            <a href="#notification-list">
+                                {{ chill_counter_notifications('Chill\\PersonBundle\\Entity\\AccompanyingPeriod', accompanyingCourse.id) }}
+                            </a>
+                        </div>
+                    {% endif %}
+                    <div class="d-grid gap-2">
+                        <a class="btn btn-notify" href="{{ chill_path_add_return_path('chill_main_notification_create', {'entityClass': 'Chill\\PersonBundle\\Entity\\AccompanyingPeriod', 'entityId': accompanyingCourse.id}) }}">
+                            {{ 'notification.Notify'|trans }}
                         </a>
                     </div>
-                {% endif %}
-                <div class="d-grid gap-2">
-                    <a class="btn btn-notify" href="{{ chill_path_add_return_path('chill_main_notification_create', {'entityClass': 'Chill\\PersonBundle\\Entity\\AccompanyingPeriod', 'entityId': accompanyingCourse.id}) }}">
-                        {{ 'notification.Notify'|trans }}
-                    </a>
                 </div>
             </div>
-        </div>
+        {% endif %}
     </div>
 
     <div class="social-actions my-4">
@@ -228,7 +230,7 @@
         {% include 'ChillActivityBundle:Activity:list_recent.html.twig' with { 'context': 'accompanyingCourse', 'no_action': true } %}
     </div>
     {% endblock %}
-    
+
     <div class="notification notification-list">
         {% set notifications = chill_list_notifications('Chill\\PersonBundle\\Entity\\AccompanyingPeriod', accompanyingCourse.id) %}
         {% if notifications is not empty %}
diff --git a/src/Bundle/ChillPersonBundle/Resources/views/AccompanyingCourseWork/_item.html.twig b/src/Bundle/ChillPersonBundle/Resources/views/AccompanyingCourseWork/_item.html.twig
index 6287b158d..8ff8a0617 100644
--- a/src/Bundle/ChillPersonBundle/Resources/views/AccompanyingCourseWork/_item.html.twig
+++ b/src/Bundle/ChillPersonBundle/Resources/views/AccompanyingCourseWork/_item.html.twig
@@ -128,11 +128,13 @@
                     'Chill\\PersonBundle\\Entity\\AccompanyingPeriod\\AccompanyingPeriodWork',
                     w.id, [], suppEvaluations) }}
             </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>
-            </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 }}"
diff --git a/src/Bundle/ChillPersonBundle/Resources/views/AccompanyingCourseWork/index.html.twig b/src/Bundle/ChillPersonBundle/Resources/views/AccompanyingCourseWork/index.html.twig
index 99380921c..6956a1497 100644
--- a/src/Bundle/ChillPersonBundle/Resources/views/AccompanyingCourseWork/index.html.twig
+++ b/src/Bundle/ChillPersonBundle/Resources/views/AccompanyingCourseWork/index.html.twig
@@ -18,13 +18,7 @@
         <h1>{{ block('title') }}</h1>
 
         {% if works|length == 0 %}
-            <p class="chill-no-data-statement">{{ 'accompanying_course_work.Any work'|trans }}
-                <a class="btn btn-sm btn-create"
-                    title="{{ 'accompanying_course_work.create'|trans }}"
-                    href="{{ chill_path_add_return_path('chill_person_accompanying_period_work_new', { 'id': accompanyingCourse.id }) }}"
-                ></a>
-            </p>
-
+            <p class="chill-no-data-statement">{{ 'accompanying_course_work.Any work'|trans }}</p>
         {% else %}
             <div class="flex-table accompanying_course_work-list">
                 {% for w in works %}
@@ -35,6 +29,7 @@
 
         {{ chill_pagination(paginator) }}
 
+        {% if is_granted('CHILL_MAIN_ACCOMPANYING_PERIOD_WORK_CREATE') %}
         <ul class="record_actions sticky-form-buttons">
             <li>
                 <a href="{{ chill_path_add_return_path('chill_person_accompanying_period_work_new', { 'id': accompanyingCourse.id }) }}"
@@ -43,6 +38,7 @@
                 </a>
             </li>
         </ul>
+        {% endif %}
 
     </div>
 {% endblock %}