diff --git a/src/ninegate-1.0/src/Cadoles/PortalBundle/Controller/BlogController.php b/src/ninegate-1.0/src/Cadoles/PortalBundle/Controller/BlogController.php
index 1d1953b9..27a0102f 100644
--- a/src/ninegate-1.0/src/Cadoles/PortalBundle/Controller/BlogController.php
+++ b/src/ninegate-1.0/src/Cadoles/PortalBundle/Controller/BlogController.php
@@ -112,8 +112,9 @@ class BlogController extends Controller
         foreach($datas as $data) {
             $route=str_replace("_config_","_".$access."_",$this->routeprimary);
             $action = "";
+            $action.="<a href='".$this->generateUrl($route.'_update', array('id'=>$data->getId()))."'><i class='fa fa-gear fa-fw fa-2x'></i></a>";
+            $action.="<a href='".$this->generateUrl($route.'_view', array('id'=>$data->getId()))."'><i class='fa fa-eye fa-fw fa-2x'></i></a>";
             $action.="<a href='".$this->generateUrl($route.'_delete', array('id'=>$data->getId()))."' data-method='delete'><i class='fa fa-trash fa-fw fa-2x'></i></a>";
-            $action.="<a href='".$this->generateUrl($route.'_view', array('id'=>$data->getId()))."'><i class='fa fa-eye fa-2x'></i></a>";
 
             $user="";
             if($data->getUser()) {
diff --git a/src/ninegate-1.0/src/Cadoles/PortalBundle/Controller/CalendarController.php b/src/ninegate-1.0/src/Cadoles/PortalBundle/Controller/CalendarController.php
index 48f3fd6a..21b90872 100644
--- a/src/ninegate-1.0/src/Cadoles/PortalBundle/Controller/CalendarController.php
+++ b/src/ninegate-1.0/src/Cadoles/PortalBundle/Controller/CalendarController.php
@@ -109,8 +109,9 @@ class CalendarController extends Controller
         foreach($datas as $data) {
             $route=str_replace("_config_","_".$access."_",$this->routeprimary);
             $action = "";
+            $action.="<a href='".$this->generateUrl($route.'_update', array('id'=>$data->getId()))."'><i class='fa fa-gear fa-fw fa-2x'></i></a>";
+            $action.="<a href='".$this->generateUrl($route.'_view', array('id'=>$data->getId()))."'><i class='fa fa-eye fa-fw fa-2x'></i></a>";
             $action.="<a href='".$this->generateUrl($route.'_delete', array('id'=>$data->getId()))."' data-method='delete'><i class='fa fa-trash fa-fw fa-2x'></i></a>";
-            $action.="<a href='".$this->generateUrl($route.'_view', array('id'=>$data->getId()))."'><i class='fa fa-eye fa-2x'></i></a>";
 
             $user="";
             if($data->getUser()) {
diff --git a/src/ninegate-1.0/src/Cadoles/PortalBundle/Controller/PageController.php b/src/ninegate-1.0/src/Cadoles/PortalBundle/Controller/PageController.php
index 7ebc3683..23421f0e 100644
--- a/src/ninegate-1.0/src/Cadoles/PortalBundle/Controller/PageController.php
+++ b/src/ninegate-1.0/src/Cadoles/PortalBundle/Controller/PageController.php
@@ -123,8 +123,9 @@ class PageController extends Controller
             $route=str_replace("_config_","_".$access."_",$this->routeprimary);
             $action = "";
             //$action.="<a href='".$this->generateUrl($route.'_update', array('id'=>$data->getId()))."'><i class='fa fa-file fa-fw'></i></a>";
+            $action.="<a href='".$this->generateUrl($route.'_update', array('id'=>$data->getId()))."'><i class='fa fa-gear fa-fw fa-2x'></i></a>";
+            $action.="<a href='".$this->generateUrl($route.'_view', array('id'=>$data->getId()))."'><i class='fa fa-eye fa-fw fa-2x'></i></a>";
             $action.="<a href='".$this->generateUrl($route.'_delete', array('id'=>$data->getId()))."' data-method='delete'><i class='fa fa-trash fa-fw fa-2x'></i></a>";
-            $action.="<a href='".$this->generateUrl($route.'_view', array('id'=>$data->getId()))."'><i class='fa fa-eye fa-2x'></i></a>";
 
             $user="";
             if($data->getUser()) {
diff --git a/src/ninegate-1.0/src/Cadoles/PortalBundle/Controller/PagetemplateController.php b/src/ninegate-1.0/src/Cadoles/PortalBundle/Controller/PagetemplateController.php
index 4377507f..26f55706 100644
--- a/src/ninegate-1.0/src/Cadoles/PortalBundle/Controller/PagetemplateController.php
+++ b/src/ninegate-1.0/src/Cadoles/PortalBundle/Controller/PagetemplateController.php
@@ -102,9 +102,9 @@ class PagetemplateController extends Controller
 
             $route=str_replace("_config_","_".$access."_",$this->routeprimary);
             $action = "";
-            //$action.="<a href='".$this->generateUrl($route.'_update', array('id'=>$data->getId()))."'><i class='fa fa-file fa-fw'></i></a>";
+            $action.="<a href='".$this->generateUrl($route.'_update', array('id'=>$data->getId()))."'><i class='fa fa-gear fa-fw fa-2x'></i></a>";
+            $action.="<a href='".$this->generateUrl($route.'_view', array('id'=>$data->getId()))."'><i class='fa fa-eye fa-fw fa-2x'></i></a>";
             $action.="<a href='".$this->generateUrl($route.'_delete', array('id'=>$data->getId()))."' data-method='delete'><i class='fa fa-trash fa-fw fa-2x'></i></a>";
-            $action.="<a href='".$this->generateUrl($route.'_view', array('id'=>$data->getId()))."'><i class='fa fa-eye fa-2x'></i></a>";
 
             array_push($output["data"],[
                 $action,
diff --git a/src/ninegate-1.0/src/Cadoles/PortalBundle/Controller/PagewidgetController.php b/src/ninegate-1.0/src/Cadoles/PortalBundle/Controller/PagewidgetController.php
index e94e3132..5cb7ee85 100644
--- a/src/ninegate-1.0/src/Cadoles/PortalBundle/Controller/PagewidgetController.php
+++ b/src/ninegate-1.0/src/Cadoles/PortalBundle/Controller/PagewidgetController.php
@@ -1603,7 +1603,7 @@ class PagewidgetController extends Controller
         $entity = $em->getRepository($this->labelentity)->find($id);
         if (!$entity) throw $this->createNotFoundException('Unable to find entity.');
 
-        $groupentity=$em->getRepository("CadolesCoreBundle:Group")->find($group);
+        if($group) $groupentity=$em->getRepository("CadolesCoreBundle:Group")->find($group);
 
         // Permissions
         if($access=="config") {
diff --git a/src/ninegate-1.0/src/Cadoles/PortalBundle/Controller/ProjectController.php b/src/ninegate-1.0/src/Cadoles/PortalBundle/Controller/ProjectController.php
index 896560e0..08c9c6d7 100644
--- a/src/ninegate-1.0/src/Cadoles/PortalBundle/Controller/ProjectController.php
+++ b/src/ninegate-1.0/src/Cadoles/PortalBundle/Controller/ProjectController.php
@@ -112,8 +112,10 @@ class ProjectController extends Controller
         foreach($datas as $data) {
             $route=str_replace("_config_","_".$access."_",$this->routeprimary);
             $action = "";
+            $action.="<a href='".$this->generateUrl($route.'_update', array('id'=>$data->getId()))."'><i class='fa fa-gear fa-fw fa-2x'></i></a>";
+            $action.="<a href='".$this->generateUrl($route.'_view', array('id'=>$data->getId()))."'><i class='fa fa-eye fa-fw fa-2x'></i></a>";
             $action.="<a href='".$this->generateUrl($route.'_delete', array('id'=>$data->getId()))."' data-method='delete'><i class='fa fa-trash fa-fw fa-2x'></i></a>";
-            $action.="<a href='".$this->generateUrl($route.'_view', array('id'=>$data->getId()))."'><i class='fa fa-eye fa-2x'></i></a>";
+            
 
             $user="";
             if($data->getUser()) {
diff --git a/src/ninegate-1.0/src/Cadoles/PortalBundle/Resources/views/Blog/list.html.twig b/src/ninegate-1.0/src/Cadoles/PortalBundle/Resources/views/Blog/list.html.twig
index d6067700..a43be08d 100644
--- a/src/ninegate-1.0/src/Cadoles/PortalBundle/Resources/views/Blog/list.html.twig
+++ b/src/ninegate-1.0/src/Cadoles/PortalBundle/Resources/views/Blog/list.html.twig
@@ -24,7 +24,7 @@
                 <table class="table table-striped table-bordered table-hover" id="dataTables" style="width:100%">
                     <thead>
                         <tr>
-                        <th width="100px" class="no-sort">Action</th>
+                        <th width="120px" class="no-sort">Action</th>
                         <th>Nom</th>
                         <th>Propriétaire</th>
                         </tr>
diff --git a/src/ninegate-1.0/src/Cadoles/PortalBundle/Resources/views/Blog/view.html.twig b/src/ninegate-1.0/src/Cadoles/PortalBundle/Resources/views/Blog/view.html.twig
index 559e32d5..2f8b4faf 100644
--- a/src/ninegate-1.0/src/Cadoles/PortalBundle/Resources/views/Blog/view.html.twig
+++ b/src/ninegate-1.0/src/Cadoles/PortalBundle/Resources/views/Blog/view.html.twig
@@ -6,7 +6,7 @@
     {% if access=="config" %}
         <div class="pagemenu">
             <a href="{{ path('cadoles_portal_config_blog_view', {id:entity.id})}}">{{ entity.name }}</a>
-            <a href='{{ path('cadoles_portal_config_blog_update', {id:entity.id}) }}' title='Modifier'><i class='fa fa-file fa-fw'></i></a>
+            <a href='{{ path('cadoles_portal_config_blog_update', {id:entity.id}) }}' title='Modifier'><i class='fa fa-gear fa-fw'></i></a>
             <a href='{{ path('cadoles_portal_config_blog_writer', {id:entity.id}) }}' title='Permission'><i class='fa fa-users fa-fw'></i></a>
             <a href='{{ path('cadoles_portal_config_blog_delete', { id: entity.id }) }}' data-method='delete' data-confirm='Êtes-vous sûr de vouloir supprimer ?' title='Supprimer'><i class='fa fa-trash fa-fw'></i></a>
         </div>
diff --git a/src/ninegate-1.0/src/Cadoles/PortalBundle/Resources/views/Calendar/list.html.twig b/src/ninegate-1.0/src/Cadoles/PortalBundle/Resources/views/Calendar/list.html.twig
index 0f92d536..3833cb22 100644
--- a/src/ninegate-1.0/src/Cadoles/PortalBundle/Resources/views/Calendar/list.html.twig
+++ b/src/ninegate-1.0/src/Cadoles/PortalBundle/Resources/views/Calendar/list.html.twig
@@ -25,7 +25,7 @@
                 <table class="table table-striped table-bordered table-hover" id="dataTables" style="width:100%">
                     <thead>
                         <tr>
-                        <th width="100px" class="no-sort">Action</th>
+                        <th width="120px" class="no-sort">Action</th>
                         <th>Nom</th>
                         <th>Propriétaire</th>
                         </tr>
diff --git a/src/ninegate-1.0/src/Cadoles/PortalBundle/Resources/views/Calendar/view.html.twig b/src/ninegate-1.0/src/Cadoles/PortalBundle/Resources/views/Calendar/view.html.twig
index 0b7b982b..f0fe5711 100644
--- a/src/ninegate-1.0/src/Cadoles/PortalBundle/Resources/views/Calendar/view.html.twig
+++ b/src/ninegate-1.0/src/Cadoles/PortalBundle/Resources/views/Calendar/view.html.twig
@@ -6,7 +6,7 @@
     {% if access=="config" %}
         <div class="pagemenu">
             <a href="{{ path('cadoles_portal_config_calendar_view', {id:entity.id})}}">{{ entity.name }}</a>
-            <a href='{{ path('cadoles_portal_config_calendar_update', {id:entity.id}) }}' title='Modifier le panel'><i class='fa fa-file fa-fw'></i></a>
+            <a href='{{ path('cadoles_portal_config_calendar_update', {id:entity.id}) }}' title='Modifier le panel'><i class='fa fa-gear fa-fw'></i></a>
             <a href='{{ path('cadoles_portal_config_calendar_delete', { id: entity.id }) }}' data-method='delete' data-confirm='Êtes-vous sûr de vouloir supprimer ?' title='Supprimer le panel'><i class='fa fa-trash fa-fw'></i></a>
         </div>
     {% else %}
diff --git a/src/ninegate-1.0/src/Cadoles/PortalBundle/Resources/views/Page/list.html.twig b/src/ninegate-1.0/src/Cadoles/PortalBundle/Resources/views/Page/list.html.twig
index 725c01a1..98b5da20 100644
--- a/src/ninegate-1.0/src/Cadoles/PortalBundle/Resources/views/Page/list.html.twig
+++ b/src/ninegate-1.0/src/Cadoles/PortalBundle/Resources/views/Page/list.html.twig
@@ -25,7 +25,7 @@
                 <table class="table table-striped table-bordered table-hover" id="dataTables" style="width:100%">
                     <thead>
                         <tr>
-                        <th width="100px" class="no-sort">Action</th>
+                        <th width="120px" class="no-sort">Action</th>
                         <th>Ordre</th>
                         <th>Nom</th>
                         <th class="no-sort">Catégorie</th>
diff --git a/src/ninegate-1.0/src/Cadoles/PortalBundle/Resources/views/Page/vieweditor.html.twig b/src/ninegate-1.0/src/Cadoles/PortalBundle/Resources/views/Page/vieweditor.html.twig
index aaf08c36..9f580b14 100644
--- a/src/ninegate-1.0/src/Cadoles/PortalBundle/Resources/views/Page/vieweditor.html.twig
+++ b/src/ninegate-1.0/src/Cadoles/PortalBundle/Resources/views/Page/vieweditor.html.twig
@@ -6,7 +6,7 @@
         <div class="pagemenu">
             <a href="{{ path('cadoles_portal_config_page_view', {id:entity.id})}}">{{ entity.name }}</a>
 
-            <a href='{{ path('cadoles_portal_config_page_update', {id:entity.id}) }}' title='Modifier le panel'><i class='fa fa-file fa-fw'></i></a>
+            <a href='{{ path('cadoles_portal_config_page_update', {id:entity.id}) }}' title='Modifier le panel'><i class='fa fa-gear fa-fw'></i></a>
             <a href='{{ path('cadoles_portal_config_page_delete', { id: entity.id }) }}' data-method='delete' data-confirm='Êtes-vous sûr de vouloir supprimer ?' title='Supprimer le panel'><i class='fa fa-trash fa-fw'></i></a>
         </div>
     {% endif %}  
diff --git a/src/ninegate-1.0/src/Cadoles/PortalBundle/Resources/views/Page/viewurl.html.twig b/src/ninegate-1.0/src/Cadoles/PortalBundle/Resources/views/Page/viewurl.html.twig
index e4882547..56cf7101 100644
--- a/src/ninegate-1.0/src/Cadoles/PortalBundle/Resources/views/Page/viewurl.html.twig
+++ b/src/ninegate-1.0/src/Cadoles/PortalBundle/Resources/views/Page/viewurl.html.twig
@@ -16,7 +16,7 @@
         <div class="pagemenu">
             <a href="{{ path('cadoles_portal_config_page_view', {id:entity.id})}}">{{ entity.name }}</a>
 
-            <a href='{{ path('cadoles_portal_config_page_update', {id:entity.id}) }}' title='Modifier le panel'><i class='fa fa-file fa-fw'></i></a>
+            <a href='{{ path('cadoles_portal_config_page_update', {id:entity.id}) }}' title='Modifier le panel'><i class='fa fa-gear fa-fw'></i></a>
             <a href='{{ path('cadoles_portal_config_page_delete', { id: entity.id }) }}' data-method='delete' data-confirm='Êtes-vous sûr de vouloir supprimer ?' title='Supprimer le panel'><i class='fa fa-trash fa-fw'></i></a>
         </div>
     {% endif %}        
diff --git a/src/ninegate-1.0/src/Cadoles/PortalBundle/Resources/views/Page/viewwidget.html.twig b/src/ninegate-1.0/src/Cadoles/PortalBundle/Resources/views/Page/viewwidget.html.twig
index 5d517012..8b7735f7 100644
--- a/src/ninegate-1.0/src/Cadoles/PortalBundle/Resources/views/Page/viewwidget.html.twig
+++ b/src/ninegate-1.0/src/Cadoles/PortalBundle/Resources/views/Page/viewwidget.html.twig
@@ -11,7 +11,7 @@
 
             <a href="{{ path('cadoles_portal_config_page'~template~'_view', {id:entity.id})}}">{{ entity.name }}</a>
 
-            <a href='{{ path('cadoles_portal_config_page'~template~'_update', {id:entity.id}) }}' title='Modifier le panel'><i class='fa fa-file fa-fw'></i></a>
+            <a href='{{ path('cadoles_portal_config_page'~template~'_update', {id:entity.id}) }}' title='Modifier le panel'><i class='fa fa-gear fa-fw'></i></a>
             <a href='{{ path('cadoles_portal_config_page'~template~'_delete', { id: entity.id }) }}' data-method='delete' data-confirm='Êtes-vous sûr de vouloir supprimer ?' title='Supprimer le panel'><i class='fa fa-trash fa-fw'></i></a>
             <a href='' style='cursor:pointer' data-toggle='modal' data-target='#selwidget' title='Ajouter un widget'><i class='fa fa-cubes fa-fw'></i></a>
         </div>
@@ -25,7 +25,7 @@
 
     <div id="tolocalize" style="display:none">
         {% for pagewidget in entity.pagewidgets %}
-            <!-- {{ url(pagewidget.widget.routeview|replace({'_config_':'_'~access~'_'}),{id:pagewidget.id,by:mode,usage:usage,group:group}) }} -->
+            <a href="{{ url(pagewidget.widget.routeview|replace({'_config_':'_'~access~'_'}),{id:pagewidget.id,by:mode,usage:usage,group:group}) }}"></a>
             {{ render(url(pagewidget.widget.routeview|replace({'_config_':'_'~access~'_'}),{id:pagewidget.id,by:mode,usage:usage,group:group})) }}
         {% endfor %}
     </div>
diff --git a/src/ninegate-1.0/src/Cadoles/PortalBundle/Resources/views/Pagetemplate/list.html.twig b/src/ninegate-1.0/src/Cadoles/PortalBundle/Resources/views/Pagetemplate/list.html.twig
index 6016dc14..33344547 100644
--- a/src/ninegate-1.0/src/Cadoles/PortalBundle/Resources/views/Pagetemplate/list.html.twig
+++ b/src/ninegate-1.0/src/Cadoles/PortalBundle/Resources/views/Pagetemplate/list.html.twig
@@ -29,7 +29,7 @@
                 <table class="table table-striped table-bordered table-hover" id="dataTables" style="width:100%">
                     <thead>
                         <tr>
-                        <th width="100px" class="no-sort">Action</th>
+                        <th width="120px" class="no-sort">Action</th>
                         <th>Ordre</th>
                         <th>Nom</th>
                         <th>Pour</th>
diff --git a/src/ninegate-1.0/src/Cadoles/PortalBundle/Resources/views/Project/list.html.twig b/src/ninegate-1.0/src/Cadoles/PortalBundle/Resources/views/Project/list.html.twig
index 278c4808..9fbb4c36 100644
--- a/src/ninegate-1.0/src/Cadoles/PortalBundle/Resources/views/Project/list.html.twig
+++ b/src/ninegate-1.0/src/Cadoles/PortalBundle/Resources/views/Project/list.html.twig
@@ -24,7 +24,7 @@
                 <table class="table table-striped table-bordered table-hover" id="dataTables" style="width:100%">
                     <thead>
                         <tr>
-                        <th width="100px" class="no-sort">Action</th>
+                        <th width="120px" class="no-sort">Action</th>
                         <th>Nom</th>
                         <th>Propriétaire</th>
                         </tr>
diff --git a/src/ninegate-1.0/src/Cadoles/PortalBundle/Resources/views/Project/view.html.twig b/src/ninegate-1.0/src/Cadoles/PortalBundle/Resources/views/Project/view.html.twig
index 131ed7ef..4d8c8a0b 100644
--- a/src/ninegate-1.0/src/Cadoles/PortalBundle/Resources/views/Project/view.html.twig
+++ b/src/ninegate-1.0/src/Cadoles/PortalBundle/Resources/views/Project/view.html.twig
@@ -7,7 +7,7 @@
     {% if access=="config" %}
         <div class="pagemenu">
             <a href="{{ path('cadoles_portal_config_project_view', {id:entity.id})}}">{{ entity.name }}</a>
-            <a href='{{ path('cadoles_portal_config_project_update', {id:entity.id}) }}' title='Modifier'><i class='fa fa-file fa-fw'></i></a>
+            <a href='{{ path('cadoles_portal_config_project_update', {id:entity.id}) }}' title='Modifier'><i class='fa fa-gear fa-fw'></i></a>
             <a href='{{ path('cadoles_portal_config_project_writer', {id:entity.id}) }}' title='Permission'><i class='fa fa-users fa-fw'></i></a>
             <a href='{{ path('cadoles_portal_config_project_delete', { id: entity.id }) }}' data-method='delete' data-confirm='Êtes-vous sûr de vouloir supprimer ?' title='Supprimer'><i class='fa fa-trash fa-fw'></i></a>
         </div>