diff --git a/admin.php b/admin.php
index fdfb48e..cadf7de 100644
--- a/admin.php
+++ b/admin.php
@@ -134,11 +134,13 @@ $template->assign(array(
   'MAIN_CACHE_STATUS_URL' => get_absolute_root_url(true).'plugins/'.BRATONIEN_TOOLS_ID.'/main-cache-status.php',
 ));
 
+$template->set_filename('admin_tabs_content', BRATONIEN_TOOLS_PATH . 'template/admin_tabs.tpl');
 $template->set_filename('plugin_admin_content', BRATONIEN_TOOLS_PATH . 'template/admin.tpl');
-$template->assign_var_from_handle('ADMIN_CONTENT', 'plugin_admin_content');
-
 $template->set_filename('public_selection_admin_content', BRATONIEN_TOOLS_PATH . 'template/public_selection_admin.tpl');
-$template->concat('ADMIN_CONTENT', $template->parse('public_selection_admin_content', true));
-
 $template->set_filename('asset_manager_admin_content', BRATONIEN_TOOLS_PATH . 'template/asset_manager_admin.tpl');
-$template->concat('ADMIN_CONTENT', $template->parse('asset_manager_admin_content', true));
+
+$admin_content = $template->parse('admin_tabs_content', true);
+$admin_content .= $template->parse('plugin_admin_content', true);
+$admin_content .= $template->parse('public_selection_admin_content', true);
+$admin_content .= $template->parse('asset_manager_admin_content', true);
+$template->assign('ADMIN_CONTENT', $admin_content);