diff --git a/pandora_console/ChangeLog b/pandora_console/ChangeLog
index 9a6d1bced5..2608ae8dcb 100644
--- a/pandora_console/ChangeLog
+++ b/pandora_console/ChangeLog
@@ -1,3 +1,14 @@
+2012-09-27  Sergio Martin <sergio.martin@artica.es>
+
+	* include/functions_menu.php
+	index.php
+	operation/menu.php
+	godmode/agentes/modificar_agente.php
+	godmode/menu.php: Fixed some pages to ACL Enterprise
+	and the full screen pages loading menu structure when is not
+	shown
+	Merged from 4.0.x
+
 2012-09-26  Sergio Martin <sergio.martin@artica.es>
 
 	* include/functions_menu.php
diff --git a/pandora_console/godmode/agentes/modificar_agente.php b/pandora_console/godmode/agentes/modificar_agente.php
index a6a90d5918..b9a9465ffe 100644
--- a/pandora_console/godmode/agentes/modificar_agente.php
+++ b/pandora_console/godmode/agentes/modificar_agente.php
@@ -68,7 +68,7 @@ if (!empty($agent_to_delete)) {
 $tab = 'view';
 
 /* Setup tab */
-$viewtab['text'] = '<a href="index.php?sec=gagente&sec2=operation/agentes/estado_agente">' 
+$viewtab['text'] = '<a href="index.php?sec=estado&sec2=operation/agentes/estado_agente">' 
 		. html_print_image ("images/zoom.png", true, array ("title" =>__('View')))
 		. '</a>';
 		
diff --git a/pandora_console/godmode/menu.php b/pandora_console/godmode/menu.php
index 357fab407b..b9bd3eff3e 100644
--- a/pandora_console/godmode/menu.php
+++ b/pandora_console/godmode/menu.php
@@ -295,5 +295,7 @@ if (check_acl ($config['id_user'], 0, "PM")) {
 	}
 }
 
-menu_print_menu ($menu_godmode);
+if(!$config['pure']) {
+	menu_print_menu ($menu_godmode);
+}
 ?>
\ No newline at end of file
diff --git a/pandora_console/include/functions_menu.php b/pandora_console/include/functions_menu.php
index ff2ea88987..d965ecd88c 100644
--- a/pandora_console/include/functions_menu.php
+++ b/pandora_console/include/functions_menu.php
@@ -377,6 +377,12 @@ function menu_add_extras(&$menu) {
 	$menu_extra['galertas']['sub']['godmode/alerts/configure_alert_compound']['text'] = __('Manage compound alerts');
 	$menu_extra['galertas']['sub']['enterprise/godmode/alerts/alert_events']['text'] = __('Manage event alerts');
 	$menu_extra['gservers']['sub']['enterprise/godmode/servers/manage_export_form']['text'] = __('Manage export targets');
+	$menu_extra['estado']['sub']['enterprise/godmode/services/manage_services']['text'] = __('Manage services');
+	$menu_extra['estado']['sub']['godmode/snmpconsole/snmp_alert']['text'] = __('SNMP alerts');
+	$menu_extra['estado']['sub']['godmode/snmpconsole/snmp_filters']['text'] = __('SNMP filters');
+	$menu_extra['estado']['sub']['enterprise/godmode/snmpconsole/snmp_trap_editor']['text'] = __('SNMP trap editor');
+	$menu_extra['estado']['sub']['godmode/snmpconsole/snmp_trap_generator']['text'] = __('SNMP trap generator');
+	$menu_extra['workspace']['sub']['operation/incidents/incident_detail']['text'] = __('Manage incident');
 	
 	// Duplicate extensions as sec=extension to check it from url
 	foreach ($menu as $k => $m) {
diff --git a/pandora_console/index.php b/pandora_console/index.php
index 83485b57f3..5673be8454 100644
--- a/pandora_console/index.php
+++ b/pandora_console/index.php
@@ -407,9 +407,11 @@ if ($config["pure"] == 0) {
 }
 else {
 	echo '<div id="main_pure">';
+	// Require menu only to build structure to use it in ACLs
+	require ("operation/menu.php");
+	require ("godmode/menu.php");
 }
 
-
 // http://es2.php.net/manual/en/ref.session.php#64525
 // Session locking concurrency speedup!
 session_write_close (); 
diff --git a/pandora_console/operation/menu.php b/pandora_console/operation/menu.php
index 34d9a1960e..011b1cabae 100644
--- a/pandora_console/operation/menu.php
+++ b/pandora_console/operation/menu.php
@@ -397,5 +397,7 @@ if (check_acl ($config['id_user'], 0, "AR")) {
 // Save operation menu array to use in operation/extensions.php view
 $operation_menu_array = $menu_operation;
 
-menu_print_menu ($menu_operation, true);
+if(!$config['pure']) {
+	menu_print_menu ($menu_operation, true);
+}
 ?>
\ No newline at end of file