diff --git a/src/Bundle/ChillDocGeneratorBundle/Controller/AdminDocGeneratorTemplateController.php b/src/Bundle/ChillDocGeneratorBundle/Controller/AdminDocGeneratorTemplateController.php
index c92aff527..296829455 100644
--- a/src/Bundle/ChillDocGeneratorBundle/Controller/AdminDocGeneratorTemplateController.php
+++ b/src/Bundle/ChillDocGeneratorBundle/Controller/AdminDocGeneratorTemplateController.php
@@ -68,7 +68,7 @@ class AdminDocGeneratorTemplateController extends CRUDController
     {
         $this->denyAccessUnlessGranted('ROLE_ADMIN');
 
-        return $this->render('ChillDocGeneratorBundle:Admin/DocGeneratorTemplate:pick-context.html.twig', [
+        return $this->render('@ChillDocGenerator/DocGeneratorTemplate/pick-context.html.twig', [
             'contexts' => $this->contextManager->getContexts(),
         ]);
     }
diff --git a/src/Bundle/ChillDocGeneratorBundle/DependencyInjection/ChillDocGeneratorExtension.php b/src/Bundle/ChillDocGeneratorBundle/DependencyInjection/ChillDocGeneratorExtension.php
index 9712ffac8..b57cbe72b 100644
--- a/src/Bundle/ChillDocGeneratorBundle/DependencyInjection/ChillDocGeneratorExtension.php
+++ b/src/Bundle/ChillDocGeneratorBundle/DependencyInjection/ChillDocGeneratorExtension.php
@@ -56,16 +56,16 @@ class ChillDocGeneratorExtension extends Extension implements PrependExtensionIn
                     'controller' => \Chill\DocGeneratorBundle\Controller\AdminDocGeneratorTemplateController::class,
                     'actions' => [
                         'index' => [
-                            'template' => '@ChillDocGenerator/Admin/DocGeneratorTemplate/index.html.twig',
+                            'template' => '@ChillDocGenerator/DocGeneratorTemplate/index.html.twig',
                             'role' => 'ROLE_ADMIN',
                         ],
                         'new' => [
                             'role' => 'ROLE_ADMIN',
-                            'template' => '@ChillDocGenerator/Admin/DocGeneratorTemplate/new.html.twig',
+                            'template' => '@ChillDocGenerator/DocGeneratorTemplate/new.html.twig',
                         ],
                         'edit' => [
                             'role' => 'ROLE_ADMIN',
-                            'template' => '@ChillDocGenerator/Admin/DocGeneratorTemplate/edit.html.twig',
+                            'template' => '@ChillDocGenerator/DocGeneratorTemplate/edit.html.twig',
                         ],
                     ],
                 ],
diff --git a/src/Bundle/ChillDocGeneratorBundle/Menu/AdminMenuBuilder.php b/src/Bundle/ChillDocGeneratorBundle/Menu/AdminMenuBuilder.php
index d88f0c122..675cd9e90 100644
--- a/src/Bundle/ChillDocGeneratorBundle/Menu/AdminMenuBuilder.php
+++ b/src/Bundle/ChillDocGeneratorBundle/Menu/AdminMenuBuilder.php
@@ -33,19 +33,18 @@ class AdminMenuBuilder implements LocalMenuBuilderInterface
     public function buildMenu($menuId, MenuItem $menu, array $parameters)
     {
         if ($this->security->isGranted('ROLE_ADMIN')) {
-            if (in_array($menuId, ['admin_index', 'admin_section'], true)) {
-                $menu->addChild($this->translator->trans('docgen.Document generation'), [
-                    'route' => 'chill_crud_docgen_template_index',
-                ])->setExtras([
-                    'order' => 350,
-                    'explain' => 'docgen.Manage templates and document generation',
-                ]);
-            }
+
+            $menu->addChild($this->translator->trans('docgen.Document generation'), [
+                'route' => 'chill_crud_docgen_template_index',
+            ])->setExtras([
+                'order' => 4020,
+                'explain' => 'docgen.Manage templates and document generation',
+            ]);
         }
     }
 
     public static function getMenuIds(): array
     {
-        return ['admin_index', 'admin_section', 'docgen_admin'];
+        return ['admin_section', 'admin_docstore'];
     }
 }
diff --git a/src/Bundle/ChillDocGeneratorBundle/Resources/views/Admin/layout.html.twig b/src/Bundle/ChillDocGeneratorBundle/Resources/views/Admin/layout.html.twig
deleted file mode 100644
index 6e7c9387c..000000000
--- a/src/Bundle/ChillDocGeneratorBundle/Resources/views/Admin/layout.html.twig
+++ /dev/null
@@ -1,4 +0,0 @@
-{% extends '@ChillPerson/Admin/layout.html.twig' %}
-
-{% block vertical_menu_content %}
-{% endblock %}
diff --git a/src/Bundle/ChillDocGeneratorBundle/Resources/views/Admin/DocGeneratorTemplate/edit.html.twig b/src/Bundle/ChillDocGeneratorBundle/Resources/views/DocGeneratorTemplate/edit.html.twig
similarity index 88%
rename from src/Bundle/ChillDocGeneratorBundle/Resources/views/Admin/DocGeneratorTemplate/edit.html.twig
rename to src/Bundle/ChillDocGeneratorBundle/Resources/views/DocGeneratorTemplate/edit.html.twig
index 93b08f688..0b88e2672 100644
--- a/src/Bundle/ChillDocGeneratorBundle/Resources/views/Admin/DocGeneratorTemplate/edit.html.twig
+++ b/src/Bundle/ChillDocGeneratorBundle/Resources/views/DocGeneratorTemplate/edit.html.twig
@@ -1,8 +1,8 @@
-{% extends '@ChillDocGenerator/Admin/layout.html.twig' %}
+{% extends '@ChillMain/CRUD/Admin/index.html.twig' %}
 
 {% block title 'docgen.Edit template'|trans %}
 
-{% block layout_wvm_content %}
+{% block admin_content %}
     {% embed '@ChillMain/CRUD/_edit_content.html.twig' %}
 
         {% block crud_content_header %}
diff --git a/src/Bundle/ChillDocGeneratorBundle/Resources/views/Admin/DocGeneratorTemplate/index.html.twig b/src/Bundle/ChillDocGeneratorBundle/Resources/views/DocGeneratorTemplate/index.html.twig
similarity index 85%
rename from src/Bundle/ChillDocGeneratorBundle/Resources/views/Admin/DocGeneratorTemplate/index.html.twig
rename to src/Bundle/ChillDocGeneratorBundle/Resources/views/DocGeneratorTemplate/index.html.twig
index 436f816c2..73527edb3 100644
--- a/src/Bundle/ChillDocGeneratorBundle/Resources/views/Admin/DocGeneratorTemplate/index.html.twig
+++ b/src/Bundle/ChillDocGeneratorBundle/Resources/views/DocGeneratorTemplate/index.html.twig
@@ -1,6 +1,6 @@
-{% extends '@ChillDocGenerator/Admin/layout.html.twig' %}
+{% extends '@ChillMain/CRUD/Admin/index.html.twig' %}
 
-{% block layout_wvm_content %}
+{% block admin_content %}
     {% embed '@ChillMain/CRUD/_index.html.twig' %}
         {% block table_entities_thead_tr %}
             <th></th>
@@ -34,5 +34,11 @@
                 </tr>
             {% endfor %}
         {% endblock %}
+
+        {% block actions_before %}
+            <li class='cancel'>
+                <a href="{{ path('chill_main_admin_central') }}" class="btn btn-cancel">{{'Back to the admin'|trans}}</a>
+            </li>
+        {% endblock %}
     {% endembed %}
 {% endblock %}
diff --git a/src/Bundle/ChillDocGeneratorBundle/Resources/views/Admin/DocGeneratorTemplate/new.html.twig b/src/Bundle/ChillDocGeneratorBundle/Resources/views/DocGeneratorTemplate/new.html.twig
similarity index 87%
rename from src/Bundle/ChillDocGeneratorBundle/Resources/views/Admin/DocGeneratorTemplate/new.html.twig
rename to src/Bundle/ChillDocGeneratorBundle/Resources/views/DocGeneratorTemplate/new.html.twig
index fe4991ffa..459b5ee0f 100644
--- a/src/Bundle/ChillDocGeneratorBundle/Resources/views/Admin/DocGeneratorTemplate/new.html.twig
+++ b/src/Bundle/ChillDocGeneratorBundle/Resources/views/DocGeneratorTemplate/new.html.twig
@@ -1,8 +1,8 @@
-{% extends '@ChillDocGenerator/Admin/layout.html.twig' %}
+{% extends '@ChillMain/CRUD/Admin/index.html.twig' %}
 
 {% block title 'docgen.New template'|trans %}
 
-{% block layout_wvm_content %}
+{% block admin_content %}
     {% embed '@ChillMain/CRUD/_new_content.html.twig' %}
 
         {% block crud_content_header %}
diff --git a/src/Bundle/ChillDocGeneratorBundle/Resources/views/Admin/DocGeneratorTemplate/pick-context.html.twig b/src/Bundle/ChillDocGeneratorBundle/Resources/views/DocGeneratorTemplate/pick-context.html.twig
similarity index 89%
rename from src/Bundle/ChillDocGeneratorBundle/Resources/views/Admin/DocGeneratorTemplate/pick-context.html.twig
rename to src/Bundle/ChillDocGeneratorBundle/Resources/views/DocGeneratorTemplate/pick-context.html.twig
index 5e3ff2049..c2f4a9a95 100644
--- a/src/Bundle/ChillDocGeneratorBundle/Resources/views/Admin/DocGeneratorTemplate/pick-context.html.twig
+++ b/src/Bundle/ChillDocGeneratorBundle/Resources/views/DocGeneratorTemplate/pick-context.html.twig
@@ -1,8 +1,8 @@
-{% extends '@ChillDocGenerator/Admin/layout.html.twig' %}
+{% extends '@ChillMain/CRUD/Admin/index.html.twig' %}
 
 {% block title 'docgen.Pick template context'|trans %}
 
-{% block layout_wvm_content %}
+{% block admin_content %}
 <div class="col-md-10 col-xxl">
 
     <h1>{{ block('title') }}</h1>
diff --git a/src/Bundle/ChillDocGeneratorBundle/translations/messages.fr.yml b/src/Bundle/ChillDocGeneratorBundle/translations/messages.fr.yml
index a06852b8a..b60a7d60e 100644
--- a/src/Bundle/ChillDocGeneratorBundle/translations/messages.fr.yml
+++ b/src/Bundle/ChillDocGeneratorBundle/translations/messages.fr.yml
@@ -8,7 +8,7 @@ docgen:
     New template: Nouveau modèle
     Edit template: Modifier modèle
     test generate: Tester la génération
-    With context: 'Avec le contexte :'
+    With context %name%: 'Avec le contexte "%name%"'
 
 
 crud: