diff --git a/src/Bundle/ChillPersonBundle/Resources/views/PersonResource/list.html.twig b/src/Bundle/ChillPersonBundle/Resources/views/PersonResource/list.html.twig
index 922c369e7..62b9701ec 100644
--- a/src/Bundle/ChillPersonBundle/Resources/views/PersonResource/list.html.twig
+++ b/src/Bundle/ChillPersonBundle/Resources/views/PersonResource/list.html.twig
@@ -26,20 +26,25 @@
                     <div class="item-col" style="width: 50%">
                     {% if resource.person is not null %}
                         <div class="denomination h3">
-                            <span class="name">{{ resource.person }}</span>
-                            <span class="badge rounded-pill bg-person">{{ 'person'|trans|capitalize }}</span>
+                            <span>
+                                {% include '@ChillMain/OnTheFly/_insert_vue_onthefly.html.twig' with {
+                                    action: 'show', displayBadge: true,
+                                    targetEntity: { name: 'person', id: resource.person.id },
+                                    buttonText: resource.person|chill_entity_render_string,
+                                    isDead: resource.person.deathdate is not null
+                                } %}
+                            </span>
                         </div>
                     {% elseif resource.thirdparty is not null %}
                         <div class="denomination h3">
-                            <span class="name">{{ resource.thirdparty }}</span>
-                                <span class="badge rounded-pill bg-thirdparty">
-                            {% if resource.thirdparty.parent is not null %}
-                                {{ 'Contact person'|trans|capitalize }}
-                            {% else %}
-                                {{ 'thirdparty'|trans|capitalize }}
-                            {% endif %}
-                                    <i class="fa fa-fw fa-user-md"></i>
-                                </span>
+                            <span>
+                                {% include '@ChillMain/OnTheFly/_insert_vue_onthefly.html.twig' with {
+                                    action: 'show', displayBadge: true,
+                                    targetEntity: { name: 'thirdparty', id: resource.thirdparty.id },
+                                    buttonText: resource.thirdParty|chill_entity_render_string,
+                                    parent: resource.thirdparty.parent
+                                } %}
+                            </span>
                         </div>
                     {% else %}
                         <div class="denomination h3">
@@ -76,25 +81,6 @@
                                         class="btn btn-sm btn-delete"
                                         title="{{ 'Delete'|trans }}"></a>
                                 </li>
-                                <li>
-                                    {% if resource.person is not null %}
-                                        <span class="wl-item">
-                                            {% include '@ChillMain/OnTheFly/_insert_vue_onthefly.html.twig' with {
-                                                action: 'show', displayBadge: false,
-                                                targetEntity: { name: 'person', id: resource.person.id },
-                                            } %}
-                                        </span>
-                                    {% endif %}
-                                    {% if resource.thirdparty is not null %}
-                                        <span class="wl-item">
-                                            {% include '@ChillMain/OnTheFly/_insert_vue_onthefly.html.twig' with {
-                                                action: 'show', displayBadge: false,
-                                                targetEntity: { name: 'thirdparty', id: resource.thirdparty.id },
-                                                parent: resource.thirdparty.parent
-                                            } %}
-                                        </span>
-                                    {% endif %}
-                                </li>
                             </ul>
                         </div>
                     </div>