diff --git a/.idea/modules.xml b/.idea/modules.xml
deleted file mode 100644
index f727e09..0000000
--- a/.idea/modules.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project version="4">
-  <component name="ProjectModuleManager">
-    <modules>
-      <module fileurl="file://$PROJECT_DIR$/.idea/page-bundle.iml" filepath="$PROJECT_DIR$/.idea/page-bundle.iml" />
-    </modules>
-  </component>
-</project>
\ No newline at end of file
diff --git a/.idea/page-bundle.iml b/.idea/page-bundle.iml
deleted file mode 100644
index c956989..0000000
--- a/.idea/page-bundle.iml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<module type="WEB_MODULE" version="4">
-  <component name="NewModuleRootManager">
-    <content url="file://$MODULE_DIR$" />
-    <orderEntry type="inheritedJdk" />
-    <orderEntry type="sourceFolder" forTests="false" />
-  </component>
-</module>
\ No newline at end of file
diff --git a/.idea/php.xml b/.idea/php.xml
deleted file mode 100644
index a71204a..0000000
--- a/.idea/php.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project version="4">
-  <component name="PhpIncludePathManager">
-    <include_path>
-      <path value="/Applications/MAMP/bin/php/php7.2.8/lib/php" />
-    </include_path>
-  </component>
-  <component name="PhpProjectSharedConfiguration" php_language_level="7.1">
-    <option name="suggestChangeDefaultLanguageLevel" value="false" />
-  </component>
-</project>
\ No newline at end of file
diff --git a/.idea/vcs.xml b/.idea/vcs.xml
deleted file mode 100644
index 94a25f7..0000000
--- a/.idea/vcs.xml
+++ /dev/null
@@ -1,6 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project version="4">
-  <component name="VcsDirectoryMappings">
-    <mapping directory="$PROJECT_DIR$" vcs="Git" />
-  </component>
-</project>
\ No newline at end of file
diff --git a/.idea/workspace.xml b/.idea/workspace.xml
deleted file mode 100644
index 655e5e9..0000000
--- a/.idea/workspace.xml
+++ /dev/null
@@ -1,187 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project version="4">
-  <component name="BranchesTreeState">
-    <expand>
-      <path>
-        <item name="ROOT" type="e8cecc67:BranchNodeDescriptor" />
-        <item name="LOCAL_ROOT" type="e8cecc67:BranchNodeDescriptor" />
-      </path>
-      <path>
-        <item name="ROOT" type="e8cecc67:BranchNodeDescriptor" />
-        <item name="LOCAL_ROOT" type="e8cecc67:BranchNodeDescriptor" />
-        <item name="GROUP_NODE:feature" type="e8cecc67:BranchNodeDescriptor" />
-      </path>
-      <path>
-        <item name="ROOT" type="e8cecc67:BranchNodeDescriptor" />
-        <item name="REMOTE_ROOT" type="e8cecc67:BranchNodeDescriptor" />
-      </path>
-      <path>
-        <item name="ROOT" type="e8cecc67:BranchNodeDescriptor" />
-        <item name="REMOTE_ROOT" type="e8cecc67:BranchNodeDescriptor" />
-        <item name="GROUP_NODE:origin" type="e8cecc67:BranchNodeDescriptor" />
-      </path>
-      <path>
-        <item name="ROOT" type="e8cecc67:BranchNodeDescriptor" />
-        <item name="REMOTE_ROOT" type="e8cecc67:BranchNodeDescriptor" />
-        <item name="GROUP_NODE:origin" type="e8cecc67:BranchNodeDescriptor" />
-        <item name="GROUP_NODE:feature" type="e8cecc67:BranchNodeDescriptor" />
-      </path>
-    </expand>
-    <select />
-  </component>
-  <component name="ChangeListManager">
-    <list default="true" id="700a666a-ec40-48e7-853d-bd277e40917f" name="Default Changelist" comment="replace orm cascade remove by database on delete cascade for page fields relation">
-      <change afterPath="$PROJECT_DIR$/.gitignore" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" />
-    </list>
-    <option name="SHOW_DIALOG" value="false" />
-    <option name="HIGHLIGHT_CONFLICTS" value="true" />
-    <option name="HIGHLIGHT_NON_ACTIVE_CHANGELIST" value="false" />
-    <option name="LAST_RESOLUTION" value="IGNORE" />
-  </component>
-  <component name="ComposerSettings" doNotAsk="true">
-    <pharConfigPath>$PROJECT_DIR$/../../../movies-rest/composer.json</pharConfigPath>
-    <execution />
-  </component>
-  <component name="FileTemplateManagerImpl">
-    <option name="RECENT_TEMPLATES">
-      <list>
-        <option value="Sf Controller" />
-      </list>
-    </option>
-  </component>
-  <component name="Git.Settings">
-    <option name="RECENT_BRANCH_BY_REPOSITORY">
-      <map>
-        <entry key="$PROJECT_DIR$" value="master" />
-      </map>
-    </option>
-    <option name="RECENT_GIT_ROOT_PATH" value="$PROJECT_DIR$" />
-  </component>
-  <component name="GitToolBoxStore">
-    <option name="recentBranches">
-      <RecentBranches>
-        <option name="branchesForRepo">
-          <list>
-            <RecentBranchesForRepo>
-              <option name="branches">
-                <list>
-                  <RecentBranch>
-                    <option name="branchName" value="develop" />
-                    <option name="lastUsedInstant" value="1631626357" />
-                  </RecentBranch>
-                  <RecentBranch>
-                    <option name="branchName" value="master" />
-                    <option name="lastUsedInstant" value="1631626356" />
-                  </RecentBranch>
-                </list>
-              </option>
-              <option name="repositoryRootUrl" value="file://$PROJECT_DIR$" />
-            </RecentBranchesForRepo>
-          </list>
-        </option>
-      </RecentBranches>
-    </option>
-  </component>
-  <component name="JsFlowSettings">
-    <service-enabled>false</service-enabled>
-    <exe-path />
-    <annotation-enable>false</annotation-enable>
-    <other-services-enabled>false</other-services-enabled>
-  </component>
-  <component name="PhpWorkspaceProjectConfiguration" interpreter_name="PHP">
-    <include_path>
-      <path value="/Applications/MAMP/bin/php/php7.2.8/lib/php" />
-    </include_path>
-  </component>
-  <component name="ProjectId" id="1azbRrQy42nyNzIO1ma2YURmHtn" />
-  <component name="ProjectLevelVcsManager" settingsEditedManually="true" />
-  <component name="ProjectViewState">
-    <option name="hideEmptyMiddlePackages" value="true" />
-    <option name="showLibraryContents" value="true" />
-  </component>
-  <component name="PropertiesComponent">
-    <property name="RunOnceActivity.OpenProjectViewOnStart" value="true" />
-    <property name="RunOnceActivity.ShowReadmeOnStart" value="true" />
-    <property name="WebServerToolWindowFactoryState" value="false" />
-    <property name="last_opened_file_path" value="$PROJECT_DIR$" />
-    <property name="node.js.detected.package.eslint" value="true" />
-    <property name="node.js.detected.package.tslint" value="true" />
-    <property name="node.js.path.for.package.eslint" value="project" />
-    <property name="node.js.path.for.package.tslint" value="project" />
-    <property name="node.js.selected.package.eslint" value="(autodetect)" />
-    <property name="node.js.selected.package.tslint" value="(autodetect)" />
-    <property name="nodejs_interpreter_path" value="/usr/local/bin/node" />
-    <property name="prettierjs.PrettierConfiguration.Package" value="/usr/local/lib/node_modules/prettier" />
-    <property name="settings.editor.selected.configurable" value="web-ide.project.structure" />
-  </component>
-  <component name="RecentsManager">
-    <key name="MoveFile.RECENT_KEYS">
-      <recent name="$PROJECT_DIR$/Form/BlockInput" />
-      <recent name="$PROJECT_DIR$" />
-      <recent name="$PROJECT_DIR$/Resources" />
-    </key>
-    <key name="CopyFile.RECENT_KEYS">
-      <recent name="$PROJECT_DIR$/Resources/views/page" />
-      <recent name="$PROJECT_DIR$/Form/BlockInput" />
-      <recent name="$PROJECT_DIR$/Form" />
-      <recent name="$PROJECT_DIR$/Migrations" />
-      <recent name="$PROJECT_DIR$/Resources/config/doctrine" />
-    </key>
-  </component>
-  <component name="SpellCheckerSettings" RuntimeDictionaries="0" Folders="0" CustomDictionaries="0" DefaultDictionary="application-level" UseSingleDictionary="true" transferred="true" />
-  <component name="SvnConfiguration">
-    <configuration />
-  </component>
-  <component name="TaskManager">
-    <task active="true" id="Default" summary="Default task">
-      <changelist id="700a666a-ec40-48e7-853d-bd277e40917f" name="Default Changelist" comment="" />
-      <created>1587741363361</created>
-      <option name="number" value="Default" />
-      <option name="presentableId" value="Default" />
-      <updated>1587741363361</updated>
-      <workItem from="1587741365631" duration="28000" />
-      <workItem from="1587741897047" duration="1501000" />
-      <workItem from="1587815194384" duration="4031000" />
-      <workItem from="1587896584188" duration="20818000" />
-      <workItem from="1587982949509" duration="21357000" />
-      <workItem from="1588065875138" duration="15001000" />
-      <workItem from="1588151746622" duration="5182000" />
-      <workItem from="1588171874039" duration="3987000" />
-      <workItem from="1588240615066" duration="133000" />
-      <workItem from="1588253775364" duration="10364000" />
-      <workItem from="1588328808577" duration="5815000" />
-      <workItem from="1601990990641" duration="130000" />
-      <workItem from="1601991137577" duration="370000" />
-      <workItem from="1602577980836" duration="20000" />
-    </task>
-    <task id="LOCAL-00001" summary="replace orm cascade remove by database on delete cascade for page fields relation">
-      <created>1631626399477</created>
-      <option name="number" value="00001" />
-      <option name="presentableId" value="LOCAL-00001" />
-      <option name="project" value="LOCAL" />
-      <updated>1631626399477</updated>
-    </task>
-    <option name="localTasksCounter" value="2" />
-    <servers />
-  </component>
-  <component name="TypeScriptGeneratedFilesManager">
-    <option name="version" value="3" />
-  </component>
-  <component name="Vcs.Log.Tabs.Properties">
-    <option name="TAB_STATES">
-      <map>
-        <entry key="MAIN">
-          <value>
-            <State />
-          </value>
-        </entry>
-      </map>
-    </option>
-    <option name="oldMeFiltersMigrated" value="true" />
-  </component>
-  <component name="VcsManagerConfiguration">
-    <MESSAGE value="replace orm cascade remove by database on delete cascade for page fields relation" />
-    <option name="LAST_COMMIT_MESSAGE" value="replace orm cascade remove by database on delete cascade for page fields relation" />
-  </component>
-</project>
\ No newline at end of file
diff --git a/AropixelPageBundle.php b/AropixelPageBundle.php
index e1cff62..63e0639 100644
--- a/AropixelPageBundle.php
+++ b/AropixelPageBundle.php
@@ -2,7 +2,6 @@
 
 namespace Aropixel\PageBundle;
 
-use Aropixel\AdminBundle\DependencyInjection\Compiler\MenuCompilerPass;
 use Aropixel\PageBundle\DependencyInjection\Compiler\DoctrineTargetEntitiesResolverPass;
 use Aropixel\PageBundle\DependencyInjection\Compiler\PageFormResolverPass;
 use Symfony\Component\DependencyInjection\Compiler\PassConfig;
@@ -11,7 +10,7 @@
 
 class AropixelPageBundle extends Bundle
 {
-    public function build(ContainerBuilder $container)
+    public function build(ContainerBuilder $container) : void
     {
         parent::build($container);
         $container->addCompilerPass(new PageFormResolverPass());
diff --git a/Controller/PageController.php b/Controller/PageController.php
deleted file mode 100644
index c72ff51..0000000
--- a/Controller/PageController.php
+++ /dev/null
@@ -1,244 +0,0 @@
-<?php
-
-namespace Aropixel\PageBundle\Controller;
-
-use Aropixel\AdminBundle\Entity\Publishable;
-use Aropixel\AdminBundle\Services\Status;
-use Aropixel\PageBundle\Block\BlockManager;
-use Aropixel\PageBundle\Entity\Block;
-use Aropixel\PageBundle\Entity\Page;
-use Aropixel\PageBundle\Entity\PageInterface;
-use Aropixel\PageBundle\Form\FormFactoryInterface;
-use Aropixel\PageBundle\Form\PageType;
-use Aropixel\PageBundle\Repository\PageRepository;
-use Doctrine\Common\Collections\ArrayCollection;
-use Symfony\Bundle\FrameworkBundle\Controller\AbstractController;
-use Symfony\Component\DependencyInjection\ParameterBag\ParameterBagInterface;
-use Symfony\Component\Form\FormInterface;
-use Symfony\Component\HttpFoundation\Request;
-use Symfony\Component\HttpFoundation\Response;
-use Symfony\Component\Routing\Annotation\Route;
-
-/**
- * @Route("/page")
- */
-class PageController extends AbstractController
-{
-
-    /** @var ParameterBagInterface */
-    private $parameterBag;
-
-    /** @var FormFactoryInterface */
-    private $formFactory;
-
-    /** @var string  */
-    private $model;
-
-    /** @var string  */
-    private $form;
-
-
-    /**
-     * PageController constructor.
-     * @param ParameterBagInterface $parameterBag
-     */
-    public function __construct(ParameterBagInterface $parameterBag, FormFactoryInterface $formFactory)
-    {
-        $this->parameterBag = $parameterBag;
-        $this->formFactory = $formFactory;
-
-        $entities = $parameterBag->get('aropixel_page.entities');
-        $forms = $parameterBag->get('aropixel_page.forms');
-
-        $this->model = $entities[PageInterface::class];
-//        $this->form = $forms[PageInterface::class];
-    }
-
-
-    /**
-     * @Route("/{type}/list", name="aropixel_page_index", methods={"GET","POST"})
-     */
-    public function index(PageRepository $pageRepository, $type): Response
-    {
-        //
-        $pages = $pageRepository->findBy(['type' => $type], ['title' => 'ASC']);
-
-        //
-        $delete_forms = array();
-        foreach ($pages as $entity) {
-            $deleteForm = $this->createDeleteForm($entity);
-            $delete_forms[$entity->getId()] = $deleteForm->createView();
-        }
-
-        //
-        return $this->render('@AropixelPage/index.html.twig', [
-            'type' => $type,
-            'pages' => $pages,
-            'delete_forms' => $delete_forms,
-        ]);
-    }
-
-
-    /**
-     * @Route("/{type}/page", name="aropixel_page", methods={"GET","POST"})
-     */
-    public function page(Request $request, $type): Response
-    {
-        $em = $this->getDoctrine()->getManager();
-        $page = $em->getRepository($this->model)->findOneBy(['type' => $type]);
-
-        if (!$page) {
-
-            /** @var PageInterface $page */
-            $page = new $this->model();
-            $page->setStatus(Publishable::STATUS_ONLINE);
-            $page->setType($type);
-
-        }
-
-        $form = $this->formFactory->createForm($page);
-        $form->handleRequest($request);
-
-        if ($form->isSubmitted() && $form->isValid()) {
-
-            $em = $this->getDoctrine()->getManager();
-            $em->persist($page);
-            $em->flush();
-
-            $this->addFlash('notice', 'La page a bien été enregistrée.');
-            return $this->redirectToRoute('aropixel_page', array('type' => $type));
-        }
-
-
-        return $this->render($this->getTemplatePath().'/'.$type.'/form.html.twig', [
-            'page' => $page,
-            'form' => $form->createView(),
-        ]);
-    }
-
-
-    /**
-     * @Route("/{type}/new", name="aropixel_page_new", methods={"GET","POST"})
-     */
-    public function new(Request $request, $type): Response
-    {
-        /** @var PageInterface $page */
-        $page = new $this->model();
-        $page->setType($type);
-
-        $form = $this->formFactory->createForm($page);
-        $form->handleRequest($request);
-
-        if ($form->isSubmitted() && $form->isValid()) {
-
-            $em = $this->getDoctrine()->getManager();
-            $em->persist($page);
-            $em->flush();
-
-            $this->addFlash('notice', 'La page a bien été enregistrée.');
-            return $this->redirectToRoute('aropixel_page_edit', array('type' => $page->getType(), 'id' => $page->getId()));
-        }
-
-
-        return $this->render($this->getTemplatePath().'/'.$type.'/form.html.twig', [
-            'page' => $page,
-            'form' => $form->createView(),
-        ]);
-    }
-
-
-    /**
-     * @Route("/{type}/{id}/edit", name="aropixel_page_edit", methods={"GET","POST"})
-     */
-    public function edit(Request $request, $id): Response
-    {
-
-        $em = $this->getDoctrine()->getManager();
-        $page = $em->getRepository($this->model)->find($id);
-        if (!$page) {
-            throw $this->createNotFoundException();
-        }
-
-        $auth_checker = $this->get('security.authorization_checker');
-        $isRoleAdmin = $auth_checker->isGranted('ROLE_HYPER_ADMIN');
-
-        $deleteForm = $this->createDeleteForm($page);
-        $form = $this->formFactory->createForm($page);
-        $form->handleRequest($request);
-
-        if ($form->isSubmitted() && $form->isValid()) {
-
-            $this->addFlash('notice', 'La page a bien été enregistrée.');
-            $this->getDoctrine()->getManager()->flush();
-
-            return $this->redirectToRoute('aropixel_page_edit', array('type' => $page->getType(), 'id' => $page->getId()));
-
-        }
-
-        return $this->render($this->getTemplatePath().'/'.$page->getType().'/form.html.twig', [
-            'page' => $page,
-            'form' => $form->createView(),
-            'delete_form' => ((!$page->getType() == 'default' || $isRoleAdmin) ? $deleteForm->createView() : false)
-        ]);
-    }
-
-
-    /**
-     * @Route("/{id}/status", name="aropixel_page_status", methods={"GET"})
-     */
-    public function status(Page $page, Status $status)
-    {
-        return $status->changeStatus($page);
-
-    }
-
-
-    /**
-     * @Route("/{id}", name="aropixel_page_delete", methods={"DELETE"})
-     */
-    public function delete(Request $request, $id): Response
-    {
-
-        /** @var Page $page */
-        $em = $this->getDoctrine()->getManager();
-        $page = $em->getRepository($this->model)->find($id);
-        $type = $page->getType();
-        if (!$page) {
-            throw $this->createNotFoundException();
-        }
-
-        $titre = $page->getTitle();
-        $form = $this->createDeleteForm($page);
-        $form->handleRequest($request);
-
-        if ($form->isSubmitted() && $form->isValid()) {
-
-            $em = $this->getDoctrine()->getManager();
-            $em->remove($page);
-            $em->flush();
-
-            $this->get('session')->getFlashBag()->add('notice', 'La page "'.$titre.'" a bien été supprimé.');
-        }
-
-        return $this->redirectToRoute('aropixel_page_index', ['type' => $type]);
-    }
-
-    /**
-     * Creates a form to delete the entity.
-     * @return FormInterface The form
-     */
-    private function createDeleteForm(Page $page)
-    {
-        return $this->createFormBuilder()
-            ->setAction($this->generateUrl('aropixel_page_delete', array('id' => $page->getId())))
-            ->setMethod('DELETE')
-            ->getForm()
-            ;
-    }
-
-    private function getTemplatePath()
-    {
-        $formsConfig = $this->getParameter('aropixel_page.forms');
-        return $formsConfig['template_path'];
-    }
-}
diff --git a/Entity/Page.php b/Entity/Page.php
index 4ee093b..944f5e1 100644
--- a/Entity/Page.php
+++ b/Entity/Page.php
@@ -3,6 +3,7 @@
 namespace Aropixel\PageBundle\Entity;
 
 use Aropixel\AdminBundle\Entity\Publishable;
+use Aropixel\AdminBundle\Entity\PublishableTrait;
 use Doctrine\Common\Collections\ArrayCollection;
 use Doctrine\Common\Collections\Collection;
 use Symfony\Component\PropertyAccess\PropertyAccess;
@@ -100,7 +101,7 @@ class Page implements PageInterface
      */
     protected $fieldValues;
 
-
+    use PublishableTrait;
 
     public function __construct()
     {
diff --git a/EventListener/DoFileCropListener.php b/EventListener/DoFileCropListener.php
index 59955f8..08bb38f 100644
--- a/EventListener/DoFileCropListener.php
+++ b/EventListener/DoFileCropListener.php
@@ -2,21 +2,19 @@
 
 namespace Aropixel\PageBundle\EventListener;
 
-use Aropixel\AdminBundle\Entity\CropInterface;
+use Aropixel\AdminBundle\Domain\Media\Image\Crop\CropApplierInterface;
 use Aropixel\AdminBundle\Entity\ImageInterface;
-use Aropixel\AdminBundle\Image\Cropper;
 use Aropixel\PageBundle\Entity\FieldInterface;
 use Doctrine\ORM\Event\LifecycleEventArgs;
 
 
 class DoFileCropListener
 {
-    /** @var Cropper  */
-    private $cropper;
+    private CropApplierInterface $cropper;
 
     /**
      */
-    public function __construct(Cropper $cropper)
+    public function __construct(CropApplierInterface $cropper)
     {
         $this->cropper = $cropper;
     }
diff --git a/Form/Type/AbstractPageType.php b/Form/Type/AbstractPageType.php
index be71d13..fe068b8 100644
--- a/Form/Type/AbstractPageType.php
+++ b/Form/Type/AbstractPageType.php
@@ -59,8 +59,8 @@ public function buildForm(FormBuilderInterface $builder, array $options)
     {
         if ($builder->getData() && $builder->getData()->getType()=='default') {
             $builder
-                ->add('title', TextType::class, array('label'  => 'Titre de la page'))
-                ->add('slug', HiddenType::class)
+                ->add('title', TextType::class, array('label'  => 'Title of the page'))
+                ->add('slug', TextType::class, array('label'  => 'Permalink'))
             ;
         }
 
diff --git a/Form/Type/DefaultPageType.php b/Form/Type/DefaultPageType.php
index 2b4ce94..cff243a 100644
--- a/Form/Type/DefaultPageType.php
+++ b/Form/Type/DefaultPageType.php
@@ -48,20 +48,14 @@ public function buildForm(FormBuilderInterface $builder, array $options)
         //
         parent::buildForm($builder, $options);
         $builder
-            ->add('excerpt', null, array('label'  => 'Chapeau'))
+            ->add('excerpt', null, array('label'  => 'Header'))
             ->add('description', TextareaType::class, array('label'  => 'Description', 'attr' => array('class' => 'ckeditor')))
             ->add('image', ImageType::class, [
                 'data_class' => $fieldClass,
                 'data_value' => 'value',
                 'library' => self::class
             ])
-            ->add('status', ChoiceType::class, array(
-                'choices'  => array(
-                    'Oui' => 'online',
-                    'Non' => 'offline',
-                ),
-                'expanded' => true
-            ))
+            ->add('status', HiddenType::class)
             ->add('createdAt', DateTimeType::class, array(
                 'required' => false,
                 'date_widget' => 'single_text',
diff --git a/Http/Action/Page/CreatePageAction.php b/Http/Action/Page/CreatePageAction.php
new file mode 100644
index 0000000..f212210
--- /dev/null
+++ b/Http/Action/Page/CreatePageAction.php
@@ -0,0 +1,62 @@
+<?php
+
+namespace Aropixel\PageBundle\Http\Action\Page;
+
+use Aropixel\PageBundle\Form\FormFactoryInterface;
+use Aropixel\PageBundle\Http\Form\Page\FormFactory;
+use Symfony\Bundle\FrameworkBundle\Controller\AbstractController;
+use Aropixel\PageBundle\Entity\Page;
+use Aropixel\PageBundle\Repository\PageRepository;
+use Symfony\Component\HttpFoundation\RequestStack;
+use Symfony\Component\HttpFoundation\Response;
+use Symfony\Contracts\Translation\TranslatorInterface;
+
+class CreatePageAction extends AbstractController
+{
+    private FormFactory $formFactory;
+    private FormFactoryInterface $factory;
+    private PageRepository $pageRepository;
+    private RequestStack $request;
+    private TranslatorInterface $translator;
+
+    private string $model = Page::class;
+
+
+    /**
+     * @param FormFactory $formFactory
+     * @param FormFactoryInterface $factory
+     * @param PageRepository $pageRepository
+     * @param RequestStack $request
+     * @param TranslatorInterface $translator
+     */
+    public function __construct(FormFactory $formFactory, FormFactoryInterface $factory, PageRepository $pageRepository, RequestStack $request, TranslatorInterface $translator)
+    {
+        $this->formFactory = $formFactory;
+        $this->factory = $factory;
+        $this->pageRepository = $pageRepository;
+        $this->request = $request;
+        $this->translator = $translator;
+    }
+
+
+    public function __invoke(string $type) : Response
+    {
+        $page = new $this->model();
+        $page->setType($type);
+
+        $form = $this->factory->createForm($page);
+        $form->handleRequest($this->request->getMainRequest());
+
+        if ($form->isSubmitted() && $form->isValid()) {
+            $this->pageRepository->add($page, true);
+
+            $this->addFlash('notice', $this->translator->trans('The page has been successfully saved.'));
+            return $this->redirectToRoute('aropixel_page_edit', array('type' => $page->getType(), 'id' => $page->getId()));
+        }
+
+        return $this->render($this->formFactory->getTemplatePath().'/'.$type.'/form.html.twig', [
+            'page' => $page,
+            'form' => $form->createView(),
+        ]);
+    }
+}
\ No newline at end of file
diff --git a/Http/Action/Page/CreateUniquePageAction.php b/Http/Action/Page/CreateUniquePageAction.php
new file mode 100644
index 0000000..379ff12
--- /dev/null
+++ b/Http/Action/Page/CreateUniquePageAction.php
@@ -0,0 +1,71 @@
+<?php
+
+namespace Aropixel\PageBundle\Http\Action\Page;
+
+use Aropixel\AdminBundle\Entity\Publishable;
+use Aropixel\PageBundle\Entity\Page;
+use Aropixel\PageBundle\Entity\PageInterface;
+use Aropixel\PageBundle\Form\FormFactoryInterface;
+use Aropixel\PageBundle\Http\Form\Page\FormFactory;
+use Aropixel\PageBundle\Repository\PageRepository;
+use Symfony\Bundle\FrameworkBundle\Controller\AbstractController;
+use Symfony\Component\HttpFoundation\RequestStack;
+use Symfony\Component\HttpFoundation\Response;
+use Symfony\Contracts\Translation\TranslatorInterface;
+
+class CreateUniquePageAction extends AbstractController
+{
+    private FormFactory $formFactory;
+    private FormFactoryInterface $factory;
+    private PageRepository $pageRepository;
+    private RequestStack $request;
+    private TranslatorInterface $translator;
+
+    private string $model = Page::class;
+
+
+    /**
+     * @param FormFactory $formFactory
+     * @param FormFactoryInterface $factory
+     * @param PageRepository $pageRepository
+     * @param RequestStack $request
+     * @param TranslatorInterface $translator
+     */
+    public function __construct(FormFactory $formFactory, FormFactoryInterface $factory, PageRepository $pageRepository, RequestStack $request, TranslatorInterface $translator)
+    {
+        $this->formFactory = $formFactory;
+        $this->factory = $factory;
+        $this->pageRepository = $pageRepository;
+        $this->request = $request;
+        $this->translator = $translator;
+    }
+
+
+    public function __invoke(string $type) : Response
+    {
+        $page = $this->pageRepository->findOneBy(['type' => $type]);
+
+        if (!$page) {
+            /** @var PageInterface $page */
+            $page = new $this->model();
+            $page->setStatus(Publishable::STATUS_ONLINE);
+            $page->setType($type);
+        }
+
+        $form = $this->factory->createForm($page);
+        $form->handleRequest($this->request->getMainRequest());
+
+        if ($form->isSubmitted() && $form->isValid()) {
+            $this->pageRepository->add($page, true);
+
+            $this->addFlash('notice', $this->translator->trans('The page has been successfully saved.'));
+            return $this->redirectToRoute('aropixel_page', array('type' => $page->getType(), 'id' => $page->getId()));
+        }
+
+        return $this->render($this->formFactory->getTemplatePath().'/'.$type.'/form.html.twig', [
+            'page' => $page,
+            'form' => $form->createView(),
+        ]);
+
+    }
+}
\ No newline at end of file
diff --git a/Http/Action/Page/DeletePageAction.php b/Http/Action/Page/DeletePageAction.php
new file mode 100644
index 0000000..247592e
--- /dev/null
+++ b/Http/Action/Page/DeletePageAction.php
@@ -0,0 +1,51 @@
+<?php
+
+namespace Aropixel\PageBundle\Http\Action\Page;
+
+use Aropixel\PageBundle\Http\Form\Page\FormFactory;
+use Aropixel\PageBundle\Repository\PageRepository;
+use Symfony\Bundle\FrameworkBundle\Controller\AbstractController;
+use Symfony\Component\HttpFoundation\RequestStack;
+use Symfony\Component\HttpFoundation\Response;
+use Symfony\Contracts\Translation\TranslatorInterface;
+
+class DeletePageAction extends AbstractController
+{
+    private FormFactory $formFactory;
+    private PageRepository $pageRepository;
+    private RequestStack $request;
+    private TranslatorInterface $translator;
+
+    /**
+     * @param FormFactory $formFactory
+     * @param PageRepository $pageRepository
+     * @param RequestStack $request
+     * @param TranslatorInterface $translator
+     */
+    public function __construct(FormFactory $formFactory, PageRepository $pageRepository, RequestStack $request, TranslatorInterface $translator)
+    {
+        $this->formFactory = $formFactory;
+        $this->pageRepository = $pageRepository;
+        $this->request = $request;
+        $this->translator = $translator;
+    }
+
+
+    public function __invoke(int $id) : Response
+    {
+        $page = $this->pageRepository->find($id);
+        $type = $page->getType();
+
+        $form = $this->formFactory->createDeleteForm($page);
+        $form->handleRequest($this->request->getMainRequest());
+
+        if ($form->isSubmitted() && $form->isValid()) {
+            $this->pageRepository->remove($page, true);
+
+            $this->addFlash('notice', $this->translator->trans('The page has been successfully deleted.'));
+        }
+
+        return $this->redirectToRoute('aropixel_page_index', ['type' => $type]);
+
+    }
+}
\ No newline at end of file
diff --git a/Http/Action/Page/EditPageAction.php b/Http/Action/Page/EditPageAction.php
new file mode 100644
index 0000000..6814eee
--- /dev/null
+++ b/Http/Action/Page/EditPageAction.php
@@ -0,0 +1,73 @@
+<?php
+
+namespace Aropixel\PageBundle\Http\Action\Page;
+
+use Aropixel\PageBundle\Entity\PageInterface;
+use Aropixel\PageBundle\Form\FormFactoryInterface;
+use Aropixel\PageBundle\Http\Form\Page\FormFactory;
+use Aropixel\PageBundle\Repository\PageRepository;
+use Symfony\Bundle\FrameworkBundle\Controller\AbstractController;
+use Symfony\Bundle\SecurityBundle\Security;
+use Symfony\Component\HttpFoundation\RequestStack;
+use Symfony\Component\HttpFoundation\Response;
+use Symfony\Component\Security\Core\Authorization\AuthorizationCheckerInterface;
+use Symfony\Contracts\Translation\TranslatorInterface;
+
+class EditPageAction extends AbstractController
+{
+    private AuthorizationCheckerInterface $authorizationChecker;
+    private FormFactory $formFactory;
+    private FormFactoryInterface $factory;
+    private PageRepository $pageRepository;
+    private RequestStack $request;
+    private TranslatorInterface $translator;
+
+    /**
+     * @param AuthorizationCheckerInterface $authorizationChecker
+     * @param FormFactory $formFactory
+     * @param FormFactoryInterface $factory
+     * @param PageRepository $pageRepository
+     * @param RequestStack $request
+     * @param TranslatorInterface $translator
+     */
+    public function __construct(AuthorizationCheckerInterface $authorizationChecker, FormFactory $formFactory, FormFactoryInterface $factory, PageRepository $pageRepository, RequestStack $request, TranslatorInterface $translator)
+    {
+        $this->authorizationChecker = $authorizationChecker;
+        $this->formFactory = $formFactory;
+        $this->factory = $factory;
+        $this->pageRepository = $pageRepository;
+        $this->request = $request;
+        $this->translator = $translator;
+    }
+
+
+    public function __invoke(int $id) : Response
+    {
+        $page = $this->pageRepository->find($id);
+
+        if (!$page) {
+            throw $this->createNotFoundException();
+        }
+
+        $isRoleAdmin = $this->authorizationChecker->isGranted('ROLE_HYPER_ADMIN');
+
+        $deleteForm = $this->formFactory->createDeleteForm($page);
+        $form = $this->factory->createForm($page);
+        $form->handleRequest($this->request->getMainRequest());
+
+        if ($form->isSubmitted() && $form->isValid()) {
+            $this->pageRepository->add($page, true);
+
+            $this->addFlash('notice', $this->translator->trans('The page has been successfully saved.'));
+            return $this->redirectToRoute('aropixel_page_edit', array('type' => $page->getType(), 'id' => $page->getId()));
+        }
+        return $this->render($this->formFactory->getTemplatePath().'/'.$page->getType().'/form.html.twig', [
+            'page' => $page,
+            'form' => $form->createView(),
+            'delete_form' => ((!$page->getType() == 'default' || $isRoleAdmin) ? $deleteForm->createView() : false)
+        ]);
+
+
+
+    }
+}
\ No newline at end of file
diff --git a/Http/Action/Page/IndexPageAction.php b/Http/Action/Page/IndexPageAction.php
new file mode 100644
index 0000000..26697a6
--- /dev/null
+++ b/Http/Action/Page/IndexPageAction.php
@@ -0,0 +1,43 @@
+<?php
+
+namespace Aropixel\PageBundle\Http\Action\Page;
+
+use Aropixel\PageBundle\Http\Form\Page\FormFactory;
+use Aropixel\PageBundle\Repository\PageRepository;
+use Symfony\Bundle\FrameworkBundle\Controller\AbstractController;
+use Symfony\Component\HttpFoundation\Response;
+
+class IndexPageAction extends AbstractController
+{
+    private FormFactory $formFactory;
+    private PageRepository $pageRepository;
+
+    /**
+     * @param FormFactory $formFactory
+     * @param PageRepository $pageRepository
+     */
+    public function __construct(FormFactory $formFactory, PageRepository $pageRepository)
+    {
+        $this->formFactory = $formFactory;
+        $this->pageRepository = $pageRepository;
+    }
+
+
+    public function __invoke(string $type) : Response
+    {
+        $pages = $this->pageRepository->findBy(['type' => $type], ['title' => 'ASC']);
+
+        $delete_forms = array();
+        foreach ($pages as $page) {
+            $deleteForm = $this->formFactory->createDeleteForm($page);
+            $delete_forms[$page->getId()] = $deleteForm->createView();
+        }
+
+        return $this->render('@AropixelPage/index.html.twig', [
+            'type' => $type,
+            'pages' => $pages,
+            'delete_forms' => $delete_forms,
+        ]);
+    }
+
+}
\ No newline at end of file
diff --git a/Http/Action/Page/StatusPageAction.php b/Http/Action/Page/StatusPageAction.php
new file mode 100644
index 0000000..bb51681
--- /dev/null
+++ b/Http/Action/Page/StatusPageAction.php
@@ -0,0 +1,26 @@
+<?php
+
+namespace Aropixel\PageBundle\Http\Action\Page;
+
+use Aropixel\AdminBundle\Services\Status;
+use Aropixel\PageBundle\Entity\Page;
+use Symfony\Component\HttpFoundation\Response;
+
+class StatusPageAction
+{
+    private Status $status;
+
+    /**
+     * @param Status $status
+     */
+    public function __construct(Status $status)
+    {
+        $this->status = $status;
+    }
+
+    public function __invoke(Page $page) : Response
+    {
+        return $this->status->changeStatus($page);
+    }
+
+}
\ No newline at end of file
diff --git a/Http/Form/Page/FormFactory.php b/Http/Form/Page/FormFactory.php
new file mode 100644
index 0000000..df63389
--- /dev/null
+++ b/Http/Form/Page/FormFactory.php
@@ -0,0 +1,31 @@
+<?php
+
+namespace Aropixel\PageBundle\Http\Form\Page;
+
+use Aropixel\PageBundle\Entity\Page;
+use Symfony\Bundle\FrameworkBundle\Controller\AbstractController;
+use Symfony\Component\Form\FormInterface;
+
+class FormFactory extends AbstractController
+{
+    /**
+     * Creates a form to delete a Page entity by id.
+     */
+    public function createDeleteForm(Page $page) : FormInterface
+    {
+        return $this->createFormBuilder()
+            ->setAction($this->generateUrl('aropixel_page_delete', array('id' => $page->getId())))
+            ->setMethod('DELETE')
+            ->getForm()
+            ;
+    }
+
+    public function getTemplatePath()
+    {
+        $formsConfig = $this->getParameter('aropixel_page.forms');
+        return $formsConfig['template_path'];
+    }
+
+
+
+}
\ No newline at end of file
diff --git a/Repository/PageRepository.php b/Repository/PageRepository.php
index 116986f..070bfd2 100644
--- a/Repository/PageRepository.php
+++ b/Repository/PageRepository.php
@@ -2,7 +2,7 @@
 
 namespace Aropixel\PageBundle\Repository;
 
-use Aropixel\AdminBundle\Repository\PublishableRepository;
+use Aropixel\AdminBundle\Infrastructure\Publication\Repository\PublishableRepository;
 use Aropixel\PageBundle\Entity\Page;
 use Aropixel\PageBundle\Entity\PageInterface;
 use Doctrine\Persistence\ManagerRegistry;
@@ -51,6 +51,25 @@ public function findPages($type)
             ;
     }
 
+    public function add(Page $page, bool $flush = false): void
+    {
+        $this->getEntityManager()->persist($page);
+
+        if ($flush) {
+            $this->getEntityManager()->flush();
+        }
+    }
+
+    public function remove(Page $page, bool $flush = false) : void
+    {
+        $this->getEntityManager()->remove($page);
+
+        if ($flush) {
+            $this->getEntityManager()->flush();
+        }
+    }
+
+
 
     /*
     public function findOneBySomeField($value): ?Page
diff --git a/Resources/config/routing.yml b/Resources/config/routing.yml
index 9b69398..bff06ae 100644
--- a/Resources/config/routing.yml
+++ b/Resources/config/routing.yml
@@ -1,3 +1,24 @@
+aropixel_page_index:
+    path: /page/{type}/list
+    controller: Aropixel\PageBundle\Http\Action\Page\IndexPageAction
+
+aropixel_page_new:
+    path: /page/{type}/new
+    controller: Aropixel\PageBundle\Http\Action\Page\CreatePageAction
+
+aropixel_page_edit:
+    path: /page/{type}/{id}/edit
+    controller: Aropixel\PageBundle\Http\Action\Page\EditPageAction
+
+aropixel_page_delete:
+    path: /page/{id}
+    controller: Aropixel\PageBundle\Http\Action\Page\DeletePageAction
+    methods: DELETE
+
 aropixel_page:
-    resource: "@AropixelPageBundle/Controller/PageController.php"
-    type:     annotation
+    path: /page/{type}/page
+    controller: Aropixel\PageBundle\Http\Action\Page\CreateUniquePageAction
+
+aropixel_page_status:
+    path: /page/{id}/status
+    controller: Aropixel\PageBundle\Http\Action\Page\StatusPageAction
diff --git a/Resources/config/services.yml b/Resources/config/services.yml
index 2da187f..ee173b3 100644
--- a/Resources/config/services.yml
+++ b/Resources/config/services.yml
@@ -20,11 +20,10 @@ services:
 
   Aropixel\PageBundle\Form\FormFactoryInterface: '@aropixel.page.form.factory'
 
-  # controllers are imported separately to make sure services can be injected
-  # as action arguments even if you don't extend any base controller class
-  Aropixel\PageBundle\Controller\:
-    resource: '../../Controller'
-    tags: ['controller.service_arguments']
+
+  Aropixel\PageBundle\Http\:
+    resource: '../../Http'
+    tags: [ 'controller.service_arguments' ]
 
   aropixel.page.form.default:
     class: '%aropixel_page.form.default%'
@@ -41,7 +40,7 @@ services:
 
 
   Aropixel\PageBundle\EventListener\DoFileCropListener:
-    arguments: ['@Aropixel\AdminBundle\Image\Cropper']
+    arguments: ['@Aropixel\AdminBundle\Domain\Media\Image\Crop\CropApplierInterface']
     tags:
       - { name: doctrine.event_listener, event: postPersist }
       - { name: doctrine.event_listener, event: postUpdate }
diff --git a/Resources/translations/messages.fr.xlf b/Resources/translations/messages.fr.xlf
new file mode 100644
index 0000000..8b4f771
--- /dev/null
+++ b/Resources/translations/messages.fr.xlf
@@ -0,0 +1,80 @@
+<?xml version="1.0"?>
+<xliff version="1.2" xmlns="urn:oasis:names:tc:xliff:document:1.2">
+    <file source-language="en" datatype="plaintext" original="file.ext">
+        <body>
+            <trans-unit id="1">
+                <source>Manage the pages of your website</source>
+                <target>Administrez les pages de votre site</target>
+            </trans-unit>
+            <trans-unit id="2">
+                <source>Pages list</source>
+                <target>Liste des pages</target>
+            </trans-unit>
+            <trans-unit id="3">
+                <source>Put offline</source>
+                <target>Mettre hors-ligne</target>
+            </trans-unit>
+            <trans-unit id="4">
+                <source>Put online</source>
+                <target>Mettre en ligne</target>
+            </trans-unit>
+            <trans-unit id="5">
+                <source>Are you sure you want to put this page</source>
+                <target>Êtes-vous certain de vouloir mettre cette page</target>
+            </trans-unit>
+            <trans-unit id="6">
+                <source>Title of the page</source>
+                <target>Titre de la page</target>
+            </trans-unit>
+            <trans-unit id="7">
+                <source>Header</source>
+                <target>Chapeau</target>
+            </trans-unit>
+            <trans-unit id="8">
+                <source>Content</source>
+                <target>Contenu</target>
+            </trans-unit>
+            <trans-unit id="9">
+                <source>SEO</source>
+                <target>Référencement</target>
+            </trans-unit>
+            <trans-unit id="10">
+                <source>Set your publication options</source>
+                <target>Paramétrez vos options de publication</target>
+            </trans-unit>
+            <trans-unit id="11">
+                <source>Post</source>
+                <target>Publier</target>
+            </trans-unit>
+            <trans-unit id="12">
+                <source>Post on</source>
+                <target>Publier le</target>
+            </trans-unit>
+            <trans-unit id="13">
+                <source>Until</source>
+                <target>Jusqu'au</target>
+            </trans-unit>
+            <trans-unit id="14">
+                <source>The page has been successfully saved.</source>
+                <target>La page a bien été enregistrée.</target>
+            </trans-unit>
+            <trans-unit id="15">
+                <source>The page has been successfully deleted.</source>
+                <target>La page a bien été supprimée.</target>
+            </trans-unit>
+            <trans-unit id="16">
+                <source>Add</source>
+                <target>Ajouter</target>
+            </trans-unit>
+            <trans-unit id="17">
+                <source>New</source>
+                <target>Créer</target>
+            </trans-unit>
+            <trans-unit id="18">
+                <source>Created on</source>
+                <target>Date de création</target>
+            </trans-unit>
+
+        </body>
+    </file>
+</xliff>
diff --git a/Resources/views/base.html.twig b/Resources/views/base.html.twig
index b3196cb..7aa7aa0 100644
--- a/Resources/views/base.html.twig
+++ b/Resources/views/base.html.twig
@@ -1,30 +1,20 @@
 {% extends '@AropixelAdmin/Form/base.html.twig' %}
 
 {% block header_title %}Pages{% endblock %}
-{% block header_breadcrumb %}
-    {#    <ul class="breadcrumb breadcrumb-caret position-right">#}
-    {#        <li class="breadcrumb-item"><a href="{{ url('_admin') }}">Accueil</a></li>#}
-    {#        <li class="breadcrumb-item"><a href="{{ url('aropixel_page_index') }}">Pages</a></li>#}
-    {#        {% if page.id %}#}
-    {#            <li class="breadcrumb-item">Modifier</li>#}
-    {#        {% else %}#}
-    {#            <li class="breadcrumb-item active">Création</li>#}
-    {#        {% endif %}#}
-    {#    </ul>#}
-{% endblock %}
+{% block header_breadcrumb %}{% endblock %}
 
 
 
 {% block header_elements %}
     {% set baseroute = get_baseroute() %}
     {% if page and route_exists(baseroute ~ '_index')  %}
-        <a href="{{ path(baseroute ~ '_index', {type: page.type}) }}" class="fa-stack" data-toggle="tooltip" data-placement="bottom" title="Liste">
+        <a href="{{ path(baseroute ~ '_index', {type: page.type}) }}" class="fa-stack" data-toggle="tooltip" data-placement="bottom" title="{% trans %}List{% endtrans %}">
             <i class="fas fa-circle fa-stack-2x"></i>
             <i class="fas fa-list fa-stack-1x fa-inverse"></i>
         </a>
     {% endif %}
     {% if app.request.get('_route') != baseroute ~ '_new' and route_exists(baseroute ~ '_new') %}
-        <a href="{{ path(baseroute ~ '_new', {'type': page.type}) }}" class="fa-stack" data-toggle="tooltip" data-placement="bottom" title="Nouveau">
+        <a href="{{ path(baseroute ~ '_new', {'type': page.type}) }}" class="fa-stack" data-toggle="tooltip" data-placement="bottom" title="{% trans %}New{% endtrans %}">
             <i class="fas fa-circle fa-stack-2x"></i>
             <i class="fas fa-plus fa-stack-1x fa-inverse"></i>
         </a>
diff --git a/Resources/views/default/form.html.twig b/Resources/views/default/form.html.twig
index c0d7f61..fbe7973 100644
--- a/Resources/views/default/form.html.twig
+++ b/Resources/views/default/form.html.twig
@@ -1,33 +1,39 @@
 {% extends '@AropixelPage/base.html.twig' %}
+{% form_theme form '@AropixelAdmin/Form/layout.html.twig' %}
+
 
 {% block header_title %}Pages{% endblock %}
 {% block header_breadcrumb %}
-{#    <ul class="breadcrumb breadcrumb-caret position-right">#}
-{#        <li class="breadcrumb-item"><a href="{{ url('_admin') }}">Accueil</a></li>#}
-{#        <li class="breadcrumb-item"><a href="{{ url('aropixel_page_index') }}">Pages</a></li>#}
-{#        {% if page.id %}#}
-{#            <li class="breadcrumb-item">Modifier</li>#}
-{#        {% else %}#}
-{#            <li class="breadcrumb-item active">Création</li>#}
-{#        {% endif %}#}
-{#    </ul>#}
+    <ul class="breadcrumb breadcrumb-caret position-right">
+        <li class="breadcrumb-item"><a href="{{ url('_admin') }}">{% trans %}Home{% endtrans %}</a></li>
+        <li class="breadcrumb-item"><a href="{{ url('aropixel_page_index', {'type': 'default'}) }}">Pages</a></li>
+        {% if page and page.id %}
+            <li class="breadcrumb-item active">{% trans %}Edit{% endtrans %}</li>
+        {% else %}
+            <li class="breadcrumb-item active">{% trans %}Add{% endtrans %}</li>
+        {% endif %}
+    </ul>
 {% endblock %}
 
-{% block mainPanel %}
 
-    <div class="tabbable">
-        <ul class="nav nav-tabs nav-tabs-highlight">
-            <li class="nav-item"><a href="#panel-tab1" data-toggle="tab" class="nav-link active"><i class="fa fa-paper-plane position-left"></i> Contenu</a></li>
-            <li class="nav-item"><a href="#panel-tab2" data-toggle="tab" class="nav-link"><i class="fab fa-google position-left"></i> Référencement</a></li>
-        </ul>
-    </div>
+{% block tabbable %}
+    <li class="nav-item"><a href="#panel-tab1" data-bs-toggle="pill" class="nav-link active"><i class="fa fa-paper-plane position-left"></i><span> {% trans %}Content{% endtrans %}</span></a></li>
+    <li class="nav-item"><a href="#panel-tab2" data-bs-toggle="pill" class="nav-link"><i class="fab fa-google position-left"></i><span> {% trans %}SEO{% endtrans %}</span></a></li>
+{% endblock %}
 
+{% block header_image %}
+    {% set field = form.image is defined ? form.image.vars.value : null %}
+    <div class="section-header-left-image cursor-pointer" data-bs-toggle="offcanvas" data-bs-target="#offcanvasForm">
+        <img src="{{ (field ? field.value : null) | aropixel_imagine_filter('admin_thumbnail') }}" alt="" />
+        <i class="fas fa-external-link-alt editable-indicator"></i>
+    </div>
+{% endblock %}
 
-    <div class="panel-tab-content tab-content">
+{% block mainPanel %}
 
-        <div class="tab-pane active" id="panel-tab1">
+        <div class="tab-pane fade show active" role="tabpanel" id="panel-tab1">
 
-            <div class="card">
+            <div class="card card-centered card-centered-large">
 
                 <div class="card-body">
 
@@ -42,16 +48,14 @@
         </div>
 
 
-        <div class="tab-pane" id="panel-tab2">
+        <div class="tab-pane fade" role="tabpanel" id="panel-tab2">
 
-            <div class="card">
+            <div class="card card-centered">
 
                 <div class="card-body">
 
                     {{ form_row(form.metaTitle) }}
-
                     {{ form_row(form.metaDescription) }}
-
                     {{ form_row(form.metaKeywords) }}
 
                 </div>
@@ -60,8 +64,5 @@
 
         </div>
 
-    </div>
-
-
 
 {% endblock %}
diff --git a/Resources/views/index.html.twig b/Resources/views/index.html.twig
index 363b5d2..9960af6 100644
--- a/Resources/views/index.html.twig
+++ b/Resources/views/index.html.twig
@@ -1,9 +1,9 @@
 {% extends '@AropixelAdmin/List/datatable.html.twig' %}
 
-{% block header_title %}Pages{% endblock %}
+{% block header_title %}Pages <span>{% trans %}Manage the pages of your website{% endtrans %}</span>{% endblock %}
 {% block header_breadcrumb %}
     <ul class="breadcrumb breadcrumb-caret position-right">
-        <li class="breadcrumb-item"><a href="{{ url('_admin') }}">Accueil</a></li>
+        <li class="breadcrumb-item"><a href="{{ url('_admin') }}">{% trans %}Home{% endtrans %}</a></li>
         <li class="breadcrumb-item active">Pages</li>
     </ul>
 {% endblock %}
@@ -12,13 +12,13 @@
 {% block header_elements %}
     {% set baseroute = get_baseroute() %}
     {% if route_exists(baseroute ~ '_new') %}
-        <a href="{{ path(baseroute ~ '_new', {'type': type}) }}" class="fa-stack" data-toggle="tooltip" data-placement="bottom" title="Nouveau">
+        <a href="{{ path(baseroute ~ '_new', {'type': type}) }}" class="fa-stack" data-toggle="tooltip" data-placement="bottom" title="{% trans %}New{% endtrans %}">
             <i class="fas fa-circle fa-stack-2x"></i>
             <i class="fas fa-plus fa-stack-1x fa-inverse"></i>
         </a>
     {% endif %}
     {% if route_exists(baseroute ~ '_order') %}
-        <a href="{{ path(baseroute ~ '_order') }}" class="fa-stack" data-toggle="tooltip" data-placement="bottom" title="Réorganiser">
+        <a href="{{ path(baseroute ~ '_order') }}" class="fa-stack" data-toggle="tooltip" data-placement="bottom" title="{% trans %}Reorder{% endtrans %}">
             <i class="fas fa-circle fa-stack-2x"></i>
             <i class="fas fa-arrows-alt fa-stack-1x fa-inverse"></i>
         </a>
@@ -26,7 +26,7 @@
 {% endblock %}
 
 
-{% block paneltitle %}Liste des pages{% endblock %}
+{% block paneltitle %}{% trans %}Pages list{% endtrans %}{% endblock %}
 
 
 {% block paneldatatable %}
@@ -34,9 +34,9 @@
     <table class="table card-table table-vcenter text-nowrap datatable">
         <thead>
         <tr>
-            <th>Titre</th>
-            <th style="width:200px">Date</th>
-            <th class="no-sort" style="width:150px">Actions</th>
+            <th>{% trans %}Title{% endtrans %}</th>
+            <th style="width:200px">{% trans %}Created on{% endtrans %}</th>
+            <th style="width:200px">Actions</th>
         </tr>
         </thead>
         <tbody>
@@ -44,19 +44,20 @@
             <tr>
                 <td>{{ page.title }}</td>
                 <td>{{ page.createdAt|date('d/m/Y') }}</td>
-                <td>
+                <td class="text-right">
                     <div class="btn-group">
-
-                        <a href="{{ path('aropixel_page_edit', {'type': page.type, 'id': page.id}) }}" class="btn {{ page.status == 'online' ? 'btn-primary' : 'btn-default' }} btn-labeled"><b><i class="fas fa-edit"></i></b> Modifier</a>
-                        <button type="button" class="btn {{ page.status == 'online' ? 'btn-primary' : 'btn-default' }} dropdown-toggle" data-toggle="dropdown" aria-expanded="false"><span class="caret"></span></button>
-                        <ul class="dropdown-menu dropdown-menu-right">
-                            <li class="dropdown-item"><a href="{{ path('aropixel_page_edit', {'type': page.type, 'id': page.id}) }}"><i class="fas fa-edit"></i> Modifier</a></li>
-{#                            <li class="dropdown-item"><a class="status" data-confirm="Êtes-vous certain de vouloir mettre cette page %s ?" data-path="{{ path('page_status', {'id': page.id}) }}"><i class="fas fa-toggle-on"></i>{{ page.status == 'online' ? 'Mettre hors ligne' : 'Mettre en ligne' }}</a></li>#}
-                            <li class="dropdown-divider"></li>
-                            <li class="dropdown-item"><a class="delete" data-confirm="Supprimer la page|Êtes-vous certain de vouloir supprimer cette page ?"><i class="fas fa-trash"></i> Supprimer</a></li>
-                        </ul>
-                        {{ form(delete_forms[page.id]) }}
-
+                        <button type="button" class="badge badge-light badge-icon" data-bs-toggle="dropdown" data-boundary="viewport">
+                            <i class="fas fa-ellipsis-h"></i>
+                        </button>
+                        <div class="dropdown-menu dropdown-menu-end" data-bs-popper="static">
+                            <a href="{{ path('aropixel_page_edit', {'type': page.type, 'id': page.id}) }}" class="dropdown-item has-icon"><i class="fas fa-edit"></i> Modifier</a>
+                            <a class="dropdown-item has-icon status" data-confirm="Êtes-vous certain de vouloir mettre cette page %s ?" data-path="{{ path('aropixel_page_status', {'id': page.id}) }}"><i class="fas fa-toggle-on"></i>{{ page.status == 'online' ? 'Mettre hors ligne' : 'Mettre en ligne' }}</a></li>
+                            <div class="dropdown-divider"></div>
+                            <a data-confirm="Êtes-vous certain de vouloir supprimer cette page ?" class="delete dropdown-item has-icon text-danger">
+                                <i class="fas fa-trash"></i> Supprimer
+                            </a>
+                            {{ form(delete_forms[page.id]) }}
+                        </div>
                     </div>
                 </td>
             </tr>
diff --git a/composer.json b/composer.json
index c190043..69106f9 100644
--- a/composer.json
+++ b/composer.json
@@ -18,7 +18,7 @@
     }
   },
   "require" : {
-    "aropixel/admin-bundle": "^1.2"
+    "aropixel/admin-bundle": "dev-feature/v3/boostrap"
   },
   "scripts": {
     "auto-scripts": {