diff --git a/Bundle/BlogBundle/Controller/ArticleController.php b/Bundle/BlogBundle/Controller/ArticleController.php
index 1260c534a..668387c7e 100644
--- a/Bundle/BlogBundle/Controller/ArticleController.php
+++ b/Bundle/BlogBundle/Controller/ArticleController.php
@@ -180,7 +180,7 @@ public function settingsAction(Request $request, Article $article)
             $response = [
                 'success' => true,
                 'url'     => $this->generateUrl('victoire_core_page_show', [
-                    '_locale' => $page->getLocale(),
+                    '_locale' => $page->getCurrentLocale(),
                     'url'     => $page->getReference()->getUrl(),
                 ]),
             ];
diff --git a/Bundle/BlogBundle/Controller/BlogController.php b/Bundle/BlogBundle/Controller/BlogController.php
index 14a6b89d1..4ed4e4fe3 100644
--- a/Bundle/BlogBundle/Controller/BlogController.php
+++ b/Bundle/BlogBundle/Controller/BlogController.php
@@ -156,7 +156,7 @@ public function settingsAction(Request $request, BasePage $blog)
                 'success' => true,
                 'url'     => $this->generateUrl(
                     'victoire_core_page_show', [
-                        '_locale' => $blog->getLocale(), 'url' => $reference->getUrl(),
+                        '_locale' => $blog->getCurrentLocale(), 'url' => $reference->getUrl(),
                 ]),
             ]);
         }
@@ -218,7 +218,7 @@ public function categoryAction(Request $request, BasePage $blog)
 
             return new JsonResponse([
                 'success' => true,
-                'url'     => $this->generateUrl('victoire_core_page_show', ['_locale' => $blog->getLocale(), 'url' => $blog->getUrl()]), ]);
+                'url'     => $this->generateUrl('victoire_core_page_show', ['_locale' => $blog->getCurrentLocale(), 'url' => $blog->getUrl()]), ]);
         }
         //we display the form
         $errors = $this->get('victoire_form.error_helper')->getRecursiveReadableErrors($form);
diff --git a/Bundle/BlogBundle/Entity/Article.php b/Bundle/BlogBundle/Entity/Article.php
index 246cc26f0..25053f8e7 100644
--- a/Bundle/BlogBundle/Entity/Article.php
+++ b/Bundle/BlogBundle/Entity/Article.php
@@ -156,7 +156,7 @@ class Article
      */
     public function __toString()
     {
-        return $this->name;
+        return $this->getName();
     }
 
     /**
diff --git a/Bundle/CoreBundle/Form/ViewType.php b/Bundle/CoreBundle/Form/ViewType.php
index 62bfad534..fb9d15b7f 100644
--- a/Bundle/CoreBundle/Form/ViewType.php
+++ b/Bundle/CoreBundle/Form/ViewType.php
@@ -13,6 +13,8 @@
 use Victoire\Bundle\BlogBundle\Entity\ArticleTemplate;
 use Victoire\Bundle\BusinessPageBundle\Entity\BusinessTemplate;
 use Victoire\Bundle\CoreBundle\Entity\View;
+use Victoire\Bundle\FormBundle\Form\Type\UrlvalidatedType;
+use Victoire\Bundle\PageBundle\Entity\BasePage;
 use Victoire\Bundle\TemplateBundle\Entity\Template;
 
 /**
@@ -88,15 +90,24 @@ public function buildForm(FormBuilderInterface $builder, array $options)
                     ]
                 );
             }
-        });
 
-        $builder->add('translations', TranslationsType::class, [
-            'fields' => [
-                'name' => [
-                    'label' => 'form.view.type.name.label',
-                ],
-            ],
-        ]);
+            if ($view instanceof BasePage) {
+                $translationOptions = [
+                    'fields' => [
+                        'name' => [
+                            'label' => 'form.view.type.name.label',
+                        ],
+                    ],
+                ];
+                if ($view->getId() && !$view->isHomepage()) {
+                    $translationOptions['fields']['slug'] = [
+                        'label'      => 'form.page.type.slug.label',
+                        'field_type' => UrlvalidatedType::class,
+                    ];
+                }
+                $form->add('translations', TranslationsType::class, $translationOptions);
+            }
+        });
     }
 
     protected function getAvailableLocales()
diff --git a/Bundle/CoreBundle/Resources/public/js/edit/victoire.js b/Bundle/CoreBundle/Resources/public/js/edit/victoire.js
index 659215162..b2945ec4e 100644
--- a/Bundle/CoreBundle/Resources/public/js/edit/victoire.js
+++ b/Bundle/CoreBundle/Resources/public/js/edit/victoire.js
@@ -19,8 +19,9 @@ $vic(document).on("keydown", function (e){
             $vic('button[data-mode="admin-style"]').click();
         } else if ($vic('body').attr('role') == 'admin-style') {
             $vic('button[data-mode="admin-readonly"]').click();
+        } else if ($vic('button[data-mode="admin-readonly"]') != undefined) {
+            $vic('button[data-mode="admin-readonly"]').click();
         }
-
     }
 });
 
diff --git a/Bundle/CoreBundle/Resources/public/js/edit/widget.js b/Bundle/CoreBundle/Resources/public/js/edit/widget.js
index 0ab6e7bc1..a0f323dbe 100644
--- a/Bundle/CoreBundle/Resources/public/js/edit/widget.js
+++ b/Bundle/CoreBundle/Resources/public/js/edit/widget.js
@@ -20,66 +20,27 @@ $vic(document).on('change', '.vic-new-widget select', function(event) {
     $vic(this).parents('.vic-new-widget').first().addClass('vic-creating');
 });
 
-
-// Create new widget after submit
-$vic(document).on('click', '.vic-widget-modal *[data-modal="create"]', function(event) {
+$vic(document).on('click', '.vic-widget-modal a[data-modal="update"], .vic-widget-modal a[data-modal="create"]', function(event) {
     event.preventDefault();
     // we remove the prototype picker to avoid persist it
-    if ($vic("select.picker_entity_select").length != 0 && $vic("select.picker_entity_select").attr('name').indexOf('[items][__name__][entity]') !== -1) {
+    if ($vic("select.picker_entity_select").length != 0 && $vic("select.picker_entity_select").attr('name').indexOf('appventus_victoirecorebundle_widgetlistingtype[items][__name__][entity]') !== -1) {
         $vic("select.picker_entity_select").remove();
     }
-    //we look for the form currently active and visible
-    var form = $vic(this).parents('.vic-modal-content').find('.vic-tab-pane.vic-active form').filter(":visible");
-    $vic(form).trigger("victoire_widget_form_create_presubmit");
-
-    loading(true);
 
-    formData = form.serialize();
-    var contentType = 'application/x-www-form-urlencoded; charset=UTF-8';
-    if ($vic(form).attr('enctype') == 'multipart/form-data') {
-        var formData = new FormData($vic(form)[0]);
-        var contentType = false;
-    }
-    $vic.ajax({
-        type: form.attr('method'),
-        url : form.attr('action'),
-        data        : formData,
-        processData : false,
-        contentType : contentType
-    }).done(function(response){
-        if (true === response.success) {
-            if (response.hasOwnProperty("redirect")) {
-                window.location.replace(response.redirect);
-            } else {
-                window.location.reload();
-            }
-
-            loading(false);
-
-        } else {
-            warn(response.message, 10000);
-            //inform user there have been an error
-            if (response.html) {
-                $vic('.vic-modal-body .vic-container .vic-tab-pane.vic-active').html(response.html);
-            }
+    var forms = [];
+    $vic('.vic-tab-quantum').each(function(index, quantum) {
+        // matches widget edit form with more than one mode available
+        var activeForm = $vic(quantum).find('.vic-tab-mode.vic-active .vic-tab-pane.vic-active > form');
+        // matches widget edit form with only static mode available
+        if (activeForm.length == 0) {
+            activeForm = $vic(quantum).find('.vic-tab-pane.vic-active form, #picker-static-static.vic-active form');
         }
-    }).fail(function(response) {
-        console.log(response);
-        error('Oups, une erreur est apparue', 10000);
+        // matches widget stylize form
+        if (activeForm.length == 0 && $vic(quantum).hasClass('vic-active')) {
+            activeForm = $vic(quantum).find('form[name="widget_style"]');
+        }
+        forms = $vic.merge(forms, [activeForm]);
     });
-    $vic(form).trigger("victoire_widget_form_create_postsubmit");
-});
-
-
-$vic(document).on('click', '.vic-widget-modal a[data-modal="update-bulk"], .vic-widget-modal a[data-modal="create-bulk"]', function(event) {
-    event.preventDefault();
-    // we remove the prototype picker to avoid persist it
-    if ($vic("select.picker_entity_select").length != 0 && $vic("select.picker_entity_select").attr('name').indexOf('appventus_victoirecorebundle_widgetlistingtype[items][__name__][entity]') !== -1) {
-        $vic("select.picker_entity_select").remove();
-    }
-
-    var forms = $vic(this).parents('.vic-modal-content').find('.vic-tab-quantum .vic-tab-mode.vic-active > form');
-    forms = $vic.merge(forms, $vic(this).parents('.vic-modal-content').find('.vic-tab-quantum .vic-tab-mode.vic-active .vic-tab-pane.vic-active > form'));
 
     loading(true);
     var calls = [];
@@ -130,70 +91,12 @@ $vic(document).on('click', '.vic-widget-modal a[data-modal="update-bulk"], .vic-
         loading(false);
     });
 });
-$vic(document).on('click', '.vic-widget-modal a[data-modal="update"]', function(event) {
-    event.preventDefault();
-
-    // we remove the prototype picker to avoid persist it
-    if ($vic("select.picker_entity_select").length != 0 && $vic("select.picker_entity_select").attr('name').indexOf('appventus_victoirecorebundle_widgetlistingtype[items][__name__][entity]') !== -1) {
-        $vic("select.picker_entity_select").remove();
-    }
-    var form = $vic(this).parents('.vic-modal-content').find('form.vic-form-active');
-    if ($vic(form).length == 0) {
-        form = $vic(this).parents('.vic-modal-content').find('.vic-tab-pane.vic-active form').filter(":visible");
-    }
-    $vic(form).trigger("victoire_widget_form_update_presubmit");
-
-    loading(true);
-
-    formData = form.serialize();
-    var contentType = 'application/x-www-form-urlencoded; charset=UTF-8';
-    if ($vic(form).attr('enctype') == 'multipart/form-data') {
-        var formData = new FormData($vic(form)[0]);
-        var contentType = false;
-    }
-    $vic.ajax({
-        type: form.attr('method'),
-        url : form.attr('action'),
-        data        : formData,
-        processData : false,
-        contentType : contentType
-    }).done(function(response){
-        if (true === response.success) {
-            if (response.hasOwnProperty("redirect")) {
-                window.location.replace(response.redirect);
-            } else {
-                if (response.hasOwnProperty("redirect")) {
-                    window.location.replace(response.redirect);
-                } else {
-                    window.location.reload();
-                }
-            }
-            if(typeof(Storage) !== "undefined") {
-                var object = {data: response.html, timestamp: new Date().getTime()};
-                localStorage.setItem('victoire__widget__html__' + response.widgetId, JSON.stringify(object));
-            }
-            loading(false);
-        } else {
-
-            //inform user there have been an error
-            warn(response.message, 10000);
-
-            if (response.html) {
-                $vic(form).parent('div').html(response.html);
-            }
-        }
-    }).fail(function(response) {
-        console.log(response);
-        error('Oups, une erreur est apparue', 10000);
-    });
-    $vic(form).trigger("victoire_widget_form_update_postsubmit");
-});
 
 // Delete a widget after submit
 $vic(document).on('click', 'a#widget-new-tab', function(event) {
     event.preventDefault();
     loading(true);
-    var url = Routing.generate('victoire_core_widget_new_quantum_item', {
+    var url = Routing.generate('victoire_core_widget_new', {
         type: $vic(this).data('type'),
         viewReference: viewReferenceId,
         slot: $vic(this).data('slot'),
diff --git a/Bundle/CoreBundle/Resources/style/less/ugly.less b/Bundle/CoreBundle/Resources/style/less/ugly.less
index 29f47f794..466f791c3 100644
--- a/Bundle/CoreBundle/Resources/style/less/ugly.less
+++ b/Bundle/CoreBundle/Resources/style/less/ugly.less
@@ -20,3 +20,10 @@
     color: @green;
 }
 
+.vic-quantum-nav {
+    position: fixed;
+    bottom: 50px;
+}
+.quantum-tab-name {
+    background-color: #fff;
+}
\ No newline at end of file
diff --git a/Bundle/CoreBundle/Resources/views/Widget/Form/_modal.html.twig b/Bundle/CoreBundle/Resources/views/Widget/Form/_modal.html.twig
index fe5d70191..a459bfd22 100644
--- a/Bundle/CoreBundle/Resources/views/Widget/Form/_modal.html.twig
+++ b/Bundle/CoreBundle/Resources/views/Widget/Form/_modal.html.twig
@@ -16,7 +16,7 @@
                         <a href="{{ path('victoire_core_widget_delete_bulk', {'id':widget.id, 'viewReference': view.reference.id })}}" class="vic-btn vic-btn-danger vic-pull-left" data-toggle="vic-confirm" data-modal="delete-bulk" data-title="{{ 'modal.button.delete.confirm.title'|trans({}, 'victoire') }}" data-body="{{ 'modal.button.delete.confirm.body'|trans({}, 'victoire') }}" title="{{ 'modal.button.delete.title'|trans({}, 'victoire') }}"><i class="fa fa-trash-o"></i> <span>{{ 'modal.button.delete.title'|trans({}, 'victoire') }}</span></a>
                     {% endif %}
                     <a href="#" class="vic-btn vic-btn-default vic-pull-left" data-modal="close"><i class="fa fa-times-circle"></i> {{ 'modal.button.cancel.title'|trans({}, 'victoire') }}</a>
-                    <a href="#" class="vic-btn vic-btn-success" data-modal="{% block action %}create{% endblock action %}-bulk" title="{{ ('modal.button.'~ block('action') ~'.title')|trans({}, 'victoire') }}"><i class="fa fa-check-circle"></i> {{ ('modal.button.'~ block('action') ~'.title')|trans({}, 'victoire') }}</a>
+                    <a href="#" class="vic-btn vic-btn-success" data-modal="{% block action %}create{% endblock action %}" title="{{ ('modal.button.'~ block('action') ~'.title')|trans({}, 'victoire') }}"><i class="fa fa-check-circle"></i> {{ ('modal.button.'~ block('action') ~'.title')|trans({}, 'victoire') }}</a>
                 {% endblock modal_footer_content %}
             </div>
         </div>
diff --git a/Bundle/CoreBundle/Resources/views/Widget/Form/new.html.twig b/Bundle/CoreBundle/Resources/views/Widget/Form/new.html.twig
index 5320727b5..3624e1d0e 100644
--- a/Bundle/CoreBundle/Resources/views/Widget/Form/new.html.twig
+++ b/Bundle/CoreBundle/Resources/views/Widget/Form/new.html.twig
@@ -10,7 +10,7 @@
         {% include "VictoireCoreBundle:Widget:Form/new_partial.html.twig" with {forms: forms[key], widget: widget, classes: classes, id: widgets[key].id ? widgets[key].id : id, quantum: forms[key]['quantum'] }%}
     {% endfor %}
     </div>
-    <ul class="vic-nav vic-nav-tabs vic-modal-nav-tabs">
+    <ul class="vic-nav vic-nav-tabs vic-modal-nav-tabs vic-quantum-nav">
         {% for key, form in forms %}
             {% include "VictoireCoreBundle:Widget:Form/tab.html.twig" with {isLast: loop.last, widget: widgets[key], active: form.active is defined ? form.active : false, id: widgets[key].id ? widgets[key].id : id} %}
         {% endfor %}
diff --git a/Bundle/CoreBundle/Resources/views/Widget/Form/stylize.html.twig b/Bundle/CoreBundle/Resources/views/Widget/Form/stylize.html.twig
index db77923cd..a50628f8d 100644
--- a/Bundle/CoreBundle/Resources/views/Widget/Form/stylize.html.twig
+++ b/Bundle/CoreBundle/Resources/views/Widget/Form/stylize.html.twig
@@ -17,7 +17,7 @@
 
     <div class="vic-tab-content vic-modal-tab-content vic-modal-tab-content-container">
         {% for index, form in forms %}
-        <div class="vic-tab-quantum vic-tab-pane{% if form.vars.data == widget  %} vic-active{% endif %}" id="widget-{{ widgets[index].id }}-tab-pane">
+        <div class="vic-tab-quantum vic-tab-pane{% if form.vars.data.id == widget.id %} vic-active{% endif %}" id="widget-{{ widgets[index].id }}-tab-pane">
             {% include 'VictoireCoreBundle:Widget/Form/stylize:form.html.twig' %}
         </div>
         {% endfor %}
@@ -25,7 +25,7 @@
 
     <ul class="vic-nav vic-nav-tabs vic-modal-nav-tabs">
         {% for index, form in forms %}
-            <li class="{% if not loop.last %}vic-seperate{% endif %}{% if form.vars.data == widget %} vic-active{% endif %}">
+            <li class="{% if not loop.last %}vic-seperate{% endif %}{% if form.vars.data.id == widget.id %} vic-active{% endif %}">
                 <a id="widget-{{ widgets[index].id}}-tab" class="quantum-tab-name" href="#widget-{{ widgets[index].id}}-tab-pane" data-toggle="vic-tab"><span>{{ widgets[index].quantum ? widgets[index].quantum : "widget_modal.quantum.tab.default"|trans }}</span></a>
             </li>
         {% endfor %}
@@ -50,7 +50,7 @@
 
 {% endblock modal_body_content %}
 
-{% block action %}{% if forms|length > 1 %}update-bulk{% else %}update{% endif %}{% endblock action %}
+{% block action %}update{% endblock action %}
 {% block modal_footer_content %}
     <a href="#" class="vic-btn vic-btn-default vic-pull-left" data-modal="close"><i class="fa fa-times-circle"></i> {{ 'modal.button.cancel.title'|trans({}, 'victoire') }}</a>
     <a href="#" class="vic-btn vic-btn-success" data-modal="{{ block('action') }}" title="{{ ('modal.button.'~ block('action') ~'.title')|trans({}, 'victoire') }}"><i class="fa fa-check-circle"></i> {{ ('modal.button.'~ block('action') ~'.title')|trans({}, 'victoire') }}</a>
diff --git a/Bundle/CoreBundle/Resources/views/Widget/Form/tab.html.twig b/Bundle/CoreBundle/Resources/views/Widget/Form/tab.html.twig
index 5901fc6f2..9c172af6f 100644
--- a/Bundle/CoreBundle/Resources/views/Widget/Form/tab.html.twig
+++ b/Bundle/CoreBundle/Resources/views/Widget/Form/tab.html.twig
@@ -1,3 +1,3 @@
 <li class="{% if not isLast %}vic-seperate{% endif %}{% if active is defined and active == true %} vic-active{% endif %}">
-    <a id="widget-{{ id }}-tab" class="quantum-tab-name" href="#widget-{{ id }}-tab-pane" data-toggle="vic-tab"><span>{{ widget.quantum ? widget.quantum : "widget_modal.quantum.tab.default"|trans({}, 'victoire') }}</span><i class="edit fa fa-pencil"></i></a>
+    <a id="widget-{{ id }}-tab" class="quantum-tab-name" href="#widget-{{ id }}-tab-pane" data-toggle="vic-tab"><span>{{ widget.quantum ? widget.quantum : "widget_modal.quantum.tab.default"|trans({}, 'victoire') }}</span> <i class="edit fa fa-pencil"></i></a>
 </li>
diff --git a/Bundle/CoreBundle/Twig/Extension/CmsExtension.php b/Bundle/CoreBundle/Twig/Extension/CmsExtension.php
index 768b03f4d..86a9f37aa 100644
--- a/Bundle/CoreBundle/Twig/Extension/CmsExtension.php
+++ b/Bundle/CoreBundle/Twig/Extension/CmsExtension.php
@@ -145,7 +145,7 @@ public function cmsSlotWidgets($slotId, $slotOptions = [])
         $result = '';
         $slotOptions = $this->widgetRenderer->computeOptions($slotId, $slotOptions);
 
-        if (!empty($currentView->getBuiltWidgetMap()[$slotId])) {
+        if ($currentView && !empty($currentView->getBuiltWidgetMap()[$slotId])) {
             //parse the widget maps
 
             /* @var WidgetMap $widgetMap */
diff --git a/Bundle/FormBundle/Form/Type/UrlvalidatedType.php b/Bundle/FormBundle/Form/Type/UrlvalidatedType.php
index a9fbe37e0..6a6ec4832 100644
--- a/Bundle/FormBundle/Form/Type/UrlvalidatedType.php
+++ b/Bundle/FormBundle/Form/Type/UrlvalidatedType.php
@@ -40,7 +40,8 @@ public function buildView(FormView $view, FormInterface $form, array $options)
             $locale = $page->getCurrentLocale();
         }
 
-        $url = $this->router->generate('victoire_core_page_show', ['url' => $page->getParent()->getUrl(), '_locale' => $locale], Router::ABSOLUTE_URL);
+        $parentUrl = $page->getParent() ? $page->getParent()->getUrl() : '';
+        $url = $this->router->generate('victoire_core_page_show', ['url' => $parentUrl, '_locale' => $locale], Router::ABSOLUTE_URL);
         $view->vars['base_url'] = $url;
 
         parent::buildView($view, $form, $options);
diff --git a/Bundle/FormBundle/Resources/public/js/form.js b/Bundle/FormBundle/Resources/public/js/form.js
index 20ffbd925..28aff7e51 100644
--- a/Bundle/FormBundle/Resources/public/js/form.js
+++ b/Bundle/FormBundle/Resources/public/js/form.js
@@ -15,11 +15,13 @@ $vic(document).on('change', 'select[data-refreshOnChange="true"], input:checkbox
     var form = $vic(this).parents('form');
     loading(true);
 
-    var targetClass = ".vic-modal-body .vic-container-fluid .vic-tab-pane.vic-active";
+    var targetClass = ".vic-modal-body .vic-container-fluid .vic-tab-quantum.vic-tab-pane.vic-active";
     if ($vic(this).data('target')) {
         targetClass = $vic(this).data('target');
-    } else if ($vic(this).parents('.vic-modal').hasClass('-stylize')) {
-        targetClass = ".vic-modal-body .vic-container-fluid";
+    }
+    var updateStrategy = "html";
+    if ($vic(this).data('update-strategy')) {
+        updateStrategy = $vic(this).data('update-strategy');
     }
 
     //Get last element of visible target class
@@ -32,7 +34,10 @@ $vic(document).on('change', 'select[data-refreshOnChange="true"], input:checkbox
         data: form.serialize(),
         async: true
     }).done(function(response){
-        $target.html(response.html);
+
+        //By default, the updateStrategy is html (a simple replace) but you can set your own function
+        //for example, append, after etc or even a custom one.
+        eval('$target.' + updateStrategy + '(response.html)');
         var scripts = $target.find("script");
         loading(false);
     }).fail(function(response) {
diff --git a/Bundle/FormBundle/Resources/views/Form/fields.html.twig b/Bundle/FormBundle/Resources/views/Form/fields.html.twig
index f2f04feda..e8ba1f05e 100644
--- a/Bundle/FormBundle/Resources/views/Form/fields.html.twig
+++ b/Bundle/FormBundle/Resources/views/Form/fields.html.twig
@@ -1,5 +1,6 @@
 {% trans_default_domain "victoire" %}
 {% use 'form_div_layout.html.twig' %}
+{% use 'VictoireFormBundle:Form:localeTabs.html.twig' %}
 
 {% block urlvalidated_widget %}
     <div class="vic-form-url-slug">
diff --git a/Bundle/I18nBundle/DependencyInjection/VictoireI18nExtension.php b/Bundle/I18nBundle/DependencyInjection/VictoireI18nExtension.php
index d34d418d2..603c4bda0 100644
--- a/Bundle/I18nBundle/DependencyInjection/VictoireI18nExtension.php
+++ b/Bundle/I18nBundle/DependencyInjection/VictoireI18nExtension.php
@@ -54,7 +54,6 @@ public function prepend(ContainerBuilder $container)
         if (isset($config['available_locales'])) {
             $container->prependExtensionConfig('a2lix_translation_form', [
                 'locales'    => $config['available_locales'],
-                'templating' => 'VictoireFormBundle:Form:localeTabs.html.twig',
             ]);
         }
     }
diff --git a/Bundle/PageBundle/Entity/Traits/WebViewTrait.php b/Bundle/PageBundle/Entity/Traits/WebViewTrait.php
index a30e4bf64..f4686a71d 100644
--- a/Bundle/PageBundle/Entity/Traits/WebViewTrait.php
+++ b/Bundle/PageBundle/Entity/Traits/WebViewTrait.php
@@ -152,7 +152,7 @@ public function isPublished()
      */
     public function isHomepage()
     {
-        return $this->homepage;
+        return (bool) $this->homepage;
     }
 
     /**
diff --git a/Bundle/PageBundle/EventSubscriber/PageSubscriber.php b/Bundle/PageBundle/EventSubscriber/PageSubscriber.php
index 23d073a1e..f11ba006b 100644
--- a/Bundle/PageBundle/EventSubscriber/PageSubscriber.php
+++ b/Bundle/PageBundle/EventSubscriber/PageSubscriber.php
@@ -14,8 +14,6 @@
 use Victoire\Bundle\CoreBundle\Entity\View;
 use Victoire\Bundle\CoreBundle\Entity\WebViewInterface;
 use Victoire\Bundle\PageBundle\Helper\UserCallableHelper;
-use Victoire\Bundle\TemplateBundle\Entity\Template;
-use Victoire\Bundle\TwigBundle\Entity\ErrorPage;
 use Victoire\Bundle\ViewReferenceBundle\Builder\ViewReferenceBuilder;
 use Victoire\Bundle\ViewReferenceBundle\Connector\ViewReferenceRepository;
 use Victoire\Bundle\ViewReferenceBundle\ViewReference\ViewReference;
@@ -136,7 +134,7 @@ public function postLoad(LifecycleEventArgs $eventArgs)
         $entity = $eventArgs->getEntity();
 
         if ($entity instanceof View) {
-            $om = $eventArgs->getObjectManager();
+            $entity->setReferences([$entity->getCurrentLocale() => new ViewReference($entity->getId())]);
             $viewReferences = $this->viewReferenceRepository->getReferencesByParameters([
                 'viewId'     => $entity->getId(),
                 'templateId' => $entity->getId(),
@@ -145,9 +143,7 @@ public function postLoad(LifecycleEventArgs $eventArgs)
                 if ($entity instanceof WebViewInterface && $viewReference instanceof ViewReference) {
                     $entity->setReference($viewReference, $viewReference->getLocale());
                     $entity->setUrl($viewReference->getUrl());
-                } elseif ($entity instanceof Template || $entity instanceof ErrorPage) {
-                    $entity->setReferences([$entity->getCurrentLocale() => new ViewReference($entity->getId())]);
-                } else {
+                } elseif ($entity instanceof BusinessTemplate) {
                     $entity->setReferences([
                         $entity->getCurrentLocale() => $this->viewReferenceBuilder->buildViewReference($entity, $eventArgs->getEntityManager()),
                     ]);
diff --git a/Bundle/PageBundle/Form/PageSettingsType.php b/Bundle/PageBundle/Form/PageSettingsType.php
index 408dd2522..709880127 100644
--- a/Bundle/PageBundle/Form/PageSettingsType.php
+++ b/Bundle/PageBundle/Form/PageSettingsType.php
@@ -2,11 +2,9 @@
 
 namespace Victoire\Bundle\PageBundle\Form;
 
-use A2lix\TranslationFormBundle\Form\Type\TranslationsType;
 use Symfony\Component\Form\Extension\Core\Type\ChoiceType;
 use Symfony\Component\Form\FormBuilderInterface;
 use Symfony\Component\HttpFoundation\RequestStack;
-use Victoire\Bundle\FormBundle\Form\Type\UrlvalidatedType;
 use Victoire\Bundle\PageBundle\Entity\PageStatus;
 
 /**
@@ -31,19 +29,7 @@ public function __construct($availableLocales, RequestStack $requestStack)
     public function buildForm(FormBuilderInterface $builder, array $options)
     {
         parent::buildForm($builder, $options);
-
-        $builder->add('translations', TranslationsType::class, [
-            'fields' => [
-                'name' => [
-                    'label' => 'form.view.type.name.label',
-                ],
-                'slug' => [
-                    'label'      => 'form.page.type.slug.label',
-                    'field_type' => UrlvalidatedType::class,
-                ],
-            ],
-        ])
-        ->add('status', ChoiceType::class, [
+        $builder->add('status', ChoiceType::class, [
             'label'   => 'form.page.type.status.label',
             'choices' => [
                 'form.page.type.status.choice.label.draft'       => PageStatus::DRAFT,
diff --git a/Bundle/PageBundle/Resources/views/Page/settings.html.twig b/Bundle/PageBundle/Resources/views/Page/settings.html.twig
index 1870374d2..01df29ee8 100644
--- a/Bundle/PageBundle/Resources/views/Page/settings.html.twig
+++ b/Bundle/PageBundle/Resources/views/Page/settings.html.twig
@@ -16,7 +16,7 @@
             <form method="POST" action="{{path('victoire_core_page_settings', {'id':page.id} )}}">
                 <div class="vic-form-group">
                     <div class="vic-col-lg-8">
-                        {{ form_row(form.translations) }}
+                        {{ form_widget(form.translations) }}
                         {{ form_row(form.parent) }}
                         {{ form_row(form.template) }}
 
@@ -42,7 +42,7 @@
     </div>
 
     <script type="text/javascript">
-        $vic('#victoire_page_settings_type_status').on('change', function(){
+        $vic('#page_settings_status').on('change', function(){
             if ($vic(this).val() == '{{ constant('Victoire\\Bundle\\PageBundle\\Entity\\PageStatus::SCHEDULED') }}') {
                 $vic('.publication-date-container').removeClass('vic-hidden');
             } else {
diff --git a/Bundle/TemplateBundle/Controller/TemplateController.php b/Bundle/TemplateBundle/Controller/TemplateController.php
index ee7fce17b..8aec2cc3f 100644
--- a/Bundle/TemplateBundle/Controller/TemplateController.php
+++ b/Bundle/TemplateBundle/Controller/TemplateController.php
@@ -48,8 +48,8 @@ public function indexAction()
      *
      * @param Template $template The template
      *
-     * @Route("/show/{slug}", name="victoire_template_show")
-     * @ParamConverter("template", class="VictoireTemplateBundle:Template", options={"mapping": {"slug": "slug"}})
+     * @Route("/show/{id}", name="victoire_template_show")
+     * @ParamConverter("template", class="VictoireTemplateBundle:Template")
      *
      * @return Response
      */
@@ -72,7 +72,7 @@ public function showAction(Template $template)
         $parameters = [
             'view'   => $template,
             'id'     => $template->getId(),
-            'locale' => $template->getLocale(),
+            'locale' => $template->getCurrentLocale(),
         ];
 
         $this->get('victoire_widget_map.builder')->build($template);
@@ -103,7 +103,7 @@ public function newAction()
     {
         $em = $this->getDoctrine()->getManager();
         $template = new Template();
-        $form = $this->container->get('form.factory')->create($this->getNewTemplateType(), $template); //@todo utiliser un service
+        $form = $this->container->get('form.factory')->create(TemplateType::class, $template); //@todo utiliser un service
 
         $form->handleRequest($this->get('request'));
         if ($form->isValid()) {
@@ -112,7 +112,7 @@ public function newAction()
 
             return new JsonResponse([
                 'success'  => true,
-                'url'      => $this->generateUrl('victoire_template_show', ['slug' => $template->getSlug()]),
+                'url'      => $this->generateUrl('victoire_template_show', ['id' => $template->getId()]),
             ]);
         }
 
@@ -149,7 +149,7 @@ public function settingsAction(Request $request, $template)
             return new JsonResponse(
                     [
                         'success' => true,
-                        'url'     => $this->generateUrl('victoire_template_show', ['slug' => $template->getSlug()]),
+                        'url'     => $this->generateUrl('victoire_template_show', ['id' => $template->getId()]),
                     ]
                 );
         }
@@ -178,14 +178,14 @@ public function settingsAction(Request $request, $template)
     public function editAction(Template $template)
     {
         $em = $this->getDoctrine()->getManager();
-        $form = $this->container->get('form.factory')->create($this->getNewTemplateType(), $template);
+        $form = $this->container->get('form.factory')->create(TemplateType::class, $template);
 
         $form->handleRequest($this->get('request'));
         if ($form->isValid()) {
             $em->persist($template);
             $em->flush();
 
-            return $this->redirect($this->generateUrl('victoire_template_show', ['slug' => $template->getSlug()]));
+            return $this->redirect($this->generateUrl('victoire_template_show', ['id' => $template->getId()]));
         }
 
         return $this->redirect($this->generateUrl('victoire_template_settings', ['slug' => $template->getSlug()]));
diff --git a/Bundle/TemplateBundle/Resources/views/Template/index.html.twig b/Bundle/TemplateBundle/Resources/views/Template/index.html.twig
index 934e98746..abe965b11 100644
--- a/Bundle/TemplateBundle/Resources/views/Template/index.html.twig
+++ b/Bundle/TemplateBundle/Resources/views/Template/index.html.twig
@@ -12,7 +12,7 @@
 
 {% macro templatesHierarchy(templates) %}
     {% for template in templates %}
-      <li id="list_{{template.id}}"><a href="{{path('victoire_template_show', {'slug' : template.slug })}}">{{ template.name }}</a>
+      <li id="list_{{template.id}}"><a href="{{path('victoire_template_show', {'id' : template.id })}}">{{ template.name }}</a>
       {% if template.templateInheritors %}
           <ol>
             {{ _self.templatesHierarchy(template.templateInheritors) }}
diff --git a/Bundle/TemplateBundle/Resources/views/Template/new.html.twig b/Bundle/TemplateBundle/Resources/views/Template/new.html.twig
index 9ead21227..2791f7b28 100644
--- a/Bundle/TemplateBundle/Resources/views/Template/new.html.twig
+++ b/Bundle/TemplateBundle/Resources/views/Template/new.html.twig
@@ -2,7 +2,7 @@
 
 {% block modal_body_content %}
     <form method="POST" action="{{path('victoire_template_new')}}">
-        {{form_row(form.name)}}
+        {{form_row(form.translations)}}
         {{form_row(form.template)}}
         {{form_row(form.layout)}}
         {{form_rest(form)}}
diff --git a/Bundle/TwigBundle/Controller/ErrorPageController.php b/Bundle/TwigBundle/Controller/ErrorPageController.php
index bbabc06b5..75ba440ae 100644
--- a/Bundle/TwigBundle/Controller/ErrorPageController.php
+++ b/Bundle/TwigBundle/Controller/ErrorPageController.php
@@ -37,7 +37,7 @@ public function showAction(ErrorPage $page)
         $parameters = [
             'view'   => $page,
             'id'     => $page->getId(),
-            'locale' => $page->getLocale(),
+            'locale' => $page->getCurrentLocale(),
         ];
 
         $this->get('victoire_widget_map.builder')->build($page);
diff --git a/Bundle/UserBundle/Model/User.php b/Bundle/UserBundle/Model/User.php
index 1bea61b8b..6bbb5ff44 100644
--- a/Bundle/UserBundle/Model/User.php
+++ b/Bundle/UserBundle/Model/User.php
@@ -4,6 +4,7 @@
 
 use Doctrine\ORM\Mapping as ORM;
 use FOS\UserBundle\Model\User as BaseUser;
+use Symfony\Component\Serializer\Annotation\Groups;
 
 /**
  * Victoire User model.
@@ -23,6 +24,7 @@ class User extends BaseUser implements VictoireUserInterface
      * @var string
      *
      * @ORM\Column(name="firstname", type="string", length=255, nullable=true)
+     * @Groups({"profile"})
      */
     protected $firstname;
 
@@ -30,6 +32,7 @@ class User extends BaseUser implements VictoireUserInterface
      * @var string
      *
      * @ORM\Column(name="lastname", type="string", length=255, nullable=true)
+     * @Groups({"profile"})
      */
     protected $lastname;
 
@@ -37,6 +40,7 @@ class User extends BaseUser implements VictoireUserInterface
      * @var string
      *
      * @ORM\Column(name="locale", type="string", length=255, nullable=true)
+     * @Groups({"profile"})
      */
     protected $locale;
 
diff --git a/Bundle/ViewReferenceBundle/Command/GenerateViewReferenceCommand.php b/Bundle/ViewReferenceBundle/Command/GenerateViewReferenceCommand.php
index 783f4bdc3..b2fcd227c 100644
--- a/Bundle/ViewReferenceBundle/Command/GenerateViewReferenceCommand.php
+++ b/Bundle/ViewReferenceBundle/Command/GenerateViewReferenceCommand.php
@@ -37,5 +37,6 @@ protected function execute(InputInterface $input, OutputInterface $output)
         $viewHelper = $this->getContainer()->get('victoire_core.view_helper');
         $viewsReferences = $viewHelper->buildViewsReferences();
         $this->getContainer()->get('victoire_view_reference.manager')->saveReferences($viewsReferences);
+        $output->writeln('<info>The ViewReference has been generated.</info>');
     }
 }
diff --git a/Bundle/WidgetBundle/Controller/WidgetController.php b/Bundle/WidgetBundle/Controller/WidgetController.php
index 6518f1dd3..daeee7d5a 100644
--- a/Bundle/WidgetBundle/Controller/WidgetController.php
+++ b/Bundle/WidgetBundle/Controller/WidgetController.php
@@ -45,6 +45,7 @@ public function showAction(Request $request, Widget $widget, $viewReferenceId)
         //the response is for the ajax.js from the AppVentus Ajax Bundle
         try {
             $view = $this->get('victoire_page.page_helper')->findPageByParameters(['id' => $viewReferenceId]);
+            $this->get('victoire_widget_map.builder')->build($view);
             $this->get('victoire_core.current_view')->setCurrentView($view);
             $response = new JsonResponse([
                     'html'    => $this->get('victoire_widget.widget_renderer')->render($widget, $view),
@@ -86,16 +87,18 @@ public function apiWidgetsAction($widgetIds, $viewReferenceId)
     /**
      * New Widget.
      *
-     * @param string $type          The type of the widget we edit
-     * @param int    $viewReference The view reference where attach the widget
-     * @param string $slot          The slot where attach the widget
+     * @param Request $request
+     * @param string  $type          The type of the widget we edit
+     * @param int     $viewReference The view reference where attach the widget
+     * @param string  $slot          The slot where attach the widget
+     * @param null    $quantum       The quantum number used to avoid same form name
      *
-     * @return JsonResponse
+     * @throws Exception
      *
-     * @Route("/victoire-dcms/widget/new-quantum-item/{type}/{viewReference}/{slot}/{quantum}", name="victoire_core_widget_new_quantum_item", defaults={"slot":null, "position":null, "parentWidgetMap":null, "quantum":0}, options={"expose"=true})
-     * @Route("/victoire-dcms/widget/new/{type}/{viewReference}/{slot}/{quantum}/{position}/{parentWidgetMap}", name="victoire_core_widget_new", defaults={"slot":null, "position":null, "parentWidgetMap":null, "quantum":0}, options={"expose"=true})
+     * @return JsonResponse
+     * @Route("/victoire-dcms/widget/new/{type}/{viewReference}/{slot}/{quantum}", name="victoire_core_widget_new", defaults={"slot":null, "quantum":0}, options={"expose"=true})
      */
-    public function newAction($type, $viewReference, $slot = null, $position = null, $parentWidgetMap = null, $quantum = null)
+    public function newAction(Request $request, $type, $viewReference, $slot = null, $quantum = null)
     {
         try {
             $view = $this->getViewByReferenceId($viewReference);
@@ -105,6 +108,9 @@ public function newAction($type, $viewReference, $slot = null, $position = null,
                 $reference = new ViewReference($viewReference);
             }
             $view->setReference($reference);
+
+            $position = $request->query->has('position') ? $request->query->get('position') : null;
+            $parentWidgetMap = $request->query->has('parentWidgetMap') ? $request->query->get('parentWidgetMap') : null;
             $widgetData = $this->get('victoire_widget.widget_manager')->newWidget(
                 Widget::MODE_STATIC,
                 $type,
@@ -415,7 +421,7 @@ public function unlinkAction($id, $viewReference)
             $this->get('doctrine.orm.entity_manager')->flush();
 
             if ($view instanceof Template) {
-                $redirect = $this->generateUrl('victoire_template_show', ['slug' => $view->getSlug()]);
+                $redirect = $this->generateUrl('victoire_template_show', ['id' => $view->getId()]);
             } elseif ($view instanceof BusinessTemplate) {
                 $redirect = $this->generateUrl('victoire_business_template_show', ['id' => $view->getId()]);
             } else {
diff --git a/Bundle/WidgetBundle/Twig/LinkExtension.php b/Bundle/WidgetBundle/Twig/LinkExtension.php
index b22dd6142..79ff5e447 100644
--- a/Bundle/WidgetBundle/Twig/LinkExtension.php
+++ b/Bundle/WidgetBundle/Twig/LinkExtension.php
@@ -121,7 +121,7 @@ public function victoireLinkUrl($parameters, $avoidRefresh = true, $url = '#')
                 if ($attachedWidget && method_exists($attachedWidget->getView(), 'getUrl')) {
 
                     //create base url
-                    $url = $this->router->generate('victoire_core_page_show', ['_locale' => $attachedWidget->getView()->getLocale(), 'url' => $attachedWidget->getView()->getUrl()], $referenceType);
+                    $url = $this->router->generate('victoire_core_page_show', ['_locale' => $attachedWidget->getView()->getCurrentLocale(), 'url' => $attachedWidget->getView()->getUrl()], $referenceType);
 
                     //If widget in the same view
                     if (rtrim($this->request->getRequestUri(), '/') == rtrim($url, '/')) {
@@ -153,7 +153,7 @@ public function victoireLink($parameters, $label, $attr = [], $currentClass = 'a
         $attachedWidget = isset($parameters[Link::TYPE_WIDGET]) ? $parameters[Link::TYPE_WIDGET] : null;
 
         if ($parameters['linkType'] == Link::TYPE_WIDGET && $attachedWidget && method_exists($attachedWidget->getView(), 'getUrl')) {
-            $viewUrl = $this->router->generate('victoire_core_page_show', ['_locale' => $attachedWidget->getView()->getLocale(), 'url' => $attachedWidget->getView()->getUrl()], $referenceLink);
+            $viewUrl = $this->router->generate('victoire_core_page_show', ['_locale' => $attachedWidget->getView()->getCurrentLocale(), 'url' => $attachedWidget->getView()->getUrl()], $referenceLink);
             if (rtrim($this->request->getRequestUri(), '/') == rtrim($viewUrl, '/')) {
                 $attr['data-scroll'] = 'smooth';
             }
@@ -223,7 +223,7 @@ public function victoireBusinessLink($businessEntityInstance, $templateId = null
             'route'           => 'victoire_core_page_show',
             'routeParameters' => [
                 'url'     => $page->getReference()->getUrl(),
-                '_locale' => $page->getLocale(),
+                '_locale' => $page->getCurrentLocale(),
             ],
             'referenceType' => $referenceType,
         ];
diff --git a/Tests/Features/Blog/create.feature b/Tests/Features/Blog/create.feature
index ec5de8669..da06898e9 100644
--- a/Tests/Features/Blog/create.feature
+++ b/Tests/Features/Blog/create.feature
@@ -2,8 +2,7 @@
 Feature: Create a blog
 
 Background:
-    Given I am logged in as "anakin@victoire.io"
-    And I maximize the window
+    Given I maximize the window
     And I am on homepage
 
     Scenario: I create a new blog
diff --git a/Tests/Features/Blog/delete.feature b/Tests/Features/Blog/delete.feature
index f5baad684..c1a5a52a2 100644
--- a/Tests/Features/Blog/delete.feature
+++ b/Tests/Features/Blog/delete.feature
@@ -2,8 +2,8 @@
 Feature: Delete a blog (and article)
 
 Background:
-    Given I am logged in as "anakin@victoire.io"
-    And I maximize the window
+    Given I maximize the window
+    And I am on homepage
 
     Scenario: I can delete a blog article
         Given I am on "/fr/the-jedi-network/i-m-your-father"
diff --git a/Tests/Features/BusinessEntityPage/create.feature b/Tests/Features/BusinessEntityPage/create.feature
index b98d26292..d677c0957 100644
--- a/Tests/Features/BusinessEntityPage/create.feature
+++ b/Tests/Features/BusinessEntityPage/create.feature
@@ -2,12 +2,12 @@
 Feature: Create business entity pages
 
     Background:
-        Given I am logged in as "anakin@victoire.io"
-        And the following Jedis:
+        Given the following Jedis:
             | name   | side   | midiChlorians | slug   |
             | Anakin | dark   | 20000         | anakin |
             | Yoda   | bright | 17500         | yoda   |
         And I maximize the window
+        And I am on homepage
 
     @smartStep
     Scenario: I can create a new Business entity page pattern and create some content in the pattern
diff --git a/Tests/Features/BusinessEntityPage/delete.feature b/Tests/Features/BusinessEntityPage/delete.feature
index fee14f37c..0c43f0791 100644
--- a/Tests/Features/BusinessEntityPage/delete.feature
+++ b/Tests/Features/BusinessEntityPage/delete.feature
@@ -2,12 +2,12 @@
 Feature: Create business entity pages
 
     Background:
-        Given I am logged in as "anakin@victoire.io"
-        And the following Jedis:
+        Given the following Jedis:
             | name   | side   | midiChlorians | slug   |
             | Anakin | dark   | 20000         | anakin |
             | Yoda   | bright | 17500         | yoda   |
         And I maximize the window
+        And I am on homepage
 
     Scenario: I can delete an BE and his BEP
         Given I open the hamburger menu
diff --git a/Tests/Features/BusinessEntityPage/jedi.feature b/Tests/Features/BusinessEntityPage/jedi.feature
index d634a3ffc..ab5f4911d 100644
--- a/Tests/Features/BusinessEntityPage/jedi.feature
+++ b/Tests/Features/BusinessEntityPage/jedi.feature
@@ -2,8 +2,8 @@
 Feature: Manage jedis
 
     Background:
-        Given I am logged in as "anakin@victoire.io"
-        And I maximize the window
+        Given I maximize the window
+        And I am on homepage
 
     Scenario: I can list jedis
         Given the following Jedis:
diff --git a/Tests/Features/BusinessEntityPage/parentIsPattern.feature b/Tests/Features/BusinessEntityPage/parentIsPattern.feature
index db650ccd8..e821676e4 100644
--- a/Tests/Features/BusinessEntityPage/parentIsPattern.feature
+++ b/Tests/Features/BusinessEntityPage/parentIsPattern.feature
@@ -2,8 +2,8 @@
 Feature: Mercenary is not a BusinessEntity itself but extends Character which is one
 
     Background:
-        Given I am logged in as "anakin@victoire.io"
-        And I maximize the window
+        Given I maximize the window
+        And I am on homepage
 
     Scenario: I can view the mercenary show view
         Given the following Mercenaries:
diff --git a/Tests/Features/Context/VictoireContext.php b/Tests/Features/Context/VictoireContext.php
index c00f53071..20bad845e 100644
--- a/Tests/Features/Context/VictoireContext.php
+++ b/Tests/Features/Context/VictoireContext.php
@@ -114,13 +114,8 @@ public function iFollowTheTab($name)
      */
     public function iSubmitTheWidget()
     {
-        $element = $this->findOrRetry($this->getSession()->getPage(), 'xpath', 'descendant-or-self::a[@data-modal="create-bulk"]');
-        if (!$element) {
-            $element = $this->getSession()->getPage()->find('xpath', 'descendant-or-self::a[@data-modal="update-bulk"]');
-        }
-        if (!$element) {
-            $element = $this->getSession()->getPage()->find('xpath', 'descendant-or-self::a[@data-modal="create"]');
-        }
+        $element = $this->getSession()->getPage()->find('xpath', 'descendant-or-self::a[@data-modal="create"]');
+
         if (!$element) {
             $element = $this->getSession()->getPage()->find('xpath', 'descendant-or-self::a[@data-modal="update"]');
         }
diff --git a/Tests/Features/Page/create.feature b/Tests/Features/Page/create.feature
index 44e2074a4..65d9c7a17 100644
--- a/Tests/Features/Page/create.feature
+++ b/Tests/Features/Page/create.feature
@@ -2,8 +2,8 @@
 Feature: Create a page
 
 Background:
-    Given I am logged in as "anakin@victoire.io"
-    And I maximize the window
+    Given I maximize the window
+    And I am on homepage
 
   @smartStep
 Scenario: I can create a new page
diff --git a/Tests/Features/Page/delete.feature b/Tests/Features/Page/delete.feature
index 3c1e0b0ea..1e812a3e0 100644
--- a/Tests/Features/Page/delete.feature
+++ b/Tests/Features/Page/delete.feature
@@ -2,8 +2,8 @@
 Feature: Delete a page
 
 Background:
-    Given I am logged in as "anakin@victoire.io"
-    And I maximize the window
+    Given I maximize the window
+    And I am on homepage
 
 Scenario: I can delete a new page
     Given I am on "/fr/test"
diff --git a/Tests/Features/Page/seo.feature b/Tests/Features/Page/seo.feature
index b888af5ba..79dc4680f 100644
--- a/Tests/Features/Page/seo.feature
+++ b/Tests/Features/Page/seo.feature
@@ -2,8 +2,8 @@
 Feature: Create a seo
 
 Background:
-    Given I am logged in as "anakin@victoire.io"
-    And I maximize the window
+    Given I maximize the window
+    And I am on homepage
 
 Scenario: I can add a seo
     Given I can create a new page
diff --git a/Tests/Features/Page/sitemap.feature b/Tests/Features/Page/sitemap.feature
index 7d34e844e..422593052 100644
--- a/Tests/Features/Page/sitemap.feature
+++ b/Tests/Features/Page/sitemap.feature
@@ -2,8 +2,8 @@
 Feature: Manage sitemap
 
   Background:
-    Given I am logged in as "anakin@victoire.io"
-    And I maximize the window
+    Given I maximize the window
+    And I am on homepage
 
   @smartStep
   Scenario: I can create a child for a page
diff --git a/Tests/Features/Widget/asynchronousWidget.feature b/Tests/Features/Widget/asynchronousWidget.feature
index 42d9a4631..d0e50a2a2 100644
--- a/Tests/Features/Widget/asynchronousWidget.feature
+++ b/Tests/Features/Widget/asynchronousWidget.feature
@@ -2,7 +2,8 @@
 Feature: Test asynchronous widget
 
   Background:
-    Given I am logged in as "anakin@victoire.io"
+    Given I maximize the window
+    And I am on homepage
 
   Scenario: I create an asynchronous widget
     When I switch to "layout" mode
diff --git a/Tests/Features/Widget/delete.feature b/Tests/Features/Widget/delete.feature
index e7a78d1f7..22cf975b1 100644
--- a/Tests/Features/Widget/delete.feature
+++ b/Tests/Features/Widget/delete.feature
@@ -1,8 +1,9 @@
 @mink:selenium2 @alice(Page) @reset-schema
 Feature: Delete a widget
 
-Background:
-    Given I am logged in as "anakin@victoire.io"
+    Background:
+        Given I maximize the window
+        And I am on homepage
 
 Scenario: Abort Delete
     Then I switch to "layout" mode
diff --git a/Tests/Features/Widget/edit.feature b/Tests/Features/Widget/edit.feature
index 8fec780e8..72863515a 100644
--- a/Tests/Features/Widget/edit.feature
+++ b/Tests/Features/Widget/edit.feature
@@ -2,12 +2,12 @@
 Feature: Edit a widget
 
     Background:
-        Given I am logged in as "anakin@victoire.io"
-        And the following Jedis:
+        Given the following Jedis:
             | name   | side   | midiChlorians | slug   |
             | Anakin | dark   | 20000         | anakin |
             | Yoda   | bright | 17500         | yoda   |
         And I maximize the window
+        And I am on homepage
         Given I open the hamburger menu
         Then I should see "Représentation métier"
         When I follow "Représentation métier"
diff --git a/Tests/Features/Widget/stilyze.feature b/Tests/Features/Widget/stilyze.feature
index 16715b10d..b67a34039 100644
--- a/Tests/Features/Widget/stilyze.feature
+++ b/Tests/Features/Widget/stilyze.feature
@@ -3,7 +3,7 @@ Feature: Stylize a widget
 
   Background:
     Given I maximize the window
-    And I am logged in as "anakin@victoire.io"
+    And I am on homepage
 
   Scenario: Change color for small device
     When I switch to "layout" mode
diff --git a/Tests/Features/Widget/widget.feature.todo b/Tests/Features/Widget/widget.feature.todo
index 4437860d2..45fc1125a 100644
--- a/Tests/Features/Widget/widget.feature.todo
+++ b/Tests/Features/Widget/widget.feature.todo
@@ -1,9 +1,6 @@
 @javascript
 Feature: Widget
 
-Background:
-    Given I am logged in as "anakin@victoire.io"
-
 Scenario: Create widgets
 
     Given the following pages:
diff --git a/Tests/Features/WidgetMap/widgetMap.feature b/Tests/Features/WidgetMap/widgetMap.feature
index 73ff70aaf..f74dd1f85 100644
--- a/Tests/Features/WidgetMap/widgetMap.feature
+++ b/Tests/Features/WidgetMap/widgetMap.feature
@@ -1,9 +1,9 @@
 @mink:selenium2 @alice(Page) @reset-schema
 Feature: Test widgetMap
 
-Background:
-    Given I am logged in as "anakin@victoire.io"
-
+  Background:
+    Given I maximize the window
+    And I am on homepage
 @reset-schema
 Scenario: I move up a widget
   Given the following WidgetMaps:
diff --git a/Tests/Features/authentication.feature b/Tests/Features/authentication.feature
index 2be308605..b67b8eb08 100644
--- a/Tests/Features/authentication.feature
+++ b/Tests/Features/authentication.feature
@@ -5,10 +5,10 @@ Feature: Authentication
         When I fill in "Adresse email" with "anakin@victoire.io"
         And I fill in "Mot de passe" with "test"
         And I press "Embarquer"
-        Then I should be on "/fr/"
+        Then I should be on "/"
     Scenario: Login as a wrong user
         Given I am on "/login"
         When I fill in "Adresse email" with "wrong@email.com"
         And I fill in "Mot de passe" with "something"
         And I press "Embarquer"
-        Then I should see "Bad credentials"
\ No newline at end of file
+        Then I should see "Bad credentials"
diff --git a/Tests/Functionnal/app/config/config_test.yml b/Tests/Functionnal/app/config/config_test.yml
index f80fec9e9..8f836570b 100644
--- a/Tests/Functionnal/app/config/config_test.yml
+++ b/Tests/Functionnal/app/config/config_test.yml
@@ -105,8 +105,8 @@ security:
             id: fos_user.user_provider.username
 
     firewalls:
-        main:
-            pattern: ^/
+        login:
+            pattern: ^/login*
             form_login:
                 provider:        fos_userbundle
                 csrf_provider:   form.csrf_provider
@@ -116,6 +116,9 @@ security:
             logout: true
             anonymous: true
             switch_user: ~
+        main:
+            pattern: ^/
+            http_basic: ~
     access_control:
         - { path: ^/admin/, role: ROLE_ADMIN }
 
diff --git a/behat.yml.dist b/behat.yml.dist
index 3f7057155..5c2b88ac3 100644
--- a/behat.yml.dist
+++ b/behat.yml.dist
@@ -30,7 +30,7 @@ default:
              directory: fails
              screenshot: true
          Behat\MinkExtension\ServiceContainer\MinkExtension:
-             base_url:           'http://fr.victoire.io:8000'
+             base_url:           'http://anakin@victoire.io:test@fr.victoire.io:8000'
              selenium2:          ~
              goutte:             ~
              symfony2: ~