diff --git a/pandora_console/ChangeLog b/pandora_console/ChangeLog
index 3a16af6c54..a5b8743a0d 100644
--- a/pandora_console/ChangeLog
+++ b/pandora_console/ChangeLog
@@ -1,3 +1,10 @@
+2007-05-18  Raul Mateos  <raulofpandora@gmail.com>
+
+	* images/header.png: New graphic image for header in the new design.
+
+	* Style / Graphic changes for new design (not finished).
+
+
 2007-05-08  Raul Mateos  <raulofpandora@gmail.com>
 
 	* godmode/modules/*.php, godmode/agentes/*.php: Added icon to buttons.
diff --git a/pandora_console/general/header.php b/pandora_console/general/header.php
index c6d546b08d..be9969eb92 100644
--- a/pandora_console/general/header.php
+++ b/pandora_console/general/header.php
@@ -18,8 +18,17 @@
 // 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 "<tr>";
+echo '
+<div id="head_r">
+	<span id="logo_text1">Pandora</span> <span id="logo_text2">FMS</span>
+</div>
+<div_id="head_l">
+	<a href="index.php"><img src="images/logo_menu.gif" border="0" alt="logo"></a>
+</div>
+
+';
+/* echo "<table border='0' style='margin-right: 145px;margin-top: 20px;'>
+	<tr>";
 if (isset ($_SESSION["id_usuario"])){
 	echo "<td width=40%>";
 	$id_usuario = entrada_limpia ($_SESSION["id_usuario"]);
@@ -36,5 +45,7 @@ if (isset ($_SESSION["id_usuario"])){
 	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 "</table>";
+echo "</tr></table>";
+*/
+
 ?>
\ No newline at end of file
diff --git a/pandora_console/general/links_menu.php b/pandora_console/general/links_menu.php
index 597eeae194..becba7e050 100644
--- a/pandora_console/general/links_menu.php
+++ b/pandora_console/general/links_menu.php
@@ -23,14 +23,13 @@ $result=mysql_query($sql1);
 if ($row=mysql_fetch_array($result)){
 ?>
 	<div class="tit bg4">:: <?php echo $lang_label["links_header"] ?> ::</div>
-	<div id="menul">
-		<div id="link">
+	<div class="menul" id="link">
 <?php
 	$sql1='SELECT * FROM tlink ORDER BY name';
 	$result2=mysql_query($sql1);
 		while ($row2=mysql_fetch_array($result2)){
 			echo "<div class='linkli'><ul class='mn'><li><a href='".$row2["link"]."' target='_new' class='mn'>".$row2["name"]."</a></li></ul></div>";
 		}
-	echo "</div></div>";
+	echo "</div>";
 }
 ?>
\ No newline at end of file
diff --git a/pandora_console/general/main_menu.php b/pandora_console/general/main_menu.php
index 6aeacc2b84..d5822f8ab4 100644
--- a/pandora_console/general/main_menu.php
+++ b/pandora_console/general/main_menu.php
@@ -18,11 +18,9 @@
 // along with this program; if not, write to the Free Software
 // Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
 ?>
-<br>
-<a href="index.php"><img src="images/logo_menu.gif" border="0" alt="logo"></a>
-<div id='ver'><?php echo $pandora_version; ?></div>
 
-<?php 
+
+<?php
 require ("operation/menu.php");
 if (! isset ($_SESSION["id_usuario"])) {
 	echo '<div class="f10">' . $lang_label["not_connected"];
diff --git a/pandora_console/godmode/menu.php b/pandora_console/godmode/menu.php
index 95fd878511..91529d257c 100644
--- a/pandora_console/godmode/menu.php
+++ b/pandora_console/godmode/menu.php
@@ -29,8 +29,7 @@ if (comprueba_login() == 0){
 ?>
 
 <div class="tit bg3">:: <?php echo $lang_label["godmode_header"] ?> ::</div>
-<div id="menug">
-	<div id="god">
+<div class="menug" id="god">
 	
 <?PHP
 	if ((give_acl($id_user, 0, "AW")==1)){
@@ -216,7 +215,6 @@ if (comprueba_login() == 0){
 		}
 	}
 	?>
-	</div>
 </div>
 <?php
 	} // end verify access to this menu
diff --git a/pandora_console/images/header.jpg b/pandora_console/images/header.jpg
new file mode 100644
index 0000000000..a6c3078cdd
Binary files /dev/null and b/pandora_console/images/header.jpg differ
diff --git a/pandora_console/images/logo_menu.gif b/pandora_console/images/logo_menu.gif
index 58b2d07a55..17e1be6cf2 100644
Binary files a/pandora_console/images/logo_menu.gif and b/pandora_console/images/logo_menu.gif differ
diff --git a/pandora_console/include/styles/god.css b/pandora_console/include/styles/god.css
index 5be1750fc6..665b970170 100644
--- a/pandora_console/include/styles/god.css
+++ b/pandora_console/include/styles/god.css
@@ -9,11 +9,11 @@
 	border-bottom: 1px solid #d4d4d4;
 	border-top: 1px solid #ffffff;
 }
-div#menug {
+div.menug {
 	background-color: #f5f5dc;
 	border: 1px solid #dadbdc;
 	width: 155px;
-	margin-bottom: 15px;
+	margin-bottom: 5px;
 	}
 #god1 li, #god2 li, #god3 li, #god4 li, #god5 li, #god6 li, #god7 li, #god8 li, #god1s li, 
 #god2s li, #god3s li, #god4s li, #god5s li, #god6s li, #god7s li, #god8s li, #god_module li, #god_module_sel li {
@@ -49,7 +49,7 @@ div#god5s>ul, div#god6s>ul, div#god7s>ul, div#god8s>ul, div#god_module>ul, div#g
 	background: url(../../images/god8.gif) no-repeat 5px 3px;
 }
 #god_module li, #god_module li:hover, #god_module_sel li {
-	background: url(../../images/brick.png) no-repeat 4px 5px;
+	background: url(../../images/brick.png) no-repeat 6px 4px;
 }
 div.arrowg>ul, div.arrowgs>ul {
 	width: 74%;
diff --git a/pandora_console/include/styles/link.css b/pandora_console/include/styles/link.css
index 220602a831..bf0efc6148 100644
--- a/pandora_console/include/styles/link.css
+++ b/pandora_console/include/styles/link.css
@@ -23,7 +23,7 @@
 	display: block;
 	color: #000;
 }
-div#menul {
+div.menul {
 	background-color: #e9f3d2;	
 	border: 1px solid #dadbdc;
 	width: 155px;
diff --git a/pandora_console/include/styles/op.css b/pandora_console/include/styles/op.css
index 447fb20353..ec7ac2abd1 100644
--- a/pandora_console/include/styles/op.css
+++ b/pandora_console/include/styles/op.css
@@ -9,12 +9,12 @@
 	border-bottom: 1px solid #d4d4d4;
 	border-top: 1px solid #eee;
 }
-div#menuop {
+div.menuop {
 	background-color: #e6e9cd;
 	border: 1px solid #dadbdb;
 	/* border: 1px solid #4a6629; */
 	width: 155px;
-	margin-bottom: 15px;
+	margin-bottom: 5px;
 	}
 #op1 li, #op2 li, #op3 li, #op4 li, #op5 li, #op6 li, #op7 li, #op8 li, #op9 li,
 #op1s li, #op2s li, #op3s li, #op4s li, #op5s li, #op6s li, #op7s li, #op8s li, #op9s li {
diff --git a/pandora_console/include/styles/pandora.css b/pandora_console/include/styles/pandora.css
index e8722ff297..05b3bfd19e 100644
--- a/pandora_console/include/styles/pandora.css
+++ b/pandora_console/include/styles/pandora.css
@@ -27,11 +27,14 @@
 @import url(god.css);
 @import url(link.css);
 @import url(tip.css);
-@import url(calendar.css);
 * {
 	font-family: Verdana, sans-serif, Arial, Helvetica;
 	font-size: 11px;
 }
+body {
+	background-color: #555;
+	margin-top: 0;
+}
 input, textarea {
 	border: 1px solid #eee;
 	font: Verdana, sans-serif, Arial;
@@ -149,29 +152,43 @@ div#db_ftxt {
 	float: right;
 	padding-top: 10px;
 }
-#page {
+div#page {
 	width: 960px;
+	background: #fff;
+	clear: both;
 }
-#main {
-	width: 780px;
+div#main {
+	width: 770px;
 	float: right;
+	border-top: 5px solid #778855;
+	padding-left: 20px;
+	padding-top: 0px;
+	padding-bottom: 20px;
+	margin-bottom: 25px;
+	background-color: #fefefe;
+	margin-top: 0px;
+	margin-left: 0px;
+	margin-right: 0px;
 }
-#menu {
+div#menu {
 	width: 155px;
 	float: left;
 }
 div#page>div#menu {
 	width: 157px;
 }
-#head {
-	padding-bottom: 10px;
+div#head {
 	font-size: 10px;
-	width: 100%;
-	margin-left: 15px;
+	width: 960px;
+	height: 60px;
+	border-bottom: solid 3px #000;
+	background: url(../../images/header.jpg);
 }
-#foot {
-	padding-top: 25px;
+div#foot {
+	padding-top: 15px;
 	text-align: center;
+	background: #fff;
+	width: 960px;
 	clear: both;
 }
 #ver {
@@ -192,7 +209,7 @@ th > label {
 input:hover {
 	background-color: #d4dccd;
 }
-input.chk {
+input.chk {margin-right: 0px;
 	border: 0px none;
 	height: 14px;
 }
@@ -265,7 +282,7 @@ td.datos_jus, td.datos2_jus {
 	text-align: justify;
 }
 .bg , .bgt { /* op menu */
-	background-color: #4a6629;
+	background-color: #778855;
 }
 .bg2 { /* main page */
 	background-color: #d84437;
@@ -419,23 +436,6 @@ div.title_line {
 	height: 5px;
 	width: 762px;
 }
-div.data_box {
-	border-top: 5px solid #778855;
-	border-right: 1px solid #4e682c;
-	border-bottom: 1px solid #4e682c;
-	padding-left: 20px;
-	padding-top: 0px;
-	padding-bottom: 20px;
-	margin-bottom: 25px;
-	background-color: #fefefe;
-	/* border: 1px solid #dAdBdC; */
-	width: 790px;
-	float: left;
-	margin-top: 0px;
-	margin-left: 2px;
-	margin-right: 0px;
-	min-height: 470px;
-}
 #menu_tab .mn, #menu_tab ul, #menu_tab .mn ul {
 	padding: 0px;
 	list-style: none;
@@ -480,6 +480,7 @@ div.data_box {
 }
 #menu_tab_left li a, #menu_tab_left li.nomn a {
 	background: #ac4444;
+	background: #d84437;
 	padding: 2px 10px 2px 10px;
 	color: #fff;
 	font-weight: bold;
@@ -527,17 +528,37 @@ span.master, span.snmp, span.binary, span.recon {
 	display: block;
 }
 /* New styles for data box */
-.databox_color {
+.databox, .databox_color, .databox_frame {
 	margin: 10px 15px;
 	border: 1px solid #f2f2f2;
-	border-left: 3px solid #ec981f;
 }
 .databox {
-	margin: 10px 15px;
-	border: 1px solid #f2f2f2;
 	background-color: #fafafa;
 }
-.databox_frame {
-	margin: 10px 15px;
-	border: 1px solid #f2f2f2;
-}
\ No newline at end of file
+.databox_color {
+	border-left: 3px solid #ec981f;
+}
+#head_l {
+	float: left;
+	margin: 0;
+	padding: 0;
+}
+#head_r {
+	float: right;
+	text-align: right;
+	margin-right: 10px;
+	padding-top: 10px;
+}
+span#logo_text1 {
+	font: bolder 3em Arial, Sans-serif;
+	letter-spacing: -2px;
+	color: #eee;
+}
+span#logo_text2 {
+	font: 3em Arial, Sans-serif;
+	letter-spacing: -2px;
+	color: #aaa;
+}
+
+
+
diff --git a/pandora_console/index.php b/pandora_console/index.php
index 83378b32f8..e97cceeacd 100644
--- a/pandora_console/index.php
+++ b/pandora_console/index.php
@@ -97,7 +97,7 @@ if (isset ($_GET["refr"])){
 
 <?php
 	// Show custom background
-	echo '<body background="images/backgrounds/' . $config_bgimage . '">';
+	echo '<body>';
 	$REMOTE_ADDR = getenv ("REMOTE_ADDR");
    	global $REMOTE_ADDR;
 
@@ -187,28 +187,32 @@ if (isset ($_GET["refr"])){
 	// Session locking concurrency speedup!
 	session_write_close(); 
 ?>
-<div id="page">
-	<div id="menu"><?php require ("general/main_menu.php"); ?></div>
-	<div id="main">	
-	<div id='head'><?php require("general/header.php"); ?></div>
-	<!-- <div style='height: 10px'> </div> -->
-	<div class='data_box'>
 
-	<?php
-		// Page loader / selector		
-		if ($pagina != ""){
-			if (file_exists ($pagina . ".php")) {
-				require ($pagina . ".php");
-			} else {
-				echo "<br><b class='error'>Sorry! I can't find the page!</b>";
-			}	
-		} else
-			require ("general/logon_ok.php");  //default
-		
-	?>
-		
-	</div>
+<div id='head'>
+	<?php require("general/header.php"); ?>
+</div>
+<div id="page">
+	<div id="menu">
+		<?php require ("general/main_menu.php"); ?>
+	</div>
+	<div id="main" style="background: url(images/backgrounds/<?php echo $config_bgimage; ?>)" >
+		<?php
+			// Page loader / selector
+			if ($pagina != ""){
+				if (file_exists ($pagina . ".php")) {
+					require ($pagina . ".php");
+				} else {
+					echo "<br><b class='error'>Sorry! I can't find the page!</b>";
+				}	
+			} else
+				require ("general/logon_ok.php");  //default
+		?>
+	</div>
+	<div style="clear:both"></div>
+</div>
+
+<div id="foot">
+	<?php require("general/footer.php") ?>
 </div>
-<div id="foot"><?php require("general/footer.php") ?></div>
 </body>
 </html>
diff --git a/pandora_console/operation/menu.php b/pandora_console/operation/menu.php
index fb54b6472c..227ec37db4 100644
--- a/pandora_console/operation/menu.php
+++ b/pandora_console/operation/menu.php
@@ -3,7 +3,7 @@
 // Pandora - the Free monitoring system
 // ====================================
 // Copyright (c) 2004-2006 Sancho Lerena, slerena@gmail.com
-// Copyright (c) 2005-2006 Artica Soluciones Tecnológicas S.L, info@artica.es
+// Copyright (c) 2005-2006 Artica Soluciones Tecnol�gicas S.L, info@artica.es
 // Copyright (c) 2004-2006 Raul Mateos Martin, raulofpandora@gmail.com
 // This program is free software; you can redistribute it and/or
 // modify it under the terms of the GNU General Public License
@@ -25,8 +25,7 @@ if (! isset($_SESSION["id_usuario"])) {
 
 ?>
 <div class="tit bg">:: <?php echo $lang_label["operation_header"] ?> ::</div>
-<div id="menuop">
-<div id="op">
+<div class="menuop" id="op">
 <?php
 
 // Agent read, Server read
@@ -241,4 +240,3 @@ if (give_acl($_SESSION["id_usuario"], 0, "AR")==1) {
 
 ?>		
 </div>
-</div>