diff --git a/core/lib/Thelia/Command/BaseModuleGenerate.php b/core/lib/Thelia/Command/BaseModuleGenerate.php
index 1a27d9e4c..7d487d4cc 100755
--- a/core/lib/Thelia/Command/BaseModuleGenerate.php
+++ b/core/lib/Thelia/Command/BaseModuleGenerate.php
@@ -42,7 +42,7 @@ abstract class BaseModuleGenerate extends ContainerAwareCommand
          'Config',
          'Model',
          'Loop',
-         'AdminModule'
+         'AdminIncludes'
      );
 
      protected function verifyExistingModule()
diff --git a/core/lib/Thelia/Core/Template/Smarty/Plugins/Module.php b/core/lib/Thelia/Core/Template/Smarty/Plugins/Module.php
index 23f9ed231..beb9a6b25 100755
--- a/core/lib/Thelia/Core/Template/Smarty/Plugins/Module.php
+++ b/core/lib/Thelia/Core/Template/Smarty/Plugins/Module.php
@@ -47,7 +47,7 @@ class Module extends AbstractSmartyPlugin
 
             foreach ($modules as $module) {
 
-                $file = THELIA_MODULE_DIR . "/". ucfirst($module->getCode()) . "/ModuleAdmin/".$location.".html";
+                $file = THELIA_MODULE_DIR . "/". ucfirst($module->getCode()) . "/AdminIncludes/".$location.".html";
                 if(file_exists($file)) {
                     $content .= file_get_contents($file);
                 }
diff --git a/local/modules/TheliaDebugBar/AdminIncludes/footer_js.html b/local/modules/TheliaDebugBar/AdminIncludes/footer_js.html
new file mode 100644
index 000000000..52b154116
--- /dev/null
+++ b/local/modules/TheliaDebugBar/AdminIncludes/footer_js.html
@@ -0,0 +1,2 @@
+{debugbar_renderjs}
+{debugbar_renderresult}
diff --git a/local/modules/TheliaDebugBar/AdminIncludes/head_css.html b/local/modules/TheliaDebugBar/AdminIncludes/head_css.html
new file mode 100644
index 000000000..23d047f7e
--- /dev/null
+++ b/local/modules/TheliaDebugBar/AdminIncludes/head_css.html
@@ -0,0 +1,3 @@
+{* Include debug bar smarty calls *}
+
+{debugbar_rendercss}
\ No newline at end of file
diff --git a/templates/admin/default/admin-layout.tpl b/templates/admin/default/admin-layout.tpl
index d2081d829..e84084513 100644
--- a/templates/admin/default/admin-layout.tpl
+++ b/templates/admin/default/admin-layout.tpl
@@ -26,8 +26,6 @@
         <link rel="stylesheet" href="{$asset_url}">
     {/stylesheets}
 
-    {debugbar_rendercss}
-
     {block name="after-bootstrap-css"}{/block}
 
     {* -- Admin CSS section ------------------------------------------------- *}
@@ -245,11 +243,6 @@
         }
     </script>
 
-
-
-    {debugbar_renderjs}
-    {debugbar_renderresult}
-
 	{block name="after-javascript-include"}{/block}
 
     {javascripts file='assets/js/bootstrap/bootstrap.js'}
diff --git a/templates/admin/default/configuration.html b/templates/admin/default/configuration.html
index ff9622c45..d0e3c880c 100644
--- a/templates/admin/default/configuration.html
+++ b/templates/admin/default/configuration.html
@@ -165,12 +165,12 @@
                                     </tr>
                                 {/loop}
 
-{*                                {loop type="auth" name="pcc8" role="ADMIN" resource="admin.configuration.system-logs" access="VIEW"}
+                                {loop type="auth" name="pcc8" role="ADMIN" resource="admin.configuration.system-logs" access="VIEW"}
                                     <tr>
                                         <td><a href="{url path='/admin/configuration/system_logs'}">{intl l='System logs'}</a></td>
                                         <td><a class="btn btn-default btn-xs" href="{url path='/admin/configuration/system_logs'}"><i class="glyphicon glyphicon-edit"></i></a></td>
                                     </tr>
-                                {/loop}*}
+                                {/loop}
 
                                 {module_include location='system_configuration_bottom'}
                             </table>