diff --git a/pandora_console/operation/agentes/estadisticas.php b/pandora_console/operation/agentes/estadisticas.php
index 33116278f8..54cf81e70f 100644
--- a/pandora_console/operation/agentes/estadisticas.php
+++ b/pandora_console/operation/agentes/estadisticas.php
@@ -12,7 +12,7 @@ if (comprueba_login() == 0){
 	$iduser_temp=$_SESSION['id_usuario'];
 	if (give_acl($iduser_temp, 0, "AR") == 1){
 		echo "<h2>".$lang_label["ag_title"]."</h2>";
-		echo "<h3>".$lang_label["db_stat_agent"]."<a href='help/".substr($language_code,0,2)."/chap3.php#337' target='_help'><img src='images/help.gif' border='0' class='help'></a></h3>";
+		echo "<h3>".$lang_label["db_stat_agent"]."<a href='help/".substr($language_code,0,2)."/chap3.php#337' target='_help' class='help'>&nbsp;<span>".$lang_label["help"]."</span></a></h3>";
 		echo "<table border=0>";
 		echo "<tr><td><img src='reporting/fgraph.php?tipo=db_agente_modulo'><br>";
 		echo "<tr><td><br>";
diff --git a/pandora_console/operation/agentes/estado_agente.php b/pandora_console/operation/agentes/estado_agente.php
index 7664dc97da..84f36f905c 100644
--- a/pandora_console/operation/agentes/estado_agente.php
+++ b/pandora_console/operation/agentes/estado_agente.php
@@ -24,7 +24,7 @@ if (comprueba_login() == 0) {
 		$ag_group = $_GET["ag_group_refresh"];
 	}
 	echo "<h2>".$lang_label["ag_title"]."</h2>";
-	echo "<h3>".$lang_label["summary"]."<a href='help/".substr($language_code,0,2)."/chap3.php#331' target='_help'><img src='images/help.gif' border='0' class='help'></a></h3>";
+	echo "<h3>".$lang_label["summary"]."<a href='help/".substr($language_code,0,2)."/chap3.php#331' target='_help' class='help'>&nbsp;<span>".$lang_label["help"]."</span></a></h3>";
 
 	$iduser_temp=$_SESSION['id_usuario'];
 	
@@ -94,7 +94,7 @@ if (comprueba_login() == 0) {
 		echo "<th>".$lang_label["alerts"]."</th>";
 		echo "<th>".$lang_label["last_contact"]."</th>";
 		// For every agent deficed in the agent table
-		$color = 0;
+		$color = 1;
 		while ($row=mysql_fetch_array($result)){
 			if ($row["disabled"] == 0) {
 				$intervalo = $row["intervalo"]; // Interval in seconds
@@ -156,9 +156,9 @@ if (comprueba_login() == 0) {
 					echo "<td class='$tdcolor'>";
 					$id_grupo=dame_id_grupo($id_agente);
 					if (give_acl($id_user, $id_grupo, "AW")==1){
-						echo "<a href='index.php?sec=gagente&sec2=godmode/agentes/configurar_agente&id_agente=".$id_agente."'><img src='images/setup.gif' border=0 width=15></a>";
+						echo "<a href='index.php?sec=gagente&amp;sec2=godmode/agentes/configurar_agente&amp;id_agente=".$id_agente."'><img src='images/setup.gif' border=0 width=15></a>";
 					}
-					echo "&nbsp;&nbsp;<a href='index.php?sec=estado&sec2=operation/agentes/ver_agente&id_agente=".$id_agente."'><b>".$nombre_agente."</b></a>";
+					echo "&nbsp;&nbsp;<a href='index.php?sec=estado&amp;sec2=operation/agentes/ver_agente&amp;id_agente=".$id_agente."'><b>".$nombre_agente."</b></a>";
 					if ( $agent_type == 0) {
 						// Show SO icon :)
 						echo "<td class='$tdcolor' align='center'><img border=0 src='images/".dame_so_icon($id_os)."' height=18 alt='".dame_so_name($id_os)."'>";
@@ -207,10 +207,7 @@ if (comprueba_login() == 0) {
 							} else {
 								echo "N/A";
 							}
-							echo "<a href='#' class='info'><img src='reporting/fgraph.php?tipo=progress&percent=".$percentil."&height=15&width=80' border='0'>
-							<!--[if IE]>
-							<a href='#' class='tip' style='padding: 2px 0px 0px 20px; height: 20px; z-index: 1'>&nbsp;
-							<![endif]-->
+							echo "<a href='#' class='info2'><img src='reporting/fgraph.php?tipo=progress&amp;percent=".$percentil."&amp;height=15&amp;width=80' border='0'>&nbsp;
 							<span>$ultimo_contacto</span></a>";
 							// echo $ultimo_contacto;
 						}
diff --git a/pandora_console/operation/agentes/estado_alertas.php b/pandora_console/operation/agentes/estado_alertas.php
index 844eb2d56e..b352f7d11f 100644
--- a/pandora_console/operation/agentes/estado_alertas.php
+++ b/pandora_console/operation/agentes/estado_alertas.php
@@ -15,10 +15,10 @@ if (comprueba_login() == 0) {
 		$query_gen='SELECT talerta_agente_modulo.id_alerta, talerta_agente_modulo.descripcion, talerta_agente_modulo.last_fired, talerta_agente_modulo.times_fired, tagente_modulo.nombre, talerta_agente_modulo.dis_max, talerta_agente_modulo.dis_min, talerta_agente_modulo.max_alerts, talerta_agente_modulo.time_threshold, talerta_agente_modulo.min_alerts, talerta_agente_modulo.id_agente_modulo, tagente_modulo.id_agente_modulo FROM tagente_modulo, talerta_agente_modulo WHERE tagente_modulo.id_agente = '.$id_agente.' AND tagente_modulo.id_agente_modulo = talerta_agente_modulo.id_agente_modulo order by tagente_modulo.nombre';
 		$result_gen=mysql_query($query_gen);
 		if (mysql_num_rows ($result_gen)) {
-			echo "<h3>".$lang_label["alert_listing"]."<a href='help/".substr($language_code,0,2)."/chap3.php#3324' target='_help'><img src='images/help.gif' border='0' class='help'></a></h3>";
+			echo "<h3>".$lang_label["alert_listing"]."<a href='help/".substr($language_code,0,2)."/chap3.php#3324' target='_help' class='help'><span>".$lang_label["help"]."</span></a></h3>";
 			echo "<table cellpadding='3' cellspacing='3' width=750 border=0>";
 			echo "<tr><th>".$lang_label["type"]."<th>".$lang_label["name"]."</th><th>".$lang_label["description"]."</th><th>".$lang_label["min_max"]."</th><th>".$lang_label["time_threshold"]."</th><th>".$lang_label["last_fired"]."</th><th>".$lang_label["times_fired"]."</th><th>".$lang_label["status"]."</th>";
-			$color=0;
+			$color=1;
 			while ($data=mysql_fetch_array($result_gen)){
 				if ($color == 1){
 					$tdcolor = "datos";
@@ -48,7 +48,7 @@ if (comprueba_login() == 0) {
 	else 
 	{
 		echo "<h2>".$lang_label["ag_title"]."</h2>";
-		echo "<h3>".$lang_label["alert_listing"]."<a href='help/".substr($language_code,0,2)."/chap3.php#335' target='_help'><img src='images/help.gif' border='0' class='help'></a></h3>";
+		echo "<h3>".$lang_label["alert_listing"]."<a href='help/".substr($language_code,0,2)."/chap3.php#335' target='_help' class='help'>&nbsp;<span>".$lang_label["help"]."</span></a></h3>";
 		$iduser_temp=$_SESSION['id_usuario'];
 		if (isset($_POST["ag_group"]))
 			$ag_group = $_POST["ag_group"];
@@ -106,7 +106,7 @@ if (comprueba_login() == 0) {
 			echo "<br>";
 			echo "<table cellpadding='3' cellspacing='3'>";
 			echo "<tr><th>ID</th><th>".$lang_label["type"]."</th><th>".$lang_label["description"]."</th><th>".$lang_label["last_fired"]."</th><th>".$lang_label["times_fired"]."</th><th>".$lang_label["status"]."</th>";
-			$color=0;
+			$color=1;
 			while ($row=mysql_fetch_array($result)){ //while there are agents
 				if ($row["disabled"] == 0) {
 					$id_agente = $row['id_agente'];
diff --git a/pandora_console/operation/agentes/estado_generalagente.php b/pandora_console/operation/agentes/estado_generalagente.php
index 2adf9b9050..f29ceacff5 100644
--- a/pandora_console/operation/agentes/estado_generalagente.php
+++ b/pandora_console/operation/agentes/estado_generalagente.php
@@ -49,7 +49,7 @@ if (comprueba_login() == 0) {
 	}
 	
 	echo "<h2>".$lang_label["ag_title"]."</h2>";
-	echo "<h3>".$lang_label["view_agent_general_data"]."<a href='help/".substr($language_code,0,2)."/chap3.php#3321' target='_help'><img src='images/help.gif' border='0' class='help'></a></h3>";
+	echo "<h3>".$lang_label["view_agent_general_data"]."<a href='help/".substr($language_code,0,2)."/chap3.php#3321' target='_help' class='help'>&nbsp;<span>".$lang_label["help"]."</span></a></h3>";
 	echo '<table cellspacing=3 cellpadding=3 border=0 width=750>';	
 	echo '<tr><td class="datos"><b>'.$lang_label["agent_name"].'</b> <td class="datos">'.salida_limpia($nombre_agente);
 
diff --git a/pandora_console/operation/agentes/estado_grupo.php b/pandora_console/operation/agentes/estado_grupo.php
index 5ea7c73279..302ee6dabd 100644
--- a/pandora_console/operation/agentes/estado_grupo.php
+++ b/pandora_console/operation/agentes/estado_grupo.php
@@ -139,10 +139,7 @@ if (comprueba_login() == 0)
 					$icono_type=$icono_type."<img src='images/dot_yellow.gif' alt=''>";
 				}
 				// TOOLTIP.
-				$celda = "<td class='bot' width=100><a href='index.php?sec=estado&amp;sec2=operation/agentes/estado_agente&amp;refr=60&amp;group_id=".$grupo[$real_count]["id_grupo"]."' class='info'><img class='top' src='images/groups/".$icono_grupo."_1.gif' border='0' alt=''>
-				<!--[if IE]>
-				<a href='index.php?sec=estado&amp;sec2=operation/agentes/estado_agente&amp;refr=60&amp;group_id=".$grupo[$real_count]["id_grupo"]."' class='tip' style='padding: 2px 0px 0px 20px; height: 20px; z-index: 1'>&nbsp;
-				<![endif]-->
+				$celda = "<td class='bot' width=100><a href='index.php?sec=estado&amp;sec2=operation/agentes/estado_agente&amp;refr=60&amp;group_id=".$grupo[$real_count]["id_grupo"]."' class='info'><img class='top' src='images/groups/".$icono_grupo."_1.gif' border='0' alt=''>&nbsp;
 				<span>
 				<table cellspacing='2' cellpadding='0' style='margin-left:20px'>
 				<tr><td colspan='2' width='91' class='lb'>".$lang_label["agents"].": </td></tr>
diff --git a/pandora_console/operation/agentes/estado_monitores.php b/pandora_console/operation/agentes/estado_monitores.php
index 93c62ce57a..a60b1126c5 100644
--- a/pandora_console/operation/agentes/estado_monitores.php
+++ b/pandora_console/operation/agentes/estado_monitores.php
@@ -18,7 +18,7 @@ if (comprueba_login() == 0) {
 	$sql_t='SELECT * FROM tagente_estado, tagente_modulo WHERE tagente_estado.id_agente_modulo = tagente_modulo.id_agente_modulo AND tagente_modulo.id_agente='.$id_agente.' order by tagente_modulo.nombre';
 	$result_t=mysql_query($sql_t);
 	if (mysql_num_rows ($result_t)) {
-		echo "<h3>".$lang_label["monitor_listing"]."<a href='help/".substr($language_code,0,2)."/chap3.php#3323' target='_help'><img src='images/help.gif' border='0' class='help'></a></h3>";
+		echo "<h3>".$lang_label["monitor_listing"]."<a href='help/".substr($language_code,0,2)."/chap3.php#3323' target='_help' class='help'>&nbsp;<span>".$lang_label["help"]."</span></a></h3>";
 		echo "<table width='750' cellpadding=3 cellspacing=3>";
 		echo "<tr><th>".$lang_label["type"]."<th>".$lang_label["module_name"]."<th>".$lang_label["description"]."<th>".$lang_label["status"]."<th>".$lang_label["interval"]."<th>".$lang_label["last_contact"];
 		$color=0;
diff --git a/pandora_console/operation/agentes/estado_ultimopaquete.php b/pandora_console/operation/agentes/estado_ultimopaquete.php
index ae5a0ced04..9b6835d46d 100644
--- a/pandora_console/operation/agentes/estado_ultimopaquete.php
+++ b/pandora_console/operation/agentes/estado_ultimopaquete.php
@@ -74,7 +74,7 @@ if (comprueba_login() == 0) {
 	$last_label = "";
 	$result3=mysql_query($sql3);
 	if (mysql_num_rows ($result3)) {
-	echo "<h3>".$lang_label["last_data_chunk"]."<a href='help/".substr($language_code,0,2)."/chap3.php#3322' target='_help'><img src='images/help.gif' border='0' class='help'></a></h3>";
+	echo "<h3>".$lang_label["last_data_chunk"]."<a href='help/".substr($language_code,0,2)."/chap3.php#3322' target='_help' class='help'>&nbsp;<span>".$lang_label["help"]."</span></a></h3>";
 	echo "<table width='750' cellpadding='3' cellspacing='3'><th>X<th>".$lang_label["module_name"];
 	echo "<th>".$lang_label["type"]."<th>".$lang_label["int"]."<th>".$lang_label["description"]."<th>".$lang_label["data"]."<th>".$lang_label["graph"]."<th>".$lang_label["raw_data"]."<th>".$lang_label["timestamp"];
 	$texto='';
diff --git a/pandora_console/operation/agentes/exportdata.php b/pandora_console/operation/agentes/exportdata.php
index 22a94e33da..c6cff657e0 100644
--- a/pandora_console/operation/agentes/exportdata.php
+++ b/pandora_console/operation/agentes/exportdata.php
@@ -13,7 +13,7 @@ if (comprueba_login() == 0)
 		if ((isset($_GET["operacion"])) AND (! isset($_POST["update_agent"]))){
  			if (isset ($_POST["copiar"])){ // Export main button
 				echo "<h2>".$lang_label["ag_title"]."</h2>";
-				echo "<h3>".$lang_label["export_title"]."</h3>";
+				echo "<h3>".$lang_label["export_title"]."<a href='help/".substr($language_code,0,2)."/chap3.php#336' target='_help' class='help'>&nbsp;<span>".$lang_label["help"]."</span></a></h3>";
 				if (isset ($_POST["origen_modulo"])){
 				if (isset ($_POST["csv"])) // CSV version
 					$csv = 1;
@@ -64,7 +64,7 @@ if (comprueba_login() == 0)
 		} else { // Form view
 			?>
 			<h2><?php echo $lang_label["ag_title"] ?></h2>
-			<h3><?php echo $lang_label["export_data"] ?><a href='help/<?php echo substr($language_code,0,2);?>/chap3.php#336' target='_help'><img src='images/help.gif' border='0' class='help'></a></h3>
+			<h3><?php echo $lang_label["export_data"] ?><a href='help/<?php echo substr($language_code,0,2);?>/chap3.php#336' target='_help' class='help'>&nbsp;<span><?php echo $lang_label["help"] ?></span></a></h3>
 			<form method="post" action="index.php?sec=estado&sec2=operation/agentes/exportdata&operacion=1" name="export_form">
 			<table width=550 border=0 cellspacing=3 cellpadding=5 class=fon>
 			<tr>
diff --git a/pandora_console/operation/agentes/status_monitor.php b/pandora_console/operation/agentes/status_monitor.php
index c3af889b29..a33d8afdef 100644
--- a/pandora_console/operation/agentes/status_monitor.php
+++ b/pandora_console/operation/agentes/status_monitor.php
@@ -19,7 +19,7 @@ if (comprueba_login() == 0) {
 	}
 
 	echo "<h2>".$lang_label["ag_title"]."</h2>";
-	echo "<h3>".$lang_label["monitor_listing"]."<a href='help/".substr($language_code,0,2)."/chap3.php#334' target='_help'><img src='images/help.gif' border='0' class='help'></a></h3>";
+	echo "<h3>".$lang_label["monitor_listing"]."<a href='help/".substr($language_code,0,2)."/chap3.php#334' target='_help' class='help'>&nbsp;<span>".$lang_label["help"]."</span></a></h3>";
 	$iduser_temp=$_SESSION['id_usuario'];
 	
 
diff --git a/pandora_console/operation/events/event_statistics.php b/pandora_console/operation/events/event_statistics.php
index a533adb093..c975e56ed7 100644
--- a/pandora_console/operation/events/event_statistics.php
+++ b/pandora_console/operation/events/event_statistics.php
@@ -13,7 +13,7 @@ if (comprueba_login() == 0) {
 	$id_usuario =$_SESSION["id_usuario"];
         if (give_acl($id_usuario, 0, "AR")==1) {
 		echo "<h2>".$lang_label["events"]."</h2>";
-		echo "<h3>".$lang_label["event_statistics"]."<a href='help/".substr($language_code,0,2)."/chap5.php#51' target='_help'><img src='images/help.gif' border='0' class='help'></a></h3>";
+		echo "<h3>".$lang_label["event_statistics"]."<a href='help/".substr($language_code,0,2)."/chap5.php#51' target='_help' class='help'>&nbsp;<span>".$lang_label["help"]."</span></a></h3>";
 		echo '<img src="reporting/fgraph.php?tipo=total_events" border=0>';
 		echo "<br><br>";
 		echo '<img src="reporting/fgraph.php?tipo=user_events" border=0>';
@@ -25,4 +25,4 @@ if (comprueba_login() == 0) {
 		require ("general/noaccess.php");
 	}
 }
-?>
+?>
\ No newline at end of file
diff --git a/pandora_console/operation/events/events.php b/pandora_console/operation/events/events.php
index e6d50a3ce5..d96689ca6d 100644
--- a/pandora_console/operation/events/events.php
+++ b/pandora_console/operation/events/events.php
@@ -109,7 +109,7 @@ if (comprueba_login() == 0) {
 	}
 
 	echo "<h2>".$lang_label["events"]."</h2>";
-	echo "<h3>".$lang_label["event_main_view"]."<a href='help/".substr($language_code,0,2)."/chap5.php#5' target='_help'><img src='images/help.gif' border='0' class='help'></a></h3>";
+	echo "<h3>".$lang_label["event_main_view"]."<a href='help/".substr($language_code,0,2)."/chap5.php#5' target='_help' class='help'>&nbsp;<span>".$lang_label["help"]."</span></a></h3>";
 
 	// Prepare index for pagination
 	$event_list[]="";
@@ -190,7 +190,7 @@ if (comprueba_login() == 0) {
 	echo "<label for='checkbox' class='p21'>".$lang_label["all"]." </label>";
 	echo '<input type="checkbox" class="chk" name="allbox" onclick="CheckAll();"></th>';	
 	echo "<form name='eventtable' method='POST' action='index.php?sec=eventos&sec2=operation/events/events&refr=60&offset=".$offset."'>";
-	$color = 0;
+	$color = 1;
 	$id_evento = 0;
 	if ($offset !=0)
 		$offset_limit = $offset +1;
diff --git a/pandora_console/operation/incidents/incident.php b/pandora_console/operation/incidents/incident.php
index 3f096ee262..5bf159a00a 100644
--- a/pandora_console/operation/incidents/incident.php
+++ b/pandora_console/operation/incidents/incident.php
@@ -127,7 +127,7 @@ if ((give_acl($id_user, 0, "IR")==1) OR (give_acl($id_user, 0, "IM")==1) or (dam
 	$sql1_count="SELECT COUNT(id_incidencia) FROM tincidencia ".$sql1;
 	$sql1=$sql0;
 	echo "<h2>".$lang_label["incident_manag"]."</h2>";
-	echo "<h3>".$lang_label["manage_incidents"]."<a href='help/".substr($language_code,0,2)."/chap4.php#4' target='_help'><img src='images/help.gif' border='0' class='help'></a></h3>";
+	echo "<h3>".$lang_label["manage_incidents"]."<a href='help/".substr($language_code,0,2)."/chap4.php#4' target='_help' class='help'>&nbsp;<span>".$lang_label["help"]."</span></a></h3>";
 ?>
 
 <?php
@@ -304,7 +304,7 @@ if (isset($_POST['operacion'])){
 	echo "<th>".$lang_label["source"];
 	echo "<th width='75'>".$lang_label["in_openedby"];
 	echo "<th>".$lang_label["delete"];
-	$color = 0;
+	$color = 1;
 
 	// Skip offset records and begin show data
 	if ($offset !=0)
diff --git a/pandora_console/operation/incidents/incident_detail.php b/pandora_console/operation/incidents/incident_detail.php
index 17c405d172..40a85dfd50 100644
--- a/pandora_console/operation/incidents/incident_detail.php
+++ b/pandora_console/operation/incidents/incident_detail.php
@@ -219,8 +219,8 @@ $creacion_incidente = "";
 			
 		if (isset($id_inc)) {echo "<input type='hidden' name='id_inc' value='".$id_inc."'>";}
 		echo "<h2>".$lang_label["incident_manag"]."</h2>";
-		if (isset($id_inc)) {echo "<h3>".$lang_label["rev_incident"]." # ".$id_inc." <a href='help/<?php echo substr($language_code,0,2);?>/chap4.php#42' target='_help'><img src='images/help.gif' border='0' class='help'></a></h3>";} 
-			else {echo "<h3>".$lang_label["create_incident"]."<a href='help/".substr($language_code,0,2)."/chap4.php#41' target='_help'><img src='images/help.gif' border='0' class='help'></a></h3>";}
+		if (isset($id_inc)) {echo "<h3>".$lang_label["rev_incident"]." # ".$id_inc." <a href='help/<?php echo substr($language_code,0,2);?>/chap4.php#42' target='_help' class='help'>&nbsp;<span>".$lang_label["help"]."</span></a></h3>";} 
+			else {echo "<h3>".$lang_label["create_incident"]."<a href='help/".substr($language_code,0,2)."/chap4.php#41' target='_help' class='help'>&nbsp;<span>".$lang_label["help"]."</span></a></h3>";}
 		echo '<table cellpadding=3 cellspacing=3 border=0 width=600>';
 		if ((give_acl($iduser_temp, $id_grupo, "IM")==1) OR ($usuario == $iduser_temp)) 
 			echo '<tr><td class="lb" rowspan="6" width="5"><td class="datos"><b>'.$lang_label["incident"].'</b><td colspan=3 class="datos"><input type="text" name="titulo" size=70 value="'.$titulo.'">';
diff --git a/pandora_console/operation/incidents/incident_search.php b/pandora_console/operation/incidents/incident_search.php
index b1811331dd..31fc78aca2 100644
--- a/pandora_console/operation/incidents/incident_search.php
+++ b/pandora_console/operation/incidents/incident_search.php
@@ -11,10 +11,13 @@ require("include/config.php");
 //require("include/functions_db.php");
 if (comprueba_login() == 0) {
 
-echo "<img src='images/pulpo_lupa.gif' align='right' class='bot'>";	
+
 echo "<h2>".$lang_label["incident_manag"]."</h2>";
-echo "<h3>".$lang_label["find_crit"]." <a href='help/".substr($language_code,0,2)."/chap4.php#43' target='_help'><img src='images/help.gif' border='0' class='help'></a></h3>";
+echo "<h3>".$lang_label["find_crit"]." <a href='help/".substr($language_code,0,2)."/chap4.php#43' target='_help' class='help'>&nbsp;<span>".$lang_label["help"]."</span></a></h3>";
+echo "<div style='width:645'>";
+echo "<div style='float:right;'><img src='images/pulpo_lupa.gif' class='bot' align='left'></div>";	
 ?>
+<div style='float:left;'>
 <table width="500" cellpadding="3" cellspacing="3">
 <form name="busqueda" method="post" action="index.php?sec=incidencias&sec2=operation/incidents/incident">
 <td class='lb' rowspan="4" width="5">
@@ -31,8 +34,8 @@ echo "<h3>".$lang_label["find_crit"]." <a href='help/".substr($language_code,0,2
 	}
 	?>
 </select>
-<tr><td class="datos"><?php echo $lang_label["free_text_search"] ?>
-<td class="datos"><input type="text" size="45" name="texto">
+<tr><td class="datos2"><?php echo $lang_label["free_text_search"] ?>
+<td class="datos2"><input type="text" size="45" name="texto">
 <tr><td class="datos" colspan="2">
 <i><?php echo $lang_label["free_text_search_msg"] ?></i>
 
@@ -41,6 +44,8 @@ echo "<h3>".$lang_label["find_crit"]." <a href='help/".substr($language_code,0,2
 
 </form>
 </table>
+</div>
+</div>
 <?php 
 
 } // fin pagina
diff --git a/pandora_console/operation/incidents/incident_statistics.php b/pandora_console/operation/incidents/incident_statistics.php
index cc02c943d0..17ea47897c 100644
--- a/pandora_console/operation/incidents/incident_statistics.php
+++ b/pandora_console/operation/incidents/incident_statistics.php
@@ -14,7 +14,7 @@ if (comprueba_login() == 0) {
 	$iduser=$_SESSION['id_usuario'];
 	if (give_acl($id_user, 0, "IR")==1) {	
 		echo "<h2>".$lang_label["incident_manag"]."</h2>";
-		echo "<h3>".$lang_label["statistics"]."<a href='help/".substr($language_code,0,2)."/chap4.php#44' target='_help'><img src='images/help.gif' border='0' class='help'></a></h3>";
+		echo "<h3>".$lang_label["statistics"]."<a href='help/".substr($language_code,0,2)."/chap4.php#44' target='_help' class='help'>&nbsp;<span>".$lang_label["help"]."</span></a></h3>";
 echo '<img src="reporting/fgraph.php?tipo=estado_incidente" border=0>';
 echo "<br><br>";
 echo '<img src="reporting/fgraph.php?tipo=prioridad_incidente" border=0>';
@@ -30,4 +30,4 @@ echo "<br><br>";
 			audit_db($id_user,$REMOTE_ADDR, "ACL Violation","Trying to access Incident section");
         }
 }
-?>
+?>
\ No newline at end of file
diff --git a/pandora_console/operation/messages/message.php b/pandora_console/operation/messages/message.php
index e17647ba8b..1a05411f7e 100644
--- a/pandora_console/operation/messages/message.php
+++ b/pandora_console/operation/messages/message.php
@@ -70,8 +70,8 @@ if (isset($_GET["nuevo"]) || isset($_GET["nuevo_g"])){
 		echo '
 		<form name="new_mes" method="POST" action="index.php?sec=messages&sec2=operation/messages/message&nuevo_mensaje=1">
 		<table>
-		<tr><td class="datos">'.$lang_label["m_from"].':</td><td><b>'.$iduser.'</b></td></tr>
-		<tr><td class="datos">'.$lang_label["m_to"].':</td><td>';
+		<tr><td class="datos">'.$lang_label["m_from"].':</td><td class="datos"><b>'.$iduser.'</b></td></tr>
+		<tr><td class="datos2">'.$lang_label["m_to"].':</td><td>';
 		if (isset($_POST["u_destino"])) {
 			echo '<b>'.$_POST["u_destino"].'</b><input type="hidden" name="u_destino" value='.$_POST["u_destino"].'>';
 			}
@@ -82,14 +82,14 @@ if (isset($_GET["nuevo"]) || isset($_GET["nuevo_g"])){
 			echo '</select>';
 			}
 		echo '</td></tr>
-		<tr><td class="datos">'.$lang_label["subject"].':</td><td>';
+		<tr><td class="datos">'.$lang_label["subject"].':</td><td class="datos">';
 			if (isset($_POST["subject"])) {
 			echo '</b><input name="subject" value="'.$_POST["subject"].'" class="w255">';
 			}
 			else echo '<input name="subject" class="w255">';
 		echo '</td></tr>
-		<tr><td class="datos">'.$lang_label["message"].':</td></tr>
-		<tr><td class="datos" colspan="4"><textarea name="mensaje" rows="10" class= "w540">';
+		<tr><td class="datos2">'.$lang_label["message"].':</td></tr>
+		<tr><td class="datos" colspan="4"><textarea name="mensaje" rows="10" class="w540">';
 			if (isset($_POST["mensaje"])) {
 			echo $_POST["mensaje"];
 			}
@@ -104,8 +104,8 @@ if (isset($_GET["nuevo"]) || isset($_GET["nuevo_g"])){
 		echo '
 		<form name="new_mes" method="post" action="index.php?sec=messages&sec2=operation/messages/message&nuevo_mensaje_g=1">
 		<table>
-		<tr><td class="datos">'.$lang_label["m_from"].':</td><td><b>'.$iduser.'</b></td></tr>
-		<tr><td class="datos">'.$lang_label["m_to"].':</td><td>';
+		<tr><td class="datos">'.$lang_label["m_from"].':</td><td class="datos"><b>'.$iduser.'</b></td></tr>
+		<tr><td class="datos2">'.$lang_label["m_to"].':</td><td class="datos2">';
 			echo '<select name="g_destino" class="w100">';
 				while ($row3=mysql_fetch_array($resultado3))
 				#if ($row3["id_grupo"] != 1){
@@ -114,8 +114,8 @@ if (isset($_GET["nuevo"]) || isset($_GET["nuevo_g"])){
 				
 			echo '</select>';
 		echo '</td></tr>
-		<tr><td class="datos">'.$lang_label["subject"].':</td><td><input name="subject" class="w255"></td></tr>
-		<tr><td class="datos">'.$lang_label["message"].':</td></tr>
+		<tr><td class="datos">'.$lang_label["subject"].':</td><td class="datos"><input name="subject" class="w255"></td></tr>
+		<tr><td class="datos2">'.$lang_label["message"].':</td></tr>
 		<tr><td class="datos" colspan="4"><textarea name="mensaje" rows="10" class="w540"></textarea></td></tr>
 		<tr><td colspan="2" align="right">
 		<input type="submit" class="sub" name="send_mes" value="'.$lang_label["send_mes"].'"></form></td></tr>';
@@ -139,7 +139,7 @@ else {
 		}
 	$sql3='SELECT * FROM tmensajes WHERE id_usuario_destino="'.$iduser.'"';
 	$resultado3=mysql_query($sql3);
-	$color=0;
+	$color=1;
 	if (mysql_num_rows($resultado3)) {
 		echo "<table class='w550'><tr><th>".$lang_label["read"]."</th><th>".$lang_label["sender"]."</th><th>".$lang_label["subject"]."</th><th>".$lang_label["timestamp"]."</th><th>".$lang_label["delete"]."</th></tr>";
 		while ($row3=mysql_fetch_array($resultado3)){
@@ -175,10 +175,10 @@ else {
 		echo '
 		<table>
 		<form method="post" name="reply_mes" action="index.php?sec=messages&sec2=operation/messages/message&nuevo">
-		<tr><td></td></tr><tr><td class="w90d">'.$lang_label["from"].':</td><td><b>'.$row4["id_usuario_origen"].'</b></td></tr>
-		<tr><td class="datos">'.$lang_label["subject"].':</td><td><b>'.$row4["subject"].'</b></td></tr>
-		<tr><td class="datos">'.$lang_label["message"].':</td>
-		<tr><td class="datos" colspan="4"><textarea name="mensaje" rows="10" class="w540" readonly>'.$row4["mensaje"].'</textarea></td></tr>
+		<tr><td></td></tr><tr><td class="w90datos">'.$lang_label["from"].':</td><td class="datos"><b>'.$row4["id_usuario_origen"].'</b></td></tr>
+		<tr><td class="datos2">'.$lang_label["subject"].':</td><td class="datos2"><b>'.$row4["subject"].'</b></td></tr>
+		<tr><td class="datos" colspan="2">'.$lang_label["message"].':</td>
+		<tr><td class="datos2" colspan="2"><textarea name="mensaje" rows="10" class="w540" readonly>'.$row4["mensaje"].'</textarea></td></tr>
 		<tr><td colspan="2" align="right">
 		<input type="hidden" name="u_destino" value="'.$row4["id_usuario_origen"].'">
 		<input type="hidden" name="subject" value="Re: '.$row4["subject"].'">
diff --git a/pandora_console/operation/users/user.php b/pandora_console/operation/users/user.php
index f83873b20c..4e72c60240 100644
--- a/pandora_console/operation/users/user.php
+++ b/pandora_console/operation/users/user.php
@@ -15,19 +15,7 @@ if (comprueba_login() == 0) {
 ?>
 
 <h2><?php echo $lang_label["users_"] ?></h3>
-<h3><?php echo $lang_label["users_pandora"] ?></h3>
-
-<table width="500">
-<tr><td>
-<div align="justify">
-<img src='images/muchos_pulpos.gif' align='right'>
-<?php echo $lang_label["users_msg"] ?>
-</div>
-</td></tr>
-</table><br>
-
-
-<h3><?php echo $lang_label["users"] ?></h3>
+<h3><?php echo $lang_label["users"] ?><a href='help/<?php echo substr($language_code,0,2) ?>/chap2.php#2' target='_help' class='help'>&nbsp;<span><?php echo $lang_label["help"] ?></span></a></h3>
 
 <table cellpadding="3" cellspacing="3" width="700">
 <th class="w80"><?php echo $lang_label["user_ID"]?>
@@ -80,7 +68,7 @@ echo "<tr><td colspan='5'><div class='raya'></div></td></tr></table><br>";
 ?>
 
 
-<h3><?php echo $lang_label["definedprofiles"] ?></h3>
+<h3><?php echo $lang_label["definedprofiles"] ?><a href='help/<?php echo substr($language_code,0,2) ?>/chap2.php#21' target='_help' class='help'>&nbsp;<span><?php echo $lang_label["help"] ?></span></a></h3>
 
 <table cellpadding=3 cellspacing=3 border=0>
 <?php
@@ -88,18 +76,18 @@ echo "<tr><td colspan='5'><div class='raya'></div></td></tr></table><br>";
 	$query_del1="SELECT * FROM tperfil";
 	$resq1=mysql_query($query_del1);
 	echo "<tr>";
-	echo "<th class='w180d'><font size=1>".$lang_label["profiles"];
-	echo "<th class='w40d'><font size=1>IR<a href='#' class='tip2'>&nbsp;<span>".$help_label["IR"]."</span></a>";
-	echo "<th class='w40d'><font size=1>IW<a href='#' class='tip2'>&nbsp;<span>".$help_label["IW"]."</span></a>";
-	echo "<th class='w40d'><font size=1>IM<a href='#' class='tip2'>&nbsp;<span>".$help_label["IM"]."</span></a>";
-	echo "<th class='w40d'><font size=1>AR<a href='#' class='tip2'>&nbsp;<span>".$help_label["AR"]."</span></a>";
-	echo "<th class='w40d'><font size=1>AW<a href='#' class='tip2'>&nbsp;<span>".$help_label["AW"]."</span></a>";
-	echo "<th class='w40d'><font size=1>LW<a href='#' class='tip2'>&nbsp;<span>".$help_label["LW"]."</span></a>";
-	echo "<th class='w40d'><font size=1>UM<a href='#' class='tip2'>&nbsp;<span>".$help_label["UM"]."</span></a>";
-	echo "<th class='w40d'><font size=1>DM<a href='#' class='tip2'>&nbsp;<span>".$help_label["DM"]."</span></a>";
-	echo "<th class='w40d'><font size=1>LM<a href='#' class='tip2'>&nbsp;<span>".$help_label["LM"]."</span></a>";
-	echo "<th class='w40d'><font size=1>PM<a href='#' class='tip2'>&nbsp;<span>".$help_label["PM"]."</span></a>";
-	$color = 0;
+	echo "<th class='w180'><font size=1>".$lang_label["profiles"];
+	echo "<th class='w40'><font size=1>IR<a href='#' class='tip2'>&nbsp;<span>".$help_label["IR"]."</span></a>";
+	echo "<th class='w40'><font size=1>IW<a href='#' class='tip2'>&nbsp;<span>".$help_label["IW"]."</span></a>";
+	echo "<th class='w40'><font size=1>IM<a href='#' class='tip2'>&nbsp;<span>".$help_label["IM"]."</span></a>";
+	echo "<th class='w40'><font size=1>AR<a href='#' class='tip2'>&nbsp;<span>".$help_label["AR"]."</span></a>";
+	echo "<th class='w40'><font size=1>AW<a href='#' class='tip2'>&nbsp;<span>".$help_label["AW"]."</span></a>";
+	echo "<th class='w40'><font size=1>LW<a href='#' class='tip2'>&nbsp;<span>".$help_label["LW"]."</span></a>";
+	echo "<th class='w40'><font size=1>UM<a href='#' class='tip2'>&nbsp;<span>".$help_label["UM"]."</span></a>";
+	echo "<th class='w40'><font size=1>DM<a href='#' class='tip2'>&nbsp;<span>".$help_label["DM"]."</span></a>";
+	echo "<th class='w40'><font size=1>LM<a href='#' class='tip2'>&nbsp;<span>".$help_label["LM"]."</span></a>";
+	echo "<th class='w40'><font size=1>PM<a href='#' class='tip2'>&nbsp;<span>".$help_label["PM"]."</span></a>";
+	$color = 1;
 	while ($rowdup=mysql_fetch_array($resq1)){
 		$id_perfil = $rowdup["id_perfil"];
 		$nombre=$rowdup["name"];
diff --git a/pandora_console/operation/users/user_edit.php b/pandora_console/operation/users/user_edit.php
index 57146de32a..2e44661e0c 100644
--- a/pandora_console/operation/users/user_edit.php
+++ b/pandora_console/operation/users/user_edit.php
@@ -34,7 +34,7 @@ if (comprueba_login() == 0) {
 	if (isset ($_GET["modificado"])){
 		// Se realiza la modificación
 		if (isset ($_POST["pass1"])){
-			if ( $_POST["nombre"] != $_SESSION["id_usuario"]) {
+			if ( isset($_POST["nombre"]) && ($_POST["nombre"] != $_SESSION["id_usuario"])) {
 				audit_db($_SESSION["id_usuario"],$REMOTE_ADDR,"Security Alert. Trying to modify another user: (".$_POST['nombre'].") ","Security Alert");
 				no_permission;
 			}
@@ -73,7 +73,7 @@ if (comprueba_login() == 0) {
 		}
 	} 
 		echo "<h2>".$lang_label["users_"]."</h2>";
-		echo "<h3>".$lang_label["user_edit_title"]."</h3>";
+		echo "<h3>".$lang_label["user_edit_title"]."<a href='help/".substr($language_code,0,2)."/chap2.php#22' target='_help' class='help'>&nbsp;<span>".$lang_label["help"]."</span></a></h3>";
 
 	// Sino se obtiene la variable "modificado" es que se esta visualizando la informacion y
 	// preparandola para su modificacion, no se almacenan los datos
@@ -99,18 +99,19 @@ if (comprueba_login() == 0) {
 	?>
 	<tr><td class="lb" rowspan="8" width="5"><td class="datos"><?php echo $lang_label["id_user"] ?>
 	<td class="datos"><input class=input type="text" name="nombre" value="<?php echo $nombre ?>" disabled>
-	<tr><td class="datos"><?php echo $lang_label["real_name"] ?>
-	<td class="datos"><input class=input type="text" name="nombre_real" value="<?php echo $nombre_real ?>">
+	<tr><td class="datos2"><?php echo $lang_label["real_name"] ?>
+	<td class="dato2s"><input class=input type="text" name="nombre_real" value="<?php echo $nombre_real ?>">
 	<tr><td class="datos"><?php echo $lang_label["password"] ?>
 	<td class="datos"><input class=input type="password" name="pass1" value="<?php echo $password ?>">
-	<tr><td class="datos"><?php echo $lang_label["password"]; echo " ".$lang_label["confirmation"]?>
-	<td class="datos"><input class=input type="password" name="pass2" value="<?php echo $password ?>">
+	<tr><td class="datos2"><?php echo $lang_label["password"]; echo " ".$lang_label["confirmation"]?>
+	<td class="datos2"><input class=input type="password" name="pass2" value="<?php echo $password ?>">
 	<tr><td class="datos">E-Mail
 	<td class="datos"><input class=input type="text" name="direccion" size="40" value="<?php echo $direccion ?>">
-	<tr><td class="datos"><?php echo $lang_label["telefono"] ?>
-	<td class="datos"><input class=input type="text" name="telefono" value="<?php echo $telefono ?>">
+	<tr><td class="datos2"><?php echo $lang_label["telefono"] ?>
+	<td class="datos2"><input class=input type="text" name="telefono" value="<?php echo $telefono ?>">
 	<tr><td class="datos" colspan="2"><?php echo $lang_label["comments"] ?>
-	<tr><td class="datos" colspan="2"><textarea name="comentarios" cols="55" rows="4"><?php echo $comentarios ?></textarea>
+	<tr><td class="datos2" colspan="2"><textarea name="comentarios" cols="55" rows="4"><?php echo $comentarios ?></textarea>
+	<tr><td colspan='3'><div class='raya'></div></td></tr>
 	
 <?php
 		// Don't delete this!!
@@ -132,7 +133,7 @@ if (comprueba_login() == 0) {
 		}
 
 	}
-	else { echo '<tr><td class="red" colspan="2">'.$lang_label["no_profile"]; }
+	else { echo '<tr><td class="red" colspan="3">'.$lang_label["no_profile"]; }
 
 	echo '</form></td></tr></table> ';
 
diff --git a/pandora_console/operation/users/user_statistics.php b/pandora_console/operation/users/user_statistics.php
index 3b16c1e9a3..f3b8432df2 100644
--- a/pandora_console/operation/users/user_statistics.php
+++ b/pandora_console/operation/users/user_statistics.php
@@ -10,8 +10,8 @@ require("include/config.php");
 //require("include/functions_db.php");
 if (comprueba_login() == 0) {
 echo "<h2>".$lang_label["users"]."</h2>";
-echo "<h3>".$lang_label["users_statistics"]."</h3>";
+echo "<h3>".$lang_label["users_statistics"]."<a href='help/".substr($language_code,0,2)."/chap2.php#24' target='_help' class='help'>&nbsp;<span>".$lang_label["help"]."</span></a></h3>";
 echo '<img src="reporting/fgraph.php?tipo=user_activity" border=0>';
 echo "<br><br>";
 }
-?>
+?>
\ No newline at end of file