diff --git a/Resources/views/CRUD/_index.html.twig b/Resources/views/CRUD/_index.html.twig
new file mode 100644
index 000000000..14e10af4e
--- /dev/null
+++ b/Resources/views/CRUD/_index.html.twig
@@ -0,0 +1,11 @@
+{% extends '@ChillMain/CRUD/_index.html.twig' %}
+
+{% block list_actions %}
+    <ul class="record_actions sticky-form-buttons">
+    {% block add_new %}
+        <li>
+            <a href="{{ chill_path_add_return_path('chill_crud_' ~ crud_name ~ '_new', { 'person_id': person.id }) }}" class="sc-button bt-new">{{ ('crud.'~crud_name~'.index.add_new')|trans( {'%crud_name%': crud_name} ) }}</a>
+        </li>
+    {% endblock %}
+    </ul>
+{% endblock list_actions %}
diff --git a/Resources/views/CRUD/_new_content.html.twig b/Resources/views/CRUD/_new_content.html.twig
new file mode 100644
index 000000000..83f35fcc7
--- /dev/null
+++ b/Resources/views/CRUD/_new_content.html.twig
@@ -0,0 +1,30 @@
+{% extends '@ChillMain/CRUD/_new_content.html.twig' %}
+
+{% 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_save_and_close %}
+    <li class="">
+        <button type="submit" name="submit" value="save-and-close" class="sc-button bt-create">
+            {{ 'crud.new.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-create">
+            {{ 'crud.new.save_and_show'|trans }}
+        </button>
+    </li>
+{% endblock %}
+{% block content_form_actions_save_and_new %}
+    <li class="">
+        <button type="submit" name="submit" value="save-and-new" class="sc-button bt-create">
+            {{ 'crud.new.save_and_new'|trans }}
+        </button>
+    </li>
+{% endblock %}
diff --git a/Resources/views/CRUD/_view_content.html.twig b/Resources/views/CRUD/_view_content.html.twig
new file mode 100644
index 000000000..e7076bf55
--- /dev/null
+++ b/Resources/views/CRUD/_view_content.html.twig
@@ -0,0 +1,46 @@
+{% extends '@ChillMain/CRUD/_view_content.html.twig' %}
+
+{% block content_view_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_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-delete" href="{{ chill_path_add_return_path('chill_crud_'~crud_name~'_delete', { 'id': entity.id, 'person_id': person.id }) }}">
+            {{ 'crud.delete.link_to_form'|trans }}
+        </a>
+    </li>
+    {% endif %}
+    {% endif %}
+{% endblock content_form_actions_delete %}
+
+{% block content_view_actions_duplicate_link %}
+    {% if chill_crud_action_exists(crud_name, 'new') %}
+    {% if is_granted(chill_crud_config('role', crud_name, 'new'), entity) %}
+        <li>
+            <a class="sc-button bt-duplicate" href="{{ chill_path_add_return_path('chill_crud_'~crud_name~'_new', { 'duplicate_id': entity.id, 'duplicate': true, 'person_id': person.id }) }}">
+                {{ 'crud.view.link_duplicate'|trans }}
+            </a>
+        </li>
+    {% endif %}
+    {% endif %}
+{% endblock content_view_actions_duplicate_link %}
+
+{% block content_view_actions_edit_link %}
+    {% if chill_crud_action_exists(crud_name, 'edit') %}
+    {% if is_granted(chill_crud_config('role', crud_name, 'edit'), entity) %}
+        <li>
+            <a class="sc-button bt-edit" href="{{ chill_path_forward_return_path('chill_crud_'~crud_name~'_edit', { 'id': entity.id, 'person_id': person.id }) }}">
+                {{ 'crud.new.link_edit'|trans }}
+            </a>
+        </li>
+    {% endif %}
+    {% endif %}
+{% endblock content_view_actions_edit_link %}
diff --git a/Resources/views/CRUD/index.html.twig b/Resources/views/CRUD/index.html.twig
index 994e25e1d..f7e3aa2f2 100644
--- a/Resources/views/CRUD/index.html.twig
+++ b/Resources/views/CRUD/index.html.twig
@@ -5,7 +5,7 @@
 {% block title %}{{ ('crud.' ~ crud_name ~ '.index.title')|trans({'%crud_name%': crud_name}) }}{% endblock %}
 
 {% block personcontent %}
-    {% embed '@ChillMain/CRUD/_index.html.twig' %}
+    {% embed '@ChillPerson/CRUD/_index.html.twig' %}
         {% block add_new %}
             <li>
                 <a href="{{ chill_path_add_return_path('chill_crud_' ~ crud_name ~ '_new', { 'person_id': person.id } ) }}" class="sc-button bt-new">{{ ('crud.'~crud_name~'.index.add_new')|trans( {'%crud_name%': crud_name} ) }}</a>
diff --git a/Resources/views/CRUD/new.html.twig b/Resources/views/CRUD/new.html.twig
index c5ac70128..aae169447 100644
--- a/Resources/views/CRUD/new.html.twig
+++ b/Resources/views/CRUD/new.html.twig
@@ -8,7 +8,7 @@
 {% endblock %}
 
 {% block personcontent %}
-{% embed '@ChillMain/CRUD/_new_content.html.twig' %}
+{% embed '@ChillPerson/CRUD/_new_content.html.twig' %}
     {% block crud_content_header %}
         <h1>{{ ('crud.'~crud_name~'.title_new')|trans({'%person%': person|chill_entity_render_string }) }}</h1>
     {% endblock crud_content_header %}
diff --git a/Resources/views/CRUD/view.html.twig b/Resources/views/CRUD/view.html.twig
index 502999cbb..148b4bc34 100644
--- a/Resources/views/CRUD/view.html.twig
+++ b/Resources/views/CRUD/view.html.twig
@@ -8,7 +8,7 @@
 {% endblock %}
 
 {% block personcontent %}
-{% embed '@ChillMain/CRUD/_view_content.html.twig' %}
+{% embed '@ChillPerson/CRUD/_view_content.html.twig' %}
     {% block crud_content_header %}
         <h1>{{ ('crud.' ~ crud_name ~ '.title_view')|trans({'%person%': person|chill_entity_render_string }) }}</h1>
     {% endblock crud_content_header %}