diff --git a/pandora_console/ChangeLog b/pandora_console/ChangeLog
index 36bf5f5645..0d2599bd44 100644
--- a/pandora_console/ChangeLog
+++ b/pandora_console/ChangeLog
@@ -1,3 +1,18 @@
+2007-05-07  Raul Mateos  <raulofpandora@gmail.com>
+
+	* general/header.php: Made smaller.
+	
+	* godmode/agentes/module_manager.php: Changed html anchor.
+	
+	* operation/snmpconsole/snmp_view.php, general/logon_ok.php,
+	operation/events/events.php, operation/incidents/incident.php,
+	operation/agentes/estado_alertas.php: Removed classes.
+	Now we use some styles at each page to simplify css.
+	
+	* operation/agentes/estado_generalagente.php: Changed table width.
+	
+	* include/pandora.css: Updated a lot of styles, deleted some not used.
+
 2007-05-03  Raul Mateos  <raulofpandora@gmail.com>
 
 	* images/reporting.png: Renamed from chart_pie.png.
diff --git a/pandora_console/general/header.php b/pandora_console/general/header.php
index b894f2406a..c6d546b08d 100644
--- a/pandora_console/general/header.php
+++ b/pandora_console/general/header.php
@@ -18,7 +18,7 @@
 // along with this program; if not, write to the Free Software
 // Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
 
-echo "<table width=100% border=0>";
+echo "<table width=100% border='0'>";
 echo "<tr>";
 if (isset ($_SESSION["id_usuario"])){
 	echo "<td width=40%>";
@@ -30,11 +30,11 @@ if (isset ($_SESSION["id_usuario"])){
 	echo $lang_label["has_connected"]. '
 	[<b class="f10">'. $id_usuario. '</b>]';
 	echo "<td width=30%>";
-	echo "<a href='index.php?sec=main'><img src='images/information.png' class='bot'> ". $lang_label["information"]."</A>";
+	echo "<a href='index.php?sec=main'><img src='images/information.png' class='bot'> ". $lang_label["information"]."</a>";
 	echo "<td width=20%>";
-	echo "<a href='help/en/toc.php'><img src='images/help.png' class='bot'> ". $lang_label["help"]."</A>";
+	echo "<a href='help/en/toc.php'><img src='images/help.png' class='bot'> ". $lang_label["help"]."</a>";
 	echo "<td align='right' width=10%>";
-	echo "<a href='index.php?bye=bye'><img src='images/lock.png' class='bot'> ". $lang_label["logout"]."</A>";
+	echo "<a href='index.php?bye=bye'><img src='images/lock.png' class='bot'> ". $lang_label["logout"]."</a>";
 }
 echo "</table>";
 ?>
\ No newline at end of file
diff --git a/pandora_console/general/links_menu.php b/pandora_console/general/links_menu.php
index c96d75c439..597eeae194 100644
--- a/pandora_console/general/links_menu.php
+++ b/pandora_console/general/links_menu.php
@@ -22,13 +22,9 @@ $sql1='SELECT * FROM tlink ORDER BY name';
 $result=mysql_query($sql1);
 if ($row=mysql_fetch_array($result)){
 ?>
-<div class="bg4">
-	<div class="imgl"><img src="images/upper-left-corner.gif" width="5" height="5" alt=""></div>
-	<div class="tit">:: <?php echo $lang_label["links_header"] ?> ::</div>
-	<div class="imgr"><img src="images/upper-right-corner.gif" width="5" height="5" alt=""></div>
-</div>
+	<div class="tit bg4">:: <?php echo $lang_label["links_header"] ?> ::</div>
 	<div id="menul">
-	<div id="link">
+		<div id="link">
 <?php
 	$sql1='SELECT * FROM tlink ORDER BY name';
 	$result2=mysql_query($sql1);
diff --git a/pandora_console/general/logon_ok.php b/pandora_console/general/logon_ok.php
index 378d80d16f..b54a4eb168 100644
--- a/pandora_console/general/logon_ok.php
+++ b/pandora_console/general/logon_ok.php
@@ -102,7 +102,7 @@
 	}
 
 	// Site stats
-	echo '<h2 class="mgb25">' . $lang_label["stat_title"] . '</h2>';
+	echo '<h2 style="margin-bottom: 25px;">'. $lang_label["stat_title"].'</h2>';
 	echo '<table cellpadding="3" cellspacing="3" width="500"><tr>'; 
 	$query1 = "SELECT COUNT(id_usuario) FROM tusuario";
 	$result = mysql_query ($query1);
diff --git a/pandora_console/godmode/agentes/module_manager.php b/pandora_console/godmode/agentes/module_manager.php
index 968b135a70..c208d97a22 100644
--- a/pandora_console/godmode/agentes/module_manager.php
+++ b/pandora_console/godmode/agentes/module_manager.php
@@ -246,8 +246,8 @@ if ($row=mysql_num_rows($result)){
 // Module assignment form
 // ==========================
 
-echo "<a name='module_assignment'>";
-echo "<h2>".$lang_label["agent_conf"]." &gt; ".$lang_label["module_asociation_form"]."</a><a href='help/".$help_code."/chap3.php#321' target='_help' class='help'>
+echo "<a name='module_assignment'></a>";
+echo "<h2>".$lang_label["agent_conf"]." &gt; ".$lang_label["module_asociation_form"]."<a href='help/".$help_code."/chap3.php#321' target='_help' class='help'>
 &nbsp;<span>".$lang_label["help"]."</span></a></h2>";
 
 if ($update_module == "1")
diff --git a/pandora_console/godmode/menu.php b/pandora_console/godmode/menu.php
index 9dd3a5403c..95fd878511 100644
--- a/pandora_console/godmode/menu.php
+++ b/pandora_console/godmode/menu.php
@@ -28,11 +28,7 @@ if (comprueba_login() == 0){
 
 ?>
 
-<div class="bg3">
-	<div class="imgl"><img src="images/upper-left-corner.gif" width="5" height="5" alt=""></div>
-	<div class="tit">:: <?php echo $lang_label["godmode_header"] ?> ::</div>
-	<div class="imgr"><img src="images/upper-right-corner.gif" width="5" height="5" alt=""></div>
-</div>
+<div class="tit bg3">:: <?php echo $lang_label["godmode_header"] ?> ::</div>
 <div id="menug">
 	<div id="god">
 	
diff --git a/pandora_console/include/styles/pandora.css b/pandora_console/include/styles/pandora.css
index f8c80a76b4..97d4c3b05d 100644
--- a/pandora_console/include/styles/pandora.css
+++ b/pandora_console/include/styles/pandora.css
@@ -32,23 +32,22 @@
 	font-family: Verdana, sans-serif, Arial, Helvetica;
 	font-size: 11px;
 }
-
-input {
-	padding: 4px;
-	border:1px solid #eee;
-	font: normal 1em/1.5em Verdana, sans-serif;
+input, textarea {
+	border: 1px solid #eee;
+	font: Verdana, sans-serif, Arial;
 }
 textarea {
-	padding:4px;
-	font: normal 1em/1.5em Verdana, sans-serif;
-	border:1px solid #eee;
-	height:100px;
+	padding: 5px;
+	height: 100px;
+}
+input {
+	padding: 2px 3px 4px 3px;
 }
 input.button { 
 	margin: 0; 
-	font: bold 1em Arial, Sans-serif; 
-	border: 1px solid #CCC;
-	background: #FFF; 
+	font: bold, Arial, Sans-serif; 
+	border: 1px solid #ccc;
+	background: #fff; 
 	padding: 2px 3px; 
 	margin: 10px 15px;
 }
@@ -62,8 +61,6 @@ checkbox {
 	border:1px solid #eee;
 	font: normal 1em/1.5em Verdana, sans-serif;
 }
-
-
 h1, h2 {
 	color: #103a3a;
 	padding-bottom: 15px;
@@ -155,20 +152,28 @@ div#db_ftxt {
 #page {
 	width: 960px;
 }
-
 #main {
 	width: 780px;
 	float: right;
 }
-
 #menu {
 	width: 155px;
 	float: left;
 }
-
 div#page>div#menu {
 	width: 157px;
 }
+#head {
+	padding-bottom: 10px;
+	font-size: 10px;
+	width: 100%;
+	margin-left: 15px;
+}
+#foot {
+	padding-top: 25px;
+	text-align: center;
+	clear: both;
+}
 #ver {
 	margin-bottom: 25px;
 }
@@ -214,54 +219,40 @@ input.next {
 	padding-right: 21px;
 	background: #e5e5e5 url(../../images/go.png) no-repeat right 4px;
 }
-
 input.upd {
 	padding-right: 21px;
 	background: #e5e5e5 url(../../images/upd.png) no-repeat right 5px;
 }
-
 input.wand {
 	padding-right: 21px;
 	background: #e5e5e5 url(../../images/wand.png) no-repeat right 4px;
 }
-
 input.delete {
 	padding-right: 21px;
 	background: #e5e5e5 url(../../images/cross.png) no-repeat right 4px;
 }
-
-
 table, img {
 	border: 0px;
 }
-
 th, td.lb {
-	color: #ffffff;
+	color: #fff;
 	background-color: #778866;
 }
-
 td.lb_view {
-	color: #ffffff;
+	color: #fff;
 	background-color: #7ba04a;
 }
-
 td.lb, td.lb_view {
 	height: 16px;
 	padding-left: 3px;
 	font-weight: bold;
 }
-td.datos, td.datost, td.datosb, td.datos_id, td.datosf9, 
-td.datosf9i, td.datos_jus, td.w90datos, td.w135datos {
-	/* background-color: #f5f5f5; */
+td.datos, td.datost, td.datosb, td.datos_id , td.datosf9 {
 	background-color: #f9f9f9;
 }
- 
-td.datos2, td.datos2t, td.datos2b, td.datos2_id, td.datos2f9, 
-td.datos2f9i, td.datos2_jus, td.w90datos2, td.w135datos2 {
+td.datos2, td.datos2t, td.datos2b, td.datos2_id , td.datos2f9 {
 	background-color: #efefef; 
-	/* background-color: #e6e9cd; */
 }
-
 td.datos3 {
 	background-color: #a7b896;
 }
@@ -283,32 +274,21 @@ td.datos_jus, td.datos2_jus {
 .bg4 { /* links */
 	background-color: #5385bf;
 }
-
 .bg, .bg2, .bg3, .bg4 {
 	position: relative;
 	height: 20px;
 	width: 100%;
 }
-.f10, .w155f10, #ip {
+.f10, #ip {
 	font-size: 10px;
 	text-align: center;
 }
-.f9, .f9i, .f9b, td.f9, td.f9i, td.datosf9, td.datos2f9, 
-td.datosf9i, td.datos2f9i {
+.f9, .f9i, .f9b, td.f9, td.f9i, td.datosf9, td.datos2f9 {
 	font-size: 9px;
 }
 .f9i, .redi {
 	font-style: italic;
 }
-.f9l20 {
-	padding-left: 20px;
-}
-.f9l30, .f9l30t, .f9l30w17t {
-	padding-left: 30px;
-}
-.f9l30w17t  {
-	line-height: 17px;
-}
 .jus {
 	text-align: justify;
 	width: 700px;
@@ -318,7 +298,7 @@ td.datosf9i, td.datos2f9i {
 }
 .tit, .titb {
 	font-weight: bold;
-	color: #ffffff;
+	color: #fff;
 	text-align: center;
 }
 .error {
@@ -326,7 +306,7 @@ td.datosf9i, td.datos2f9i {
 	padding: 4px 1px 6px 30px;
 }
 .red , .redb, .redi, .error {
-	color: #ff0000;
+	color: #f00;
 }
 .sep {
 	margin-left: 30px;
@@ -378,7 +358,7 @@ td.datosf9i, td.datos2f9i {
 .w155 {
 	width: 155px;
 }
-.top, .top_red, .bgt, .f9l30t, td.datost, td.datos2t {
+.top, .top_red, .bgt, td.datost, td.datos2t {
 	vertical-align: top;
 }
 .top_red {
@@ -393,7 +373,10 @@ td.datosf9i, td.datos2f9i {
 }
 .mr40 {
 	margin-right: 40px;
-} 
+}
+.mt35 {
+	margin-top: 35px;
+}
 ul.mn {
 	list-style: none;
 	padding: 0px 0px 0px 0px;
@@ -407,21 +390,6 @@ ul.mn {
 a.mn, .gr {
 	font-family: Arial, Verdana, sans-serif, Helvetica;
 }
-.imgl {
-	position: absolute;
-	top: 0;
-	left: 0;
-}
-.imgr {
-	position: absolute;
-	top: 0;
-	right: -1;
-}
-div.imgr>img {
-	position: absolute;
-	top: 0;
-	right: 1;
-}
 div.nf {
 	background: url(../../images/info.png) no-repeat;
 	color: #ac4444;
@@ -430,7 +398,7 @@ div.nf {
 }
 div#wizard {
 	text-align: left;
-	border: 1px solid #999999;
+	border: 1px solid #999;
 	margin-top: 3em;
 	margin-bottom: -1em;
 	padding: 20px;
@@ -438,23 +406,17 @@ div#wizard {
 	background-color: #fff;
 	background: url(../../images/background8.jpg);
 }
-.mt35 {
-	margin-top: 35px;
-}
-
 div#install_box {
 	float: right;
 	padding-right: 20px;
 	margin-top: 10px;
 	width: 350px;
 }
-
 div.title_line {
 	background-color: #4e682c;
 	height: 5px;
 	width: 762px;
 }
-
 div.data_box {
 	border-top: 5px solid #778855;
 	border-right: 1px solid #4e682c;
@@ -465,27 +427,23 @@ div.data_box {
 	margin-bottom: 25px;
 	background-color: #fefefe;
 	/* border: 1px solid #dAdBdC; */
-	width: 799px;
+	width: 790px;
 	float: left;
 	margin-top: 0px;
-	margin-left: 0px;
+	margin-left: 2px;
 	margin-right: 0px;
 	min-height: 470px;
 }
-
-#menu_tab .mn, #menu_tab ul, #menu_tab .mn ul
-{
+#menu_tab .mn, #menu_tab ul, #menu_tab .mn ul {
 	padding: 0px;
 	list-style: none;
 	margin: 0px;
 }
-#menu_tab .mn li
-{
+#menu_tab .mn li {
 	float: right;
 	position: relative;
 }
-#menu_tab li a, #menu_tab li.nomn a
-{
+#menu_tab li a, #menu_tab li.nomn a {
 	background: #d4ddc6;
 	padding: 2px 10px 2px 10px;
 	color: #333;
@@ -493,55 +451,42 @@ div.data_box {
 	font-weight: bold;
 	line-height: 18px;
 }
-
-#menu_tab .mn li a
-{
+#menu_tab .mn li a {
 	display: block;
 	text-decoration: none;
 }
-
 #menu_tab li.nomn:hover a, 
-#menu_tab li:hover ul a:hover
-{
+#menu_tab li:hover ul a:hover {
 	background: #cde0ad;
 }
-#menu_tab li:hover a
-{
+#menu_tab li:hover a {
 	background: #b2b08a url("../images/arrow.gif") no-repeat right 3px;
 }
-#menu_tab li:hover ul a, #menu_tab .mn ul
-{
+#menu_tab li:hover ul a, #menu_tab .mn ul {
 	background: #db6351;
 	border-top: none;
 }
 /* TAB TITLE */
-
-#menu_tab_left .mn, #menu_tab_left ul, #menu_tab_left .mn ul
-{
+#menu_tab_left .mn, #menu_tab_left ul, #menu_tab_left .mn ul {
 	padding: 0px 0px 0px 0px;
 	list-style: none;
 	margin: 0px 0px 0px -20px;
 }
-#menu_tab_left .mn li
-{
+#menu_tab_left .mn li {
 	float: left;
 	position: relative;
 }
-#menu_tab_left li a, #menu_tab_left li.nomn a
-{
+#menu_tab_left li a, #menu_tab_left li.nomn a {
 	background: #ac4444;
 	padding: 2px 10px 2px 10px;
 	color: #fff;
 	font-weight: bold;
 	line-height: 18px;
 }
-
-#menu_tab_left .mn li a
-{
+#menu_tab_left .mn li a {
 	display: block;
 	text-decoration: none;
 }
-
 span.users {
 	background: url(../../images/group.png) no-repeat;
 }
@@ -579,38 +524,18 @@ span.master, span.snmp, span.binary, span.recon {
 	padding: 4px 8px 12px 30px;
 	display: block;
 }
-.mgb25 {
-	margin-bottom: 25px;
-}
-#head {
-	border-bottom: 1px solid #708090;
-	padding-bottom: 12px;
-	font-size: 10px;
-	width: 800px;
-	margin-bottom: 27px;
-	margin-left: 5px;
-}
-#foot {
-	padding-top: 25px;
-	text-align: center;
-	clear: both;
-}
-
 /* New styles for data box */
-
 .databox_color {
 	margin: 10px 15px;
-	border: 1px solid #f2f2f2; 
-	border-left: 3px solid #EC981F;  
+	border: 1px solid #f2f2f2;
+	border-left: 3px solid #ec981f;
 }
-
 .databox {
 	margin: 10px 15px;
-	border: 1px solid #f2f2f2; 
-	background-color: #FAFAFA; 
+	border: 1px solid #f2f2f2;
+	background-color: #fafafa;
 }
-
 .databox_frame {
 	margin: 10px 15px;
-	border: 1px solid #f2f2f2; 
+	border: 1px solid #f2f2f2;
 }
\ No newline at end of file
diff --git a/pandora_console/operation/agentes/estado_alertas.php b/pandora_console/operation/agentes/estado_alertas.php
index 95a9036842..98ecad8eb3 100644
--- a/pandora_console/operation/agentes/estado_alertas.php
+++ b/pandora_console/operation/agentes/estado_alertas.php
@@ -208,7 +208,7 @@ if (isset($_GET["id_agente"])){
 
 		} //end while
 		if (isset($string)) {
-			echo "<td class='f9l30'>";
+			echo "<td class='f9' style='padding-left: 30px;'>";
 			echo "<img src='images/dot_red.gif'> - ".$lang_label["fired"];
 			echo "&nbsp;&nbsp;</td>";
 			echo "<td>";
diff --git a/pandora_console/operation/agentes/estado_generalagente.php b/pandora_console/operation/agentes/estado_generalagente.php
index 0ddccd0e3e..fff17e3a14 100644
--- a/pandora_console/operation/agentes/estado_generalagente.php
+++ b/pandora_console/operation/agentes/estado_generalagente.php
@@ -59,7 +59,7 @@ if (comprueba_login() == 0) {
 	// Blank space below title
 	echo "<div style='height: 10px'> </div>";
 	
-	echo '<table cellspacing="0" cellpadding="0" width="800" border=0>';
+	echo '<table cellspacing="0" cellpadding="0" width="780" border=0>';
 	echo "<tr><td>";
 	echo '<table cellspacing="4" cellpadding="4" border=0>';
 	echo "<tr><td class='lb_view' rowspan='12' width='1'>";
@@ -146,7 +146,7 @@ if (comprueba_login() == 0) {
 		<td class="datos">
 		<b>'.$lang_label["last_contact"]." / ".$lang_label["remote"].'</b>
 		</td>
-		<td class="datosf9" colspan="2">';
+		<td class="datos f9" colspan="2">';
 	if ($ultima_act == "0000-00-00 00:00:00"){ 
 		echo $lang_label["never"];
 	} else {
diff --git a/pandora_console/operation/events/events.php b/pandora_console/operation/events/events.php
index ba90098265..8ea019340f 100644
--- a/pandora_console/operation/events/events.php
+++ b/pandora_console/operation/events/events.php
@@ -172,12 +172,12 @@ if ( $ev_group > 1 ){
 echo "<option value=1>".dame_nombre_grupo(1)."</option>";
 list_group ($id_user);
 echo "</select>";
-echo "<td class='f9l30w17t'>";
+echo "<td class='f9' style='padding-left: 30px; line-height: 17px; vertical-align: top;'>";
 echo "<img src='images/dot_green.gif'> - ".$lang_label["validated_event"];
 echo "<br>";
 echo "<img src='images/dot_red.gif'> - ".$lang_label["not_validated_event"];
 echo "</td>";
-echo "<td class='f9l30w17t'>";
+echo "<td class='f9' style='padding-left: 30px; line-height: 17px; vertical-align: top;'>";
 echo "<img src='images/ok.png'> - ".$lang_label["validate_event"];
 echo "<br>";
 echo "<img src='images/cross.png'> - ".$lang_label["delete_event"];
diff --git a/pandora_console/operation/incidents/incident.php b/pandora_console/operation/incidents/incident.php
index 61bc0f199b..a8dafd1650 100644
--- a/pandora_console/operation/incidents/incident.php
+++ b/pandora_console/operation/incidents/incident.php
@@ -232,7 +232,7 @@ if (isset($_POST['operacion'])){
 	</td>
 	<td valign="middle"><noscript><input type="submit" class="sub" value="<?php echo $lang_label["show"] ?>" border="0"></noscript>
 	</td>
-	<td rowspan="5" class="f9l30t">
+	<td rowspan="5" class="f9" style="padding-left: 30px; vertical-align: top;">
 	<h3><?php echo $lang_label["status"] ?></h3>
 	<img src='images/dot_red.gif'> - <?php echo $lang_label["opened_inc"] ?><br>
 	<img src='images/dot_yellow.gif'> - <?php echo $lang_label["openedcom_inc"] ?><br>
@@ -240,7 +240,7 @@ if (isset($_POST['operacion'])){
 	<img src='images/dot_green.gif'> - <?php echo $lang_label["closed_inc"] ?><br>
 	<img src='images/dot_white.gif'> - <?php echo $lang_label["exp_inc"] ?></td>
 
-	<td rowspan="5" class="f9l30t">
+	<td rowspan="5" class="f9" style="padding-left: 30px; vertical-align: top;">
 	<h3><?php echo $lang_label["priority"] ?></h3>
 	<img src='images/dot_red.gif'><img src='images/dot_red.gif'><img src='images/dot_red.gif'> - <?php echo $lang_label["very_serious"] ?><br>
 	<img src='images/dot_yellow.gif'><img src='images/dot_red.gif'><img src='images/dot_red.gif'> - <?php echo $lang_label["serious"] ?><br>
diff --git a/pandora_console/operation/menu.php b/pandora_console/operation/menu.php
index fa29985610..fb54b6472c 100644
--- a/pandora_console/operation/menu.php
+++ b/pandora_console/operation/menu.php
@@ -24,11 +24,7 @@ if (! isset($_SESSION["id_usuario"])) {
 } 
 
 ?>
-<div class="bg">
-	<div class="imgl"><img src="images/upper-left-corner.gif" width="5" height="5" alt=""></div>
-	<div class="tit">:: <?php echo $lang_label["operation_header"] ?> ::</div>
-	<div class="imgr"><img src="images/upper-right-corner.gif" width="5" height="5" alt=""></div>
-</div>
+<div class="tit bg">:: <?php echo $lang_label["operation_header"] ?> ::</div>
 <div id="menuop">
 <div id="op">
 <?php
diff --git a/pandora_console/operation/snmpconsole/snmp_view.php b/pandora_console/operation/snmpconsole/snmp_view.php
index 4b9bf6ee00..32f5bd3718 100644
--- a/pandora_console/operation/snmpconsole/snmp_view.php
+++ b/pandora_console/operation/snmpconsole/snmp_view.php
@@ -133,14 +133,14 @@ if (comprueba_login() == 0) {
 	if (mysql_num_rows($result2)){
 	
 		echo "<table><tr>";
-		echo "<td class='f9l30'>";
+		echo "<td class='f9' style='padding-left: 30px;'>";
 		echo "<img src='images/dot_green.gif'> - ".$lang_label["validated_event"];
 		echo "<br>";
 		echo "<img src='images/dot_red.gif'> - ".$lang_label["not_validated_event"];
 		echo "<br>";
 		echo "<img src='images/dot_yellow.gif'> - ".$lang_label["alert"];
 		echo "</td>";
-		echo "<td class='f9l20'>";  
+		echo "<td class='f9' style='padding-left: 20px;'>";  
 		echo "<img src='images/ok.png'> - ".$lang_label["validate_event"];
 		echo "<br>"; 
 		echo "<img src='images/cross.png '> - ".$lang_label["delete_event"];