diff --git a/pandora_console/ChangeLog b/pandora_console/ChangeLog
index f59408e4b1..cec6050506 100644
--- a/pandora_console/ChangeLog
+++ b/pandora_console/ChangeLog
@@ -1,3 +1,13 @@
+2012-07-04  Sergio Martin <sergio.martin@artica.es>
+
+	* include/functions_menu.php
+	operation/agentes/estado_monitores.php
+	operation/snmpconsole/snmp_view.php
+	operation/users/user_edit.php
+	images/skin/skin_default/include/styles/pandora.css
+	general/header.php: Fixes of missed "sec" changes in the new
+	menus and a little hack of the classify of retrieved menus
+
 2012-07-03 Miguel de Dios <miguel.dedios@artica.es>
 	
 	* ajax.php: added support for the enterprise, because some case
diff --git a/pandora_console/general/header.php b/pandora_console/general/header.php
index 72c4281990..4557f4e568 100644
--- a/pandora_console/general/header.php
+++ b/pandora_console/general/header.php
@@ -49,7 +49,7 @@ config_check();
 				else
 					html_print_image("images/user_green.png" , false, array("class" => 'bot', "alt" => 'user'));
 			?>
-			<a href="index.php?sec=usuarios&amp;sec2=operation/users/user_edit" class="white"> [<b><?php echo $config["id_user"];?></b>]</a>
+			<a href="index.php?sec=workspace&amp;sec2=operation/users/user_edit" class="white"> [<b><?php echo $config["id_user"];?></b>]</a>
 			<?php
 			
 			if ($config["metaconsole"] == 0){
diff --git a/pandora_console/images/skin/skin_default/include/styles/pandora.css b/pandora_console/images/skin/skin_default/include/styles/pandora.css
index 219b893edb..1efff50801 100644
--- a/pandora_console/images/skin/skin_default/include/styles/pandora.css
+++ b/pandora_console/images/skin/skin_default/include/styles/pandora.css
@@ -1667,7 +1667,7 @@ div.warn {
 }
 
 
-/*#head a[href="index.php?sec=usuarios&sec2=operation/users/user_edit"] {
+/*#head a[href="index.php?sec=workspace&sec2=operation/users/user_edit"] {
 	display: block;
 	position: absolute;
 	top: 10px;
diff --git a/pandora_console/include/functions_menu.php b/pandora_console/include/functions_menu.php
index 2391638368..8f565eed03 100644
--- a/pandora_console/include/functions_menu.php
+++ b/pandora_console/include/functions_menu.php
@@ -350,7 +350,11 @@ function menu_get_sec($with_categories = false) {
 	foreach($menu as $k => $v) {
 		if($with_categories) {
 			if(!$in_godmode && $k[0] == 'g') {
-				$in_godmode = true;
+				// Hack to dont confuse with gis activated because godmode 
+				// sec starts with g (like gismaps)
+				if($k != 'gismaps') {
+					$in_godmode = true;
+				}
 			}
 			
 			if($in_godmode) {
@@ -389,7 +393,6 @@ function menu_get_sec_pages($sec,$menu_hash = false) {
 	else {
 		$menu = json_decode(base64_decode($menu_hash),true);
 	}
-	
 	// Get the sec2 of the main section
 	$sec2_array[$menu[$sec]['sec2']] = $menu[$sec]['text'];
 
diff --git a/pandora_console/operation/agentes/estado_monitores.php b/pandora_console/operation/agentes/estado_monitores.php
index a79c9a4184..456d46c0d9 100644
--- a/pandora_console/operation/agentes/estado_monitores.php
+++ b/pandora_console/operation/agentes/estado_monitores.php
@@ -306,7 +306,7 @@ foreach ($modules as $module) {
 	$data[2] = servers_show_type ($module['id_modulo']) . '&nbsp;';
 
 	if (check_acl ($config['id_user'], $id_grupo, "AW")) 
-	  $data[2] .= '<a href="index.php?sec=estado&amp;sec2=godmode/agentes/configurar_agente&amp;id_agente='.$id_agente.'&amp;tab=module&amp;id_agent_module='.$module["id_agente_modulo"].'&amp;edit_module='.$module["id_modulo"].'">' . html_print_image("images/config.png", true, array("alt" => '0', "border" => "")) . '</a>';
+	  $data[2] .= '<a href="index.php?sec=gagente&amp;sec2=godmode/agentes/configurar_agente&amp;id_agente='.$id_agente.'&amp;tab=module&amp;id_agent_module='.$module["id_agente_modulo"].'&amp;edit_module='.$module["id_modulo"].'">' . html_print_image("images/config.png", true, array("alt" => '0', "border" => "")) . '</a>';
 	  
 	$data[3] = ui_print_string_substr ($module["nombre"], 30, true);
 	if (!empty($module["extended_info"])) {
diff --git a/pandora_console/operation/snmpconsole/snmp_view.php b/pandora_console/operation/snmpconsole/snmp_view.php
index 0a9c163006..4ae3782200 100644
--- a/pandora_console/operation/snmpconsole/snmp_view.php
+++ b/pandora_console/operation/snmpconsole/snmp_view.php
@@ -489,7 +489,7 @@ if ($traps !== false) {
 		
 		//User
 		if (!empty ($trap["status"])) {
-			$data[5] = '<a href="index.php?sec=usuarios&sec2=operation/users/user_edit&ver='.$trap["id_usuario"].'">'.substr ($trap["id_usuario"], 0, 8).'</a>';
+			$data[5] = '<a href="index.php?sec=workspace&sec2=operation/users/user_edit&ver='.$trap["id_usuario"].'">'.substr ($trap["id_usuario"], 0, 8).'</a>';
 			if (!empty($trap["id_usuario"]))
 				$data[5] .= ui_print_help_tip(get_user_fullname($trap["id_usuario"]), true);
 		}
diff --git a/pandora_console/operation/users/user_edit.php b/pandora_console/operation/users/user_edit.php
index 450f4f35ce..6d9dbf557b 100644
--- a/pandora_console/operation/users/user_edit.php
+++ b/pandora_console/operation/users/user_edit.php
@@ -147,10 +147,10 @@ if (isset ($_GET["modified"]) && !$view_mode) {
 
 	// Reload page to update skin
        /* if ($return){
-                header ('location:' . $config['homeurl'] . '/index.php?sec=usuarios&sec2=operation/users/user_edit&status=1');
+                header ('location:' . $config['homeurl'] . '/index.php?sec=workspace&sec2=operation/users/user_edit&status=1');
         }
         else{
-                header ('location:' . $config['homeurl'] . '/index.php?sec=usuarios&sec2=operation/users/user_edit&status=0');
+                header ('location:' . $config['homeurl'] . '/index.php?sec=workspace&sec2=operation/users/user_edit&status=0');
         }*/
 
 	$user_info = $upd_info;
@@ -164,7 +164,7 @@ if ($status != -1){
 }
 
 
-echo '<form name="user_mod" method="post" action="index.php?sec=usuarios&amp;sec2=operation/users/user_edit&amp;modified=1&amp;id='.$id.'">';
+echo '<form name="user_mod" method="post" action="index.php?sec=workspace&amp;sec2=operation/users/user_edit&amp;modified=1&amp;id='.$id.'">';
 
 echo '<table cellpadding="4" cellspacing="4" class="databox" width="98%">';