diff --git a/CRUD/Controller/EntityPersonCRUDController.php b/CRUD/Controller/EntityPersonCRUDController.php
index 54ae006ee..2cdad7f5b 100644
--- a/CRUD/Controller/EntityPersonCRUDController.php
+++ b/CRUD/Controller/EntityPersonCRUDController.php
@@ -40,6 +40,7 @@ class EntityPersonCRUDController extends CRUDController
      * 
      * @param Request $request
      * @throws Symfony\Component\HttpKernel\Exception\NotFoundHttpException if the person with given id is not found
+     * @return Person|null
      */
     protected function getPerson(Request $request): ?Person
     {
diff --git a/Resources/views/CRUD/_edit_content.html.twig b/Resources/views/CRUD/_edit_content.html.twig
new file mode 100644
index 000000000..f3ac9a860
--- /dev/null
+++ b/Resources/views/CRUD/_edit_content.html.twig
@@ -0,0 +1,63 @@
+<div class="{% block crud_content_main_div_class %}grid-10 centered{% endblock %}">
+    {% block crud_content_header %}
+        <h1>{{ ('crud.'~crud_name~'.title_edit')|trans }}</h1>
+    {% endblock crud_content_header %}
+
+    {% block crud_content_form %}
+        {{ form_start(form) }}
+        
+        {% block crud_content_form_rows %}
+        {% for f in form %}
+        {{ form_row(f) }}
+        {% endfor %}
+        {% endblock crud_content_form_rows %}
+
+        {% block crud_content_form_actions %}
+        <ul class="record_actions sticky-form-buttons">
+            {% block content_form_actions_back %}
+                <li class="cancel">
+                    <a class="sc-button bt-cancel" href="{{ chill_return_path_or('chill_crud_'~crud_name~'_index', { 'person_id': person.id }) }}">
+                        {{ 'Cancel'|trans }}
+                    </a>
+                </li>
+            {% endblock %}
+            {% block content_form_actions_before %}{% endblock %}
+            {% block content_form_actions_delete %}
+                {% if chill_crud_action_exists(crud_name, 'delete') %}
+                {% if is_granted(chill_crud_config('role', crud_name, 'delete'), entity) %}
+                <li class="">
+                    <a class="sc-button bt-small bt-delete" href="{{ chill_path_add_return_path('chill_crud_'~crud_name~'_delete', { 'id': entity.id, 'person_id': person.id }) }}"></a>
+                </li>
+                {% endif %}
+                {% endif %}
+            {% endblock content_form_actions_delete %} 
+            {% block content_form_actions_view %}
+                {% if chill_crud_action_exists(crud_name, 'view') %}
+                {% if is_granted(chill_crud_config('role', crud_name, 'view'), entity) %}
+                <li class="">
+                    <a class="sc-button bt-small bt-show" href="{{ chill_path_forward_return_path('chill_crud_'~crud_name~'_view', { 'id': entity.id, 'person_id': person.id }) }}"></a>
+                </li>
+                {% endif %}
+                {% endif %}
+            {% endblock content_form_actions_view %} 
+            {% block content_form_actions_save_and_close %}
+                <li class="">
+                    <button type="submit" name="submit" value="save-and-close" class="sc-button bt-update">
+                        {{ 'crud.edit.save_and_close'|trans }}
+                    </button>
+                </li>
+            {% endblock %}
+            {% block content_form_actions_save_and_show %}
+                <li class="">
+                    <button type="submit" name="submit" value="save-and-show" class="sc-button bt-update">
+                        {{ 'crud.edit.save_and_show'|trans }}
+                    </button>
+                </li>
+            {% endblock %}
+            {% block content_form_actions_after %}{% endblock %}
+        </ul>
+        {% endblock %}
+
+        {{ form_end(form) }}
+    {% endblock %}
+</div>