diff --git a/src/Bundle/ChillPersonBundle/Resources/views/AccompanyingCourseWork/_item.html.twig b/src/Bundle/ChillPersonBundle/Resources/views/AccompanyingCourseWork/_item.html.twig
index 4c056eec5..78a08f845 100644
--- a/src/Bundle/ChillPersonBundle/Resources/views/AccompanyingCourseWork/_item.html.twig
+++ b/src/Bundle/ChillPersonBundle/Resources/views/AccompanyingCourseWork/_item.html.twig
@@ -115,7 +115,8 @@
         <div
             class="item-row column{% if displayFontSmall is defined and displayFontSmall == true %} smallfont{% endif %}">
             {% include '@ChillPerson/AccompanyingCourseWork/_objectifs_results_evaluations.html.twig' with {
-                'displayContent': displayContent
+                'displayContent': displayContent,
+                'onlyone': false
             } %}
         </div>
     {% endif %}
@@ -195,7 +196,8 @@
         <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
+                'displayContent': displayContent,
+                'onlyone' : false
             } %}
         </div>
     </div>
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 57305095d..fc2891ca6 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
@@ -3,6 +3,7 @@
 #  - displayContent: [short|long] default: short
 #}
 {% if w.results|length > 0 %}
+
     <table class="obj-res-eval">
         <thead>
         <th class="obj"><h4 class="title_label">{{ 'accompanying_course_work.goal'|trans }}</h4></th>
@@ -64,9 +65,11 @@
         </th>
         </thead>
         <tbody>
-        {% for e in w.accompanyingPeriodWorkEvaluations %}
-            <tr>
-                <td class="eval">
+        {% if onlyone %}
+            {% for e in w.accompanyingPeriodWorkEvaluations %}
+                {% if evalId is defined and evalId == e.id %}
+                    <tr>
+                    <td class="eval">
                     <ul class="eval_title">
                         <li>
                             {{ e.evaluation.title|localize_translatable_string }}
@@ -78,13 +81,15 @@
 
                                 {% if e.endDate %}
                                     <li>
-                                        <span class="item-key">{{ 'accompanying_course_work.end_date'|trans ~ ' : ' }}</span>
+                                        <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="item-key">{{ 'accompanying_course_work.end_date'|trans ~ ' : ' }}</span>
                                             <span class="chill-no-data-statement">{{ 'Not given'|trans }}</span>
                                         </li>
                                     {% endif %}
@@ -92,13 +97,15 @@
 
                                 {% if e.maxDate %}
                                     <li>
-                                        <span class="item-key">{{ 'accompanying_course_work.max_date'|trans ~ ' : ' }}</span>
+                                        <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="item-key">{{ 'accompanying_course_work.max_date'|trans ~ ' : ' }}</span>
                                             <span class="chill-no-data-statement">{{ 'Not given'|trans }}</span>
                                         </li>
                                     {% endif %}
@@ -107,13 +114,15 @@
                                 {% 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>
+                                        <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="item-key">{{ 'accompanying_course_work.warning_interval'|trans ~ ' : ' }}</span>
                                             <span class="chill-no-data-statement">{{ 'Not given'|trans }}</span>
                                         </li>
                                     {% endif %}
@@ -122,55 +131,145 @@
                                 {% if e.timeSpent is not null and e.timeSpent > 0 %}
                                     <li>
                                         {% set minutes = (e.timeSpent / 60) %}
-                                        <span class="item-key">{{ 'accompanying_course_work.timeSpent'|trans ~ ' : ' }}</span> {{ 'duration.minute'|trans({ '{m}' : minutes }) }}
+                                        <span
+                                            class="item-key">{{ 'accompanying_course_work.timeSpent'|trans ~ ' : ' }}</span> {{ 'duration.minute'|trans({ '{m}' : minutes }) }}
                                     </li>
                                 {% elseif displayContent is defined and displayContent == 'long' %}
                                     <li>
-                                        <span class="item-key">{{ 'accompanying_course_work.timeSpent'|trans ~ ' : ' }}</span>
+                                        <span
+                                            class="item-key">{{ 'accompanying_course_work.timeSpent'|trans ~ ' : ' }}</span>
                                         <span class="chill-no-data-statement">{{ 'Not given'|trans }}</span>
                                     </li>
                                 {% endif %}
                             </ul>
                         </li>
                     </ul>
-                    {% if recordAction is defined %}
-                        {{ recordAction }}
-                    {% endif %}
+                {% endif %}
 
-                    {% 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>
+            {% endfor %}
+            {% if recordAction is defined %}
+                {{ recordAction }}
+            {% endif %}
+        {% else %}
+            {% for e in w.accompanyingPeriodWorkEvaluations %}
+                <tr>
+                    <td class="eval">
+                        <ul class="eval_title">
+                            <li>
+                                {{ e.evaluation.title|localize_translatable_string }}
+                                <ul class="columns">
+                                    <li>
+                                        <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 %}
+
+                                    {% if e.timeSpent is not null and e.timeSpent > 0 %}
+                                        <li>
+                                            {% set minutes = (e.timeSpent / 60) %}
+                                            <span
+                                                class="item-key">{{ 'accompanying_course_work.timeSpent'|trans ~ ' : ' }}</span> {{ 'duration.minute'|trans({ '{m}' : minutes }) }}
+                                        </li>
+                                    {% elseif displayContent is defined and displayContent == 'long' %}
+                                        <li>
+                                            <span
+                                                class="item-key">{{ 'accompanying_course_work.timeSpent'|trans ~ ' : ' }}</span>
+                                            <span class="chill-no-data-statement">{{ 'Not given'|trans }}</span>
+                                        </li>
+                                    {% endif %}
+                                </ul>
+                            </li>
+                        </ul>
+                        {% if recordAction is defined %}
+                            {{ recordAction }}
                         {% endif %}
 
-                        {% import "@ChillDocStore/Macro/macro.html.twig" as m %}
-                        {% import "@ChillDocStore/Macro/macro_mimeicon.html.twig" as mm %}
-                        {% if e.documents|length > 0 %}
-                            <table class="table table-hover align-middle mt-4 mx-auto">
-                                {% for d in e.documents %}
-                                    <tr>
-                                        <td class="border-0">{{ d.title }}</td>
-                                        <td class="border-0">{{ mm.mimeIcon(d.storedObject.type) }}</td>
-                                        <td class="border-0 text-end">
-                                            <a class="btn btn-notify btn-sm"
-                                               title="{{ 'notification.Notify'|trans }}"
-                                               href="{{ chill_path_add_return_path('chill_main_notification_create', {
-                                                   'entityClass': 'Chill\\PersonBundle\\Entity\\AccompanyingPeriod\\AccompanyingPeriodWorkEvaluationDocument', 'entityId': d.id
-                                               }) }}"></a>
-                                            {{ d.storedObject|chill_document_button_group(d.title, is_granted('CHILL_MAIN_ACCOMPANYING_PERIOD_WORK_UPDATE', w), {'small': true}) }}
-                                        </td>
-                                    </tr>
-                                {% endfor %}
-                            </table>
-                        {% else %}
-                            <span class="chill-no-data-statement">{{ 'No document found'|trans }}</span>
+                        {% 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 %}
+                            {% if e.documents|length > 0 %}
+                                <table class="table table-hover align-middle mt-4 mx-auto">
+                                    {% for d in e.documents %}
+                                        <tr>
+                                            <td class="border-0">{{ d.title }}</td>
+                                            <td class="border-0">{{ mm.mimeIcon(d.storedObject.type) }}</td>
+                                            <td class="border-0 text-end">
+                                                <a class="btn btn-notify btn-sm"
+                                                   title="{{ 'notification.Notify'|trans }}"
+                                                   href="{{ chill_path_add_return_path('chill_main_notification_create', {
+                                                       'entityClass': 'Chill\\PersonBundle\\Entity\\AccompanyingPeriod\\AccompanyingPeriodWorkEvaluationDocument', 'entityId': d.id
+                                                   }) }}"></a>
+                                                {{ d.storedObject|chill_document_button_group(d.title, is_granted('CHILL_MAIN_ACCOMPANYING_PERIOD_WORK_UPDATE', w), {'small': true}) }}
+                                            </td>
+                                        </tr>
+                                    {% endfor %}
+                                </table>
+                            {% else %}
+                                <span class="chill-no-data-statement">{{ 'No document found'|trans }}</span>
+                            {% endif %}
+
+
                         {% endif %}
-
-
-                    {% endif %}
-                </td>
-            </tr>
-        {% endfor %}
+                    </td>
+                </tr>
+            {% endfor %}
+        {% endif %}
         </tbody>
     </table>
 {% endif %}
diff --git a/src/Bundle/ChillPersonBundle/Resources/views/AccompanyingCourseWork/showEvaluationDocumentInNotification.html.twig b/src/Bundle/ChillPersonBundle/Resources/views/AccompanyingCourseWork/showEvaluationDocumentInNotification.html.twig
index 4ea70d9f0..b4df52254 100644
--- a/src/Bundle/ChillPersonBundle/Resources/views/AccompanyingCourseWork/showEvaluationDocumentInNotification.html.twig
+++ b/src/Bundle/ChillPersonBundle/Resources/views/AccompanyingCourseWork/showEvaluationDocumentInNotification.html.twig
@@ -23,7 +23,9 @@
                     'w': document.accompanyingPeriodWorkEvaluation.accompanyingPeriodWork,
                     'd': document.storedObject,
                     'displayContent': 'short',
-                    'recordAction': _self.recordAction(document)
+                    'recordAction': _self.recordAction(document),
+                    'onlyone' : true,
+                    'evalId': document.accompanyingPeriodWorkEvaluation.id
                 } %}
             </div>