diff --git a/pandora_console/ChangeLog b/pandora_console/ChangeLog
index 1093654b59..ceef4b7d79 100644
--- a/pandora_console/ChangeLog
+++ b/pandora_console/ChangeLog
@@ -1,3 +1,10 @@
+2011-12-07  Sergio Martin <sergio.martin@artica.es>
+
+	* operation/agentes/estado_agente.php
+	godmode/agentes/modificar_agente.php: Added tab on header in the
+	agent list views to navigate from operation to godmode sections
+	improving usability
+
 2011-12-07  Sergio Martin <sergio.martin@artica.es>
 
 	* include/functions_modules.php
diff --git a/pandora_console/godmode/agentes/modificar_agente.php b/pandora_console/godmode/agentes/modificar_agente.php
index 19340d7614..6b6fc1a56d 100644
--- a/pandora_console/godmode/agentes/modificar_agente.php
+++ b/pandora_console/godmode/agentes/modificar_agente.php
@@ -65,8 +65,23 @@ if (!empty($agent_to_delete)) {
 	}
 }
 
+// Prepare the tab system to the future
+$tab = 'view';
+
+/* Setup tab */
+$viewtab['text'] = '<a href="index.php?sec=estado&sec2=operation/agentes/estado_agente">' 
+		. html_print_image ("images/zoom.png", true, array ("title" =>__('View')))
+		. '</a>';
+		
+if($tab == 'view')
+	$viewtab['active'] = true;
+else
+	$viewtab['active'] = false;
+	
+$onheader = array('view' => $viewtab);
+
 // Header
-ui_print_page_header (__('Agent configuration')." &raquo; ".__('Agents defined in Pandora'), "", false, "", true);
+ui_print_page_header (__('Agent configuration')." &raquo; ".__('Agents defined in Pandora'), "", false, "", true, $onheader);
 
 if (isset($result)) {
 	ui_print_result_message($result, __('Success deleted agent.'), __('Could not be deleted.'));
diff --git a/pandora_console/operation/agentes/estado_agente.php b/pandora_console/operation/agentes/estado_agente.php
index 7f82a13a64..2a106d4af4 100644
--- a/pandora_console/operation/agentes/estado_agente.php
+++ b/pandora_console/operation/agentes/estado_agente.php
@@ -122,7 +122,26 @@ $refr = get_parameter('refr', 0);
 $recursion = get_parameter('recursion', 0);
 $status = (int) get_parameter ('status', -1);
 
-ui_print_page_header ( __("Agent detail"), "images/bricks.png", false, "agent_status");
+$onheader = array();
+
+if (check_acl ($config['id_user'], 0, "AW")) {
+	// Prepare the tab system to the future
+	$tab = 'setup';
+
+	/* Setup tab */
+	$setuptab['text'] = '<a href="index.php?sec=gagente&sec2=godmode/agentes/modificar_agente">' 
+			. html_print_image ("images/setup.png", true, array ("title" =>__('Setup')))
+			. '</a>';
+			
+	if($tab == 'setup')
+		$setuptab['active'] = true;
+	else
+		$setuptab['active'] = false;
+		
+	$onheader = array('setup' => $setuptab);
+}
+
+ui_print_page_header ( __("Agent detail"), "images/bricks.png", false, "agent_status", false, $onheader);
 
 echo '<form method="post" action="?sec=estado&sec2=operation/agentes/estado_agente&group_id=' . $group_id . '">';