diff --git a/pandora_console/extensions/agents_alerts.php b/pandora_console/extensions/agents_alerts.php
index 557bacb31a..e93b97cddf 100755
--- a/pandora_console/extensions/agents_alerts.php
+++ b/pandora_console/extensions/agents_alerts.php
@@ -105,10 +105,18 @@ function mainAgentsAlerts() {
 	}
 	
 	// Header
-	ui_print_page_header (__("Agents/Alerts"), "images/op_alerts.png", false, "", false, $onheader);
+	ui_print_page_header (__("Agents/Alerts"), "images/op_alerts.png", false, "", false, $updated_time);
 	
 	// Old style table, we need a lot of special formatting,don't use table function
 	// Prepare old-style table
+	echo '<table class="databox filters" cellpadding="0" cellspacing="0" border="0" style="width:100%;">';
+	echo "<tr>";
+	echo "<td>" . $filter_groups  . "</td>";
+	if ($config['pure'] == 1) 
+		echo "<td>" . $comborefr  . "</td>";
+	echo "<td> <strong>" . __("Full screen") . "</strong>" . $fullscreen['text'] . "</td>";
+	echo "</tr>";
+	echo "</table>";
 	
 	$filter = array ('offset' => (int) $offset,
 		'limit' => (int) $config['block_size']);
@@ -144,7 +152,7 @@ function mainAgentsAlerts() {
 	$nagents = count(agents_get_agents ($filter_count));
 	
 	if ($agents == false) {
-		echo "<div class='nf'>" . __('There are no agents with alerts')."</div>";
+		ui_print_info_message ( array('no_close'=>true, 'message'=> __('There are no agents with alerts') ) );
 		return;
 	}
 	
@@ -164,12 +172,15 @@ function mainAgentsAlerts() {
 	// Prepare pagination
 	ui_pagination ($nagents);
 	
-	echo '<table cellpadding="4" cellspacing="4" border="0" width=98%>';
-	echo "<th width='140px' height='25px'>".__("Agents")." / ".__("Alert templates")."</th>";
+	echo '<table class="databox data" cellpadding="0" cellspacing="0" border="0" width=100%>';
+	echo "<th width='140px' >".__("Agents")." / ".__("Alert templates")."</th>";
 	
 	if ($hor_offset > 0) {
 		$new_hor_offset = $hor_offset-$block;
-		echo "<th width='20px' style='vertical-align:top; padding-top: 35px;' rowspan='".($nagents+1)."'><a href='index.php?sec=extensions&sec2=extensions/agents_alerts&refr=0&hor_offset=".$new_hor_offset."&offset=".$offset."&group_id=".$group_id."'>".html_print_image("images/darrowleft.png",true, array('title' => __('Previous templates')))."</a> </th>";
+		echo "<th width='20px' style='' rowspan='".($nagents+1)."'>
+				<a href='index.php?sec=extensions&sec2=extensions/agents_alerts&refr=0&hor_offset=".
+					$new_hor_offset."&offset=".$offset."&group_id=".$group_id."'>".
+						html_print_image("images/darrowleft.png",true, array('title' => __('Previous templates')))."</a> </th>";
 	}
 	
 	$templates_raw = array();
@@ -200,12 +211,14 @@ function mainAgentsAlerts() {
 		if ($tname == '') {
 			continue;
 		}
-		echo '<th width="20px" >'. html_print_image('images/information.png', true, array('title' => io_safe_output($tname))) ."</th>";
+		echo '<th width="20px" >'. io_safe_output($tname) . html_print_image('images/information.png', true, array('title' => io_safe_output($tname))) ."</th>";
 	}
 	
 	if (($hor_offset + $block) < $ntemplates) {
 		$new_hor_offset = $hor_offset+$block;
-		echo "<th width='20px' style='vertical-align:top; padding-top: 35px;' rowspan='".($nagents+1)."'><a href='index.php?sec=extensions&sec2=extensions/agents_alerts&hor_offset=".$new_hor_offset."&offset=".$offset."&group_id=".$group_id."'>".html_print_image("images/darrowright.png",true, array('title' => __('More templates')))."</a> </th>";
+		echo "<th width='20px' style='' rowspan='".($nagents+1)."'>
+			<a href='index.php?sec=extensions&sec2=extensions/agents_alerts&hor_offset=".$new_hor_offset."&offset=".
+				$offset."&group_id=".$group_id."'>".html_print_image("images/darrowright.png",true, array('title' => __('More templates')))."</a> </th>";
 	}
 	
 	foreach ($agents as $agent) {
@@ -231,7 +244,7 @@ function mainAgentsAlerts() {
 					$cellstyle = 'background:'.COL_ALERTFIRED.';';
 				}
 				
-				echo '<td style="text-align:center;'.$cellstyle.'"> ';
+				echo '<td style=";'.$cellstyle.'"> ';
 				
 				$uniqid = uniqid();
 				echo "<div>";
diff --git a/pandora_console/extensions/agents_modules.php b/pandora_console/extensions/agents_modules.php
index 4ad792fe9f..65bf295c11 100644
--- a/pandora_console/extensions/agents_modules.php
+++ b/pandora_console/extensions/agents_modules.php
@@ -74,12 +74,12 @@ function mainAgentsModules() {
 	$filter_module_groups = '<form method="post" action="' . ui_get_url_refresh (array ('offset' => $offset, 'hor_offset' => $offset,'group_id' => $group_id, 'modulegroup' => $modulegroup)).'">';
 	$filter_module_groups .= '<b>'.__('Module group').'</b>';
 	$filter_module_groups .= html_print_select_from_sql ("SELECT * FROM tmodule_group ORDER BY name",
-		'modulegroup', $modulegroup, 'this.form.submit()',__('All'), 0, true, false, true, false, 'width: 100px; margin-right: 10px; margin-top: 5px;');
+		'modulegroup', $modulegroup, 'this.form.submit()',__('All'), 0, true, false, true, false, 'width: auto;');
 	$filter_module_groups .= '</form>';
 	
 	$filter_groups = '<form method="post" action="' . ui_get_url_refresh (array ('offset' => $offset, 'hor_offset' => $offset,'group_id' => $group_id, 'modulegroup' => $modulegroup)).'">';
 	$filter_groups .= '<b>'.__('Group').'</b>';
-	$filter_groups .= html_print_select_groups(false, "AR", true, 'group_id', $group_id, 'this.form.submit()', '', '', true, false, true, '', false , 'width: 100px; margin-right: 10px;; margin-top: 5px;');
+	$filter_groups .= html_print_select_groups(false, "AR", true, 'group_id', $group_id, 'this.form.submit()', '', '', true, false, true, '', false , 'width: auto;');
 	$filter_groups .= '</form>';
 	
 	$comborefr = '<form method="post" action="' . ui_get_url_refresh (array ('offset' => $offset, 'hor_offset' => $offset,'group_id' => $group_id, 'modulegroup' => $modulegroup)).'">';
@@ -116,10 +116,19 @@ function mainAgentsModules() {
 	}
 	
 	// Header
-	ui_print_page_header (__("Agents/Modules"), "images/module_mc.png", false, "", false, $onheader);
+	ui_print_page_header (__("Agents/Modules"), "images/module_mc.png", false, "", false, $updated_time);
 	
 	// Old style table, we need a lot of special formatting,don't use table function
 	// Prepare old-style table
+	echo '<table class="databox filters" cellpadding="0" cellspacing="0" border="0" style="width:100%;">';
+	echo "<tr>";
+	echo "<td>" . $filter_module_groups . "</td>";
+	echo "<td>" . $filter_groups  . "</td>";
+	if ($config['pure'] == 1) 
+		echo "<td>" . $comborefr  . "</td>";
+	echo "<td> <strong>" . __("Full screen") . "</strong>" . $fullscreen['text'] . "</td>";
+	echo "</tr>";
+	echo "</table>";
 	
 	$agents = '';
 	$agents = agents_get_group_agents($group_id,array('disabled' => 0));
@@ -172,15 +181,15 @@ function mainAgentsModules() {
 	$nagents = count($agents);
 	
 	if ($all_modules == false || $agents == false) {
-		echo "<div class='nf'>".__('There are no agents with modules')."</div>";
+		ui_print_info_message ( array('no_close'=>true, 'message'=> __('There are no agents with modules') ) );
 		return;
 	}
 	
-	echo '<table cellpadding="4" cellspacing="4" border="0" style="width:98%;" class="agents_modules_table">';
+	echo '<table cellpadding="4" cellspacing="4" border="0" style="width:100%;" class="agents_modules_table">';
 	
 	echo "<tr>";
 	
-	echo "<th width='140px' height='25px' valign='bottom' style='text-align: right !important;'>" . __("Agents") . " / " . __("Modules") . "</th>";
+	echo "<th width='140px' style='text-align: right !important;'>" . __("Agents") . " / " . __("Modules") . "</th>";
 	
 	if ($hor_offset > 0) {
 		$new_hor_offset = $hor_offset-$block;
diff --git a/pandora_console/extensions/module_groups.php b/pandora_console/extensions/module_groups.php
index b73c91a931..01d7eb0609 100644
--- a/pandora_console/extensions/module_groups.php
+++ b/pandora_console/extensions/module_groups.php
@@ -167,9 +167,9 @@ function mainModuleGroups() {
 	
 	ui_print_page_header (__("Combined table of agent group and module group"), "images/module_group.png", false, "", false, '');
 	
-	echo "<p>" .
-		__("This table shows in columns the modules group and in rows agents group. The cell shows all modules") .
-		"</p>";
+	ui_print_info_message ( array('no_close'=>true, 'message'=>
+		__("This table shows in columns the modules group and in rows agents group. The cell shows all modules") )
+		);
 	
 	
 	$agentGroups = users_get_groups ($config['id_user'], "AR", false);
@@ -182,7 +182,7 @@ function mainModuleGroups() {
 		$table->headstyle[] = "width: 20%";
 		foreach ($modelGroups as $i => $n) {
 			$table->headstyle[] = "width: 7%";
-			$modelGroups[$i] = ui_print_truncate_text($n, GENERIC_SIZE_TEXT);
+			$modelGroups[$i] = ui_print_truncate_text($n, GENERIC_SIZE_TEXT, true, true, true, '&hellip;', 'color:#FFF');
 		}
 		
 		$head = $modelGroups;
@@ -203,7 +203,7 @@ function mainModuleGroups() {
 			$fired = false;
 			$row = array();
 			
-			array_push($row, ui_print_truncate_text($name, GENERIC_SIZE_TEXT));
+			array_push($row, ui_print_truncate_text($name, GENERIC_SIZE_TEXT, true, true, true, '&hellip;', 'color:#FFF'));
 			
 			foreach ($modelGroups as $idModelGroup => $modelGroup) {
 				$fired = false;
diff --git a/pandora_console/extensions/net_tools/nettool.png b/pandora_console/extensions/net_tools/nettool.png
index 9161739c27..9a78741f1d 100644
Binary files a/pandora_console/extensions/net_tools/nettool.png and b/pandora_console/extensions/net_tools/nettool.png differ
diff --git a/pandora_console/extensions/realtime_graphs.php b/pandora_console/extensions/realtime_graphs.php
index 0cf679ead1..f3e5610c0f 100644
--- a/pandora_console/extensions/realtime_graphs.php
+++ b/pandora_console/extensions/realtime_graphs.php
@@ -46,6 +46,8 @@ function pandora_realtime_graphs () {
 	$table->id = 'table-form';
 	$table->class = 'databox filters';
 	$table->style = array ();
+	$table->cellpadding = '0';
+	$table->cellspacing = '0';
 	$table->style[0] = 'font-weight: bold;';
 	$table->style[1] = 'font-weight: bold;';
 	$table->style[2] = 'font-weight: bold;';
@@ -63,7 +65,6 @@ function pandora_realtime_graphs () {
 	$refresh = get_parameter('refresh', '1000');
 	
 	$data['graph'] = __('Graph') . '&nbsp;&nbsp;' . html_print_select ($graph_fields, 'graph', $graph, '', '', 0, true);
-	$data['reset'] = html_print_button(__('Clear graph'), 'reset', false, 'clearGraph()', 'class="sub delete"', true);
 
 	$refresh_fields[1000] = human_time_description_raw(1, true, 'large');
 	$refresh_fields[5000] = human_time_description_raw(5, true, 'large');
@@ -72,7 +73,7 @@ function pandora_realtime_graphs () {
 	
 	$data['refresh'] = __('Refresh interval') . '&nbsp;&nbsp;' . html_print_select ($refresh_fields, 'refresh', $refresh, '', '', 0, true);
 	$data['incremental'] = __('Incremental') . '&nbsp;&nbsp;' . html_print_checkbox ('incremental', 1, 0, true);
-
+	$data['reset'] = html_print_button(__('Clear graph'), 'reset', false, 'clearGraph()', 'class="sub delete" style="margin-top:0px;"', true);
 	$table->data[] = $data;
 	
 	
diff --git a/pandora_console/extensions/ssh_gateway.php b/pandora_console/extensions/ssh_gateway.php
index 1d2ddcab75..6f69e39886 100644
--- a/pandora_console/extensions/ssh_gateway.php
+++ b/pandora_console/extensions/ssh_gateway.php
@@ -57,7 +57,7 @@ function ssh_gateway () {
 		echo "<td>".__("Host address")."<td><input type=text size=25 value='$HOST' name=host>";
 		//echo "<tr>";
 		echo "<td>".__("User")."<td><input type=text size=25 value='$USER' name=user>" . ui_print_help_tip(__('For security reasons the following characters are not allowed: %s', '< > | ` $ ; &'), true);
-		echo "<td rowspan=2 vertical_aling='middle'>&nbsp;&nbsp;&nbsp;<input type=submit name=connect class='sub upd' value=".__("Connect").">";
+		echo "<td rowspan=2 vertical_aling='middle'>&nbsp;&nbsp;&nbsp;<input type=submit name=connect class='sub upd' style='margin-top:0px;' value=".__("Connect").">";
 		echo "<input type=hidden name=commit value=1></td>";
 		echo "<tr>";
 		echo "<td>".__("Port (use 0 for default)")."<td><input type=text size=5 value='$PORT' name=port>";	
diff --git a/pandora_console/extensions/ssh_gateway/secure_console.png b/pandora_console/extensions/ssh_gateway/secure_console.png
index b571eb7c86..f8d5f63e24 100644
Binary files a/pandora_console/extensions/ssh_gateway/secure_console.png and b/pandora_console/extensions/ssh_gateway/secure_console.png differ
diff --git a/pandora_console/extensions/vnc_view.php b/pandora_console/extensions/vnc_view.php
index 655fe5071c..f10000c981 100644
--- a/pandora_console/extensions/vnc_view.php
+++ b/pandora_console/extensions/vnc_view.php
@@ -25,7 +25,7 @@ function vnc_view() {
 	echo __("VNC Display (:0 by default)") . "&nbsp;";
 	echo "<input type=text name=display value=$display>";
 	echo "</td><td>";
-	echo "<input type=submit class='sub next' value='".__("Send")."'>";
+	echo "<input type=submit class='sub next' style='margin-top:0px;' value='".__("Send")."'>";
 	echo "</td>";
 	echo "</tr></table>";
 	$port = 5800 + $display;
diff --git a/pandora_console/general/header.php b/pandora_console/general/header.php
index edaeebbbba..18b3806a56 100644
--- a/pandora_console/general/header.php
+++ b/pandora_console/general/header.php
@@ -251,7 +251,7 @@ config_check();
 					$maintenance_link_open_txt =  '<a href="' . $maintenance_link . '" title="' . $maintenance_title . '" class="' . $maintenance_class . '" id="show_systemalert_dialog">'; 
 					$maintenance_link_open_img =  '<a href="' . $maintenance_link . '" title="' . $maintenance_title . '" class="' . $maintenance_class . '">'; 
 					$maintenance_link_close =  '</a>'; 
-					$maintenance_img = $maintenance_link_open_img . html_print_image ("images/header_warning.png", true, array ("title" => __('You have %d warning(s)', $config["alert_cnt"]), "id" => "yougotalert", "class" => "bot")) . $maintenance_link_close;
+					$maintenance_img = $maintenance_link_open_img . html_print_image ("images/header_yellow.png", true, array ("title" => __('You have %d warning(s)', $config["alert_cnt"]), "id" => "yougotalert", "class" => "bot")) . $maintenance_link_close;
 				}
 				else {
 					$maintenance_img = html_print_image ("images/header_ready.png", true, array ("title" => __('There are not warnings'), "id" => "yougotalert", "class" => "bot"));
diff --git a/pandora_console/general/login_page.php b/pandora_console/general/login_page.php
index 022b02f98a..2d19128236 100644
--- a/pandora_console/general/login_page.php
+++ b/pandora_console/general/login_page.php
@@ -62,44 +62,47 @@ if (!empty($config['login_background'])) {
 	$login_body_style = "style=\"background-image: url('$background_url');\"";
 }
 echo '<div id="login_body" ' . $login_body_style . '></div>';
-echo '<div id="login_outer">';
+echo '<div class="login_page"><div id="login_outer">';
 echo '<div class="databox_login" id="login">';
 echo '<div id="login_inner">';
 
-echo '
-	<div id="login_in">
-		<form method="post" action="' . ui_get_full_url('index.php'.$url) . '" >';
+echo '<div id="login_in">';
+	echo '<div class="version_login"><div style="padding-top: 2px; color: #FFF;">' . $pandora_version . '</div></div>';
+	echo '<form method="post" action="' . ui_get_full_url('index.php'.$url) . '" >';
 	
 	//TODO: Put branding in variables (external file) or database
 	/* CUSTOM BRANDING STARTS HERE */
 	
 	// Replace the following with your own URL and logo.
 	// A mashup of the Pandora FMS logo and your companies highly preferred
-	echo '<table id="login_layout"><tr><td rowspan=2 style="width: 200px;">';
-	
-	echo '<a href="' . $logo_link . '">';
-	if (defined ('METACONSOLE')) {
-		html_print_image ("enterprise/meta/images/pandora_login_enterprise.png", false, array ("class" => "login_logo", "alt" => "logo", "border" => 0, "title" => $logo_title), false, true);
-	}
-	else if (defined ('PANDORA_ENTERPRISE')) {
-		html_print_image ($config['homeurl'] . "/images/pandora_login_enterprise.png", false, array ("class" => "login_logo", "alt" => "logo", "border" => 0, "title" => $logo_title), false, true);
-	}
-	else {
-		html_print_image ($config['homeurl'] . "/images/pandora_login.png", false, array ("class" => "login_logo", "alt" => "logo", "border" => 0, "title" => $logo_title), false, true);
-	}
-	echo '</a>';
-	
-	// This prints the current pandora console version.
-	// For stable/live function it might be wise to comment it out
-	
-	/* CUSTOM BRANDING ENDS HERE */
-	echo '</td><td>';
+	echo '<table id="login_layout">';
+	echo'<tr style="height:15px;"><td>';
 	echo '<div class="login_links">';
 	echo '<a href="http://wiki.pandorafms.com/" target="_blank">' . __('Help') . '</a>';
 	echo ' | ';
 	echo '<a href="http://forums.pandorafms.com/" target="_blank">' . __('Support') . '</a>';
 	echo '</div>';
-	echo '</td></tr><tr><td>';
+	echo '</td></tr>';
+	echo'<tr>
+		<td class="login_border" rowspan=2 style="width: 160px;">';
+	
+			echo '<a href="' . $logo_link . '">';
+			if (defined ('METACONSOLE')) {
+				html_print_image ("images/logo_login.png", false, array ("class" => "login_logo", "alt" => "logo", "border" => 0, "title" => $logo_title), false, true);
+			}
+			else if (defined ('PANDORA_ENTERPRISE')) {
+				html_print_image ("images/logo_login.png", false, array ("class" => "login_logo", "alt" => "logo", "border" => 0, "title" => $logo_title), false, true);
+			}
+			else {
+				html_print_image ("images/logo_login.png", false, array ("class" => "login_logo", "alt" => "logo", "border" => 0, "title" => $logo_title), false, true);
+			}
+			echo '</a>';
+			
+			// This prints the current pandora console version.
+			// For stable/live function it might be wise to comment it out
+			
+			/* CUSTOM BRANDING ENDS HERE */
+	echo '</td><td style="padding-top: 15px;">';
 	
 	switch ($login_screen) {
 		case 'login':
@@ -108,20 +111,22 @@ echo '
 					html_print_input_hidden ($key, $value);
 				}
 			}
-			echo '<div class="login_nick_text">';
-			echo __('User') . '<br>';
-			echo '</div>';
+			
 			echo '<div class="login_nick">';
-			html_print_input_text_extended ("nick", '', "nick", '', '', '' , false, '', 'class="login login_user"');
-			echo '</div>';
-			echo '<div class="login_pass_text">';
-			echo __('Password') . '<br>';
-			echo '</div>';
+			html_print_image ("/images/usuario_login.png", false);
+			html_print_input_text_extended ("nick", __('User'), "nick", '', '', '' , false,
+									array('onfocus' => "javascript:if ( $('.login_user').val() == 'User') $('.login_user').val('');",
+									'onblur'=>"javascript: if ( $('.login_user').val() == false) $('.login_user').val('". __('User')."');"), 'class="login login_user"  ');
+			echo '</div><br />';
 			echo '<div class="login_pass">';
-			html_print_input_text_extended ("pass", '', "pass", '', '', '' ,false, '', 'class="login login_password"', false, true);
+			html_print_image ("/images/candado_login.png", false);
+			html_print_input_text_extended ("pass", 'pass', "pass", '', '', '' ,false,
+									array('onfocus' => "javascript:if ( $('.login_password').val() == 'pass')  $('.login_password').val('');",
+											'onblur'=>"javascript:if ( $('.login_password').val() == false) $('.login_password').val('". __('pass')."');"),
+								 'class="login login_password"', false, true);
 			echo '</div>';
 			echo '<div class="login_button">';
-			html_print_submit_button(__("Login") . '&nbsp;&nbsp;>', "login_button", false, 'class="sub next_login"');
+			html_print_submit_button(__("Login"), "login_button", false, 'class="sub next_login"');
 			echo '</div>';
 			break;
 		case 'logout':
@@ -165,10 +170,11 @@ echo '</form>
 	</div>
 </div>
 </div>
+</div>
 </div>';
 
 if (defined ('METACONSOLE')) {
-	echo '<div id="ver_num" style="text-align: center;">';
+	echo '<div id="ver_num">';
 }
 else {
 	echo '<div id="ver_num">';
@@ -180,7 +186,7 @@ echo $pandora_version.(($develop_bypass == 1) ? ' '.__('Build').' '.$build_versi
 if (isset ($login_failed)) {
 	echo '<div id="login_failed" title="Login failed" style="">';
 		
-		echo '<div style="position:absolute; top:0px; text-align: center; left:0%; right:0%; height:100px; width:330px; margin: 0 auto; ">';
+		echo '<div style="position:absolute; top:0px; text-align: center; left:0%; right:0%; height:100px; width:400px; margin: 0 auto; ">';
 			
 			echo '<div id="error_login" style="margin-top: 20px">';
 			echo '<strong style="font-size: 10pt">' . $config["auth_error"] . '</strong>';
@@ -322,7 +328,7 @@ html_print_div(array('id' => 'modal_alert', 'hidden' => true));
 					background: "black"
 				},
 				width: 500,
-				height: 300
+				height: 200
 			})
 			.show ();
 	}
@@ -361,7 +367,7 @@ html_print_div(array('id' => 'modal_alert', 'hidden' => true));
 				resizable: true,
 				draggable: true,
 				modal: true,
-				height: 200,
+				height: 160,
 				width: 400,
 				overlay: {
 					opacity: 0.5,
diff --git a/pandora_console/general/main_menu.php b/pandora_console/general/main_menu.php
index 2062bf372a..35c8b7b785 100644
--- a/pandora_console/general/main_menu.php
+++ b/pandora_console/general/main_menu.php
@@ -222,9 +222,9 @@ $(document).ready( function() {
 			$('div#title_menu').show();
 			handsInMenu = 1;
 			openTimeMenu = new Date().getTime();
-			$('#menu').css('width', '130px');
+			$('#menu').css('width', '145px');
 			$('li.menu_icon').addClass( " no_hidden_menu" );
-			$('ul.submenu').css('left', '129px');
+			$('ul.submenu').css('left', '144px');
 		}).mouseleave(function(){
 			handsInMenu = 0;
 			setTimeout(function() {
diff --git a/pandora_console/godmode/agentes/agent_conf_gis.php b/pandora_console/godmode/agentes/agent_conf_gis.php
index 7ab1aa17a8..87b218dfdb 100644
--- a/pandora_console/godmode/agentes/agent_conf_gis.php
+++ b/pandora_console/godmode/agentes/agent_conf_gis.php
@@ -36,7 +36,7 @@ $agent_name = md5($agent_name);
 /* Map with the current position */
 echo "<div id=\"" . $agent_name . "_agent_map\" style=\"border:1px solid black; width:100%; height: 30em;\"></div>";
 
-if (!gis_get_agent_map($id_agente, "500px", "98%", false)) {
+if (!gis_get_agent_map($id_agente, "500px", "100%", false)) {
 	ui_print_error_message(__("There is no default map. Please go to the setup for to set a default map."));
 	echo "<script type='text/javascript'>
 		$(document).ready(function() {
@@ -46,10 +46,11 @@ if (!gis_get_agent_map($id_agente, "500px", "98%", false)) {
 } 
 
 if ($agentData === false) {
-	echo "<p>" . __("There is no GIS data for this agent, so it's positioned in default position of map.") . "</p>";
+	ui_print_info_message ( array ( 'no_close' => true, 'message' => 
+					__("There is no GIS data for this agent, so it's positioned in default position of map.") ) );
 }
-echo "<div class='warn'>" .
-	__("Warning: When you change the Agent position, the agent automatically activates the 'Ignore new GIS data' option") . "</div>";
+ui_print_warning_message (array ( 'no_close' => true, 'message' =>
+	__("When you change the Agent position, the agent automatically activates the 'Ignore new GIS data' option") ) );
 
 $table->width = '100%';
 $table->class = 'databox filters';
@@ -59,6 +60,8 @@ $table->cellspacing = 0;
 $table->head[0] =__('Agent position');
 $table->head_colspan[0] = 4;
 $table->headstyle[0] = "text-align:center";
+$table->style[0] = 'font-weight: bold; ';
+$table->style[2] = 'font-weight: bold; ';
 
 $table->data[1][0] = __('Latitude: ');
 $table->data[1][1] = html_print_input_text_extended ('latitude', $agentData['stored_latitude'], 'text-latitude', '', 20, 20, false, '',
diff --git a/pandora_console/godmode/agentes/agent_manager.php b/pandora_console/godmode/agentes/agent_manager.php
index 950e75e970..6be6c13c0f 100644
--- a/pandora_console/godmode/agentes/agent_manager.php
+++ b/pandora_console/godmode/agentes/agent_manager.php
@@ -119,8 +119,6 @@ if ($new_agent) {
 		$server_name = reset(array_keys($servers));
 }
 
-echo '<div style="height: 5px">&nbsp;</div>';
-
 if (!$new_agent) {
 	// Agent remote configuration editor
 	enterprise_include_once('include/functions_config_agents.php');
@@ -141,7 +139,7 @@ if ($disk_conf_delete) {
 echo '<form name="conf_agent" method="post" action="index.php?sec=gagente&amp;sec2=godmode/agentes/configurar_agente">';
 
 $table->width = '100%';
-$table->class = "databox_color";
+$table->class = "databox filters";
 
 $table->head = array ();
 $table->style = array ();
@@ -277,7 +275,7 @@ html_print_table ($table);
 unset($table);
 
 $table->width = '100%';
-$table->class = "databox_color";
+$table->class = "databox filters";
 
 $table->head = array ();
 $table->style = array ();
@@ -391,7 +389,7 @@ ui_toggle(html_print_table ($table, true), __('Advanced options'));
 unset($table);
 
 $table->width = '100%';
-$table->class = "databox_color";
+$table->class = "databox filters";
 
 $table->head = array ();
 $table->style = array ();
diff --git a/pandora_console/godmode/agentes/agent_template.php b/pandora_console/godmode/agentes/agent_template.php
index 819318a61f..127bd0ab8b 100644
--- a/pandora_console/godmode/agentes/agent_template.php
+++ b/pandora_console/godmode/agentes/agent_template.php
@@ -176,12 +176,12 @@ foreach ($nps as $row) {
 	$select[$row["id_np"]] = $row["name"];
 }
 
-echo '<table width="100%" cellpadding="2" cellspacing="2" class="databox filters" >';
+echo '<table width="100%" cellpadding="0" cellspacing="0" class="databox filters" >';
 echo "<tr><td class='datos' style='width:50%'>";
 html_print_select ($select, "template_id", '', '', '', 0, false, false, true, '', false, 'max-width: 200px !important');
 echo '</td>';
 echo '<td class="datos">';
-html_print_submit_button (__('Assign'), 'crt', false, 'class="sub next"');
+html_print_submit_button (__('Assign'), 'crt', false, 'class="sub next" style="margin-top:0px;"');
 echo '</td>';
 echo '</tr>';
 echo "</form>";
@@ -213,8 +213,8 @@ if ($result === false) {
 }
 
 $table->width = '100%';
-$table->cellpadding = 4;
-$table->cellspacing = 4;
+$table->cellpadding = 0;
+$table->cellspacing = 0;
 $table->class = "databox data";
 $table->head = array ();
 $table->data = array ();
@@ -225,13 +225,16 @@ $table->head[1] = __('Type');
 $table->head[2] = __('Description');
 $table->head[3] = __('Action');
 
-$table->align[1] = "center";
-$table->align[3] = "center";
+$table->align[1] = "left";
+$table->align[3] = "left";
+$table->size[0] = "30%";
+$table->size[1] = "5%";
+$table->size[3] = "8%";
 
 foreach ($result as $row) {
 	$data = array ();
 	
-	$data[0] = '<span style="font-size: 7.2pt">' . $row["nombre"];
+	$data[0] = '<span>' . $row["nombre"];
 	if ($row["id_tipo_modulo"] > 0) {
 		$data[1] = html_print_image("images/" . modules_show_icon_type ($row["id_tipo_modulo"]), true, array("border" => "0"));
 	}
diff --git a/pandora_console/godmode/agentes/agent_wizard.wmi_explorer.php b/pandora_console/godmode/agentes/agent_wizard.wmi_explorer.php
index 3163a00d75..55ce924c89 100644
--- a/pandora_console/godmode/agentes/agent_wizard.wmi_explorer.php
+++ b/pandora_console/godmode/agentes/agent_wizard.wmi_explorer.php
@@ -247,10 +247,10 @@ if ($create_modules) {
 echo '<span id ="none_text" style="display: none;">' . __('None') . '</span>';
 echo "<form method='post' id='wmi_form' action='index.php?sec=gagente&sec2=godmode/agentes/configurar_agente&tab=agent_wizard&wizard_section=wmi_explorer&id_agente=$id_agent'>";
 
-$table->width = '98%';
-
-$table->valign[0] = 'top';
-$table->valign[1] = 'top';
+$table->width = '100%';
+$table->cellpadding = 0;
+$table->cellspacing = 0;
+$table->class = 'databox filters';
 
 $table->data[0][0] = '<b>' . __('Target IP') . '</b>';
 $table->data[0][1] = html_print_input_text ('ip_target', $ip_target, '', 15, 60, true);
diff --git a/pandora_console/godmode/agentes/module_manager.php b/pandora_console/godmode/agentes/module_manager.php
index e2772e28d3..d320fb2056 100644
--- a/pandora_console/godmode/agentes/module_manager.php
+++ b/pandora_console/godmode/agentes/module_manager.php
@@ -33,7 +33,7 @@ $search_string = io_safe_output(urldecode(trim(get_parameter ("search_string", "
 //echo '<form id="create_module_type" method="post" action="index.php?sec=gagente&sec2=godmode/agentes/configurar_agente&tab=module&id_agente='.$id_agente.'">';
 echo '<form id="create_module_type" method="post" action="'.$url.'">';
 echo '<table width="100%" cellpadding="2" cellspacing="2" class="databox filters" >';
-echo "<tr><td class='datos' style='width:20%'>";
+echo "<tr><td class='datos' style='width:20%; font-weight: bold;'>";
 echo __('Search') . ' ' .
 	html_print_input_text ('search_string', $search_string, '', 15, 255, true);
 echo "</td>";
@@ -111,7 +111,8 @@ if (($policy_page) || (isset($agent))) {
 	if ($show_creation) {
 		// Create module/type combo
 		//echo '<form id="create_module_type" method="post" action="'.$url.'">';
-		echo '<td class="datos">';
+		echo '<td class="datos" style="font-weight: bold;">';
+		echo __("Type");
 		html_print_select ($modules, 'moduletype', '', '', '', '', false, false, false, '', false, 'max-width:300px;' );
 		html_print_input_hidden ('edit_module', 1);
 		echo '</td>';
@@ -128,7 +129,7 @@ echo "</form>";
 
 echo '<div style="text-align: right; width: 100%;padding-top:10px;padding-bottom:10px">';
 echo "<strong>";
-echo "<a style='color: #004A1B;' target='_blank' href='http://pandorafms.com/Library/Library/'>".__("Get more modules in Pandora FMS Library")."</a>";
+echo "<a style='color: #373737;' target='_blank' href='http://pandorafms.com/Library/Library/'>".__("Get more modules in Pandora FMS Library")."</a>";
 echo "</strong>";
 echo '</div>';
 
@@ -529,7 +530,7 @@ $table->rowstyle = array();
 $table->style = array ();
 $table->style[0] = 'font-weight: bold';
 $table->size = array ();
-$table->size[2] = '55px';
+$table->size[2] = '70px';
 $table->align = array ();
 $table->align[2] = 'left';
 $table->align[8] = 'left';
diff --git a/pandora_console/godmode/alerts/alert_list.builder.php b/pandora_console/godmode/alerts/alert_list.builder.php
index cec333e051..9a3a6b7dd6 100644
--- a/pandora_console/godmode/alerts/alert_list.builder.php
+++ b/pandora_console/godmode/alerts/alert_list.builder.php
@@ -38,10 +38,14 @@ $table->data = array ();
 $table->size = array ();
 $table->size = array ();
 $table->size[0] = '10%';
-$table->size[1] = '30%';
-$table->style[0] = 'font-weight: bold; vertical-align: top;';
-$table->align[0] = 'left';
-$table->align[1] = 'left';
+$table->size[1] = '25%';
+$table->size[2] = '10%';
+$table->size[3] = '20%';
+$table->style[0] = 'font-weight: bold; ';
+$table->style[1] = 'font-weight: bold; ';
+$table->style[2] = 'font-weight: bold; ';
+$table->style[3] = 'font-weight: bold; ';
+
 // This is because if this view is reused after list alert view then 
 // styles in the previous view can affect this table.
 $table->rowstyle[0] = '';
diff --git a/pandora_console/godmode/alerts/alert_list.list.php b/pandora_console/godmode/alerts/alert_list.list.php
index 8100675159..509279569b 100644
--- a/pandora_console/godmode/alerts/alert_list.list.php
+++ b/pandora_console/godmode/alerts/alert_list.list.php
@@ -48,13 +48,14 @@ else {
 }
 
 // Table for filter controls
-$form_filter = '<form method="post" action="index.php?sec=' . $sec . '&amp;sec2=' . $sec2 . '&amp;refr=' . ((int)get_parameter('refr', 0)) . '&amp;pure='.$config["pure"].'">';
-$form_filter .= "<input type='hidden' name='search' value='1' />\n";
-$form_filter .= '<table style="width: 100%;" cellpadding="0" cellspacing="0" class="databox filters">'."\n";
-$form_filter .= "<tr>\n";
-$form_filter .= "<td>" . __('Template name') . "</td><td>";
+$form_filter = '<form method="post" action="index.php?sec=' . $sec . '&amp;sec2=' . $sec2 . '&amp;refr=' . ((int)get_parameter('refr', 0)) .
+					'&amp;pure='.$config["pure"].'">';
+$form_filter .= "<input type='hidden' name='search' value='1' />";
+$form_filter .= '<table style="width: 100%;" cellpadding="0" cellspacing="0" class="databox filters">';
+$form_filter .= "<tr>";
+$form_filter .= "<td style='font-weight: bold;'>" . __('Template name') . "</td><td>";
 $form_filter .= html_print_input_text ('template_name', $templateName, '', 12, 255, true);
-$form_filter .= "</td>\n";
+$form_filter .= "</td>";
 $temp = agents_get_agents();
 $arrayAgents = array();
 
@@ -65,7 +66,7 @@ if ($temp) {
 	}
 }
 
-$form_filter .= "<td>".__('Agents')."</td><td>";
+$form_filter .= "<td style='font-weight: bold;'>".__('Agents')."</td><td>";
 
 
 $params = array();
@@ -79,12 +80,12 @@ $params['metaconsole_enabled'] = false;
 $form_filter .=  ui_print_agent_autocomplete_input($params);
 
 
-$form_filter .= "</td>\n";
+$form_filter .= "</td>";
 
-$form_filter .= "<td>".__('Module name')."</td><td>";
+$form_filter .= "<td style='font-weight: bold;'>".__('Module name')."</td><td>";
 $form_filter .= html_print_input_text ('module_name', $moduleName, '', 12, 255, true);
-$form_filter .= "</td>\n";
-$form_filter .= "</tr>\n";
+$form_filter .= "</td>";
+$form_filter .= "</tr>";
 
 $all_groups = db_get_value('is_admin', 'tusuario', 'id_user', $config['id_user']);
 
@@ -94,7 +95,7 @@ if ($groups_user === false) {
 }
 $groups_id = implode(',', array_keys($groups_user));
 
-$form_filter .= "<tr>\n";
+$form_filter .= "<tr>";
 switch ($config["dbtype"]) {
 	case "mysql":
 	case "postgresql":
@@ -111,39 +112,47 @@ if (is_array($temp)) {
 		$arrayActions[$actionElement['id']] = $actionElement['name'];
 	}
 }
-$form_filter .= "<td>".__('Actions')."</td><td>";
+$form_filter .= "<td style='font-weight: bold;'>".__('Actions')."</td><td>";
 $form_filter .= html_print_select ($arrayActions, "action_id", $actionID,  '', __('All'), -1, true);
-$form_filter .= "</td>\n";
-$form_filter .= "<td>".__('Field content')."</td><td>";
-$form_filter .= html_print_input_text ('field_content', $fieldContent, '', 12, 255, true);
-$form_filter .= "</td>\n";
-$form_filter .= "<td>".__('Priority')."</td><td>";
-$form_filter .= html_print_select (get_priorities (), 'priority',$priority, '', __('All'), -1, true);
 $form_filter .= "</td>";
-$form_filter .= "</tr>\n";
+$form_filter .= "<td style='font-weight: bold;'>".__('Field content')."</td><td>";
+$form_filter .= html_print_input_text ('field_content', $fieldContent, '', 12, 255, true);
+$form_filter .= "</td>";
+$form_filter .= "<td style='font-weight: bold;'>".__('Priority')."</td><td>";
+$form_filter .= html_print_select (get_priorities (), 'priority',$priority, '', __('All'), -1, true);
+$form_filter .= "</td style='font-weight: bold;'>";
+$form_filter .= "</tr>";
 
-$form_filter .= "<tr>\n";
-$form_filter .= "<td>".__('Enabled / Disabled')."</td><td>";
+$form_filter .= "<tr>";
+$form_filter .= "<td style='font-weight: bold;'>".__('Enabled / Disabled')."</td><td>";
 $ed_list = array ();
 $ed_list[0] = __('Enable');
 $ed_list[1] = __('Disable');
 $form_filter .= html_print_select ($ed_list, 'enabledisable', $enabledisable, '', __('All'), -1, true);
-$form_filter .= "</td><td>".__('Standby')."</td><td>";
+$form_filter .= "</td><td style='font-weight: bold;'>".__('Standby')."</td><td>";
 $sb_list = array ();
 $sb_list[1] = __('Standby on');
 $sb_list[0] = __('Standby off');
 $form_filter .= html_print_select ($sb_list, 'standby', $standby, '', __('All'), -1, true);
-$form_filter .= "</td></tr>\n";
+$form_filter .= "</td></tr>";
+if ( defined("METACONSOLE") ) {
+	$form_filter .= "<tr>";
+	$form_filter .= "<td colspan='6' align='right'>";
+	$form_filter .= html_print_submit_button (__('Update'), '', false, 'class="sub upd"', true);
+	$form_filter .= "</td>";
+	$form_filter .= "</tr>";
+	$form_filter .= "</table>";
+}else{
+	$form_filter .= "</table>";
+	$form_filter .= "<div  style='text-align:right; height:100%;'>";
+	$form_filter .= html_print_submit_button (__('Update'), '', false, 'class="sub upd"', true);
+	$form_filter .= "</div>";
+}
 
-$form_filter .= "<tr>\n";
-$form_filter .= "<td colspan='6' align='right'>";
-$form_filter .= html_print_submit_button (__('Update'), '', false, 'class="sub upd"', true);
-$form_filter .= "</td>";
-$form_filter .= "</tr>\n";
-$form_filter .= "</table>\n";
-$form_filter .= "</form>\n";
+$form_filter .= "</form>";
+if ( defined("METACONSOLE"))
+	echo "<br>";
 
-echo "<br>";
 ui_toggle($form_filter, __('Alert control filter'), __('Toggle filter(s)'));
 
 $simple_alerts = array();
@@ -323,9 +332,14 @@ if (!$id_agente) {
 else {
 	$url = 'index.php?sec='.$sec.'&sec2=godmode/agentes/configurar_agente&pure='.$pure.'&tab=alert&id_agente=' . $id_agente . '&offset=' . $offset . $form_params;
 }
-
-$table->class = 'alert_list databox';
+if ( defined("METACONSOLE") )
+	$table->class = 'alert_list databox';
+else
+	$table->class = 'databox filters';
+	
 $table->width = '100%';
+$table->cellpadding = 0;
+$table->cellspacing = 0;
 $table->size = array ();
 
 $table->align[2] = 'left';
@@ -674,7 +688,7 @@ if (isset($data)) {
 	html_print_table ($table);
 }
 else {
-	ui_print_empty_data ( __('No alerts defined') );
+	ui_print_info_message ( array('no_close' => true, 'message' =>  __('No alerts defined') ) );
 }
 
 // Create alert button
diff --git a/pandora_console/godmode/reporting/map_builder.php b/pandora_console/godmode/reporting/map_builder.php
index c1b8d5eaa0..e0efff55e3 100644
--- a/pandora_console/godmode/reporting/map_builder.php
+++ b/pandora_console/godmode/reporting/map_builder.php
@@ -178,7 +178,7 @@ if ($delete_layout || $copy_layout) {
 	}
 }
 
-$table->width = '98%';
+$table->width = '100%';
 $table->data = array ();
 $table->head = array ();
 $table->head[0] = __('Map name');
@@ -194,10 +194,10 @@ if ($vconsoles_write || $vconsoles_manage) {
 
 $table->align = array ();
 $table->align[0] = 'left';
-$table->align[1] = 'center';
-$table->align[2] = 'center';
-$table->align[3] = 'center';
-$table->align[4] = 'center';
+$table->align[1] = 'left';
+$table->align[2] = 'left';
+$table->align[3] = 'left';
+$table->align[4] = 'left';
 
 // Only display maps of "All" group if user is administrator
 // or has "VR" privileges, otherwise show only maps of user group
@@ -208,7 +208,7 @@ else
 	$maps = visual_map_get_user_layouts ($config['id_user'], false, false, false);
 
 if (!$maps) {
-	echo '<div class="nf">'.__('No maps defined').'</div>';
+	ui_print_info_message ( array('no_close'=>true, 'message'=>  __('No maps defined') ) );
 }
 else {
 	foreach ($maps as $map) {
diff --git a/pandora_console/godmode/reporting/reporting_builder.php b/pandora_console/godmode/reporting/reporting_builder.php
index c1e06300d2..780a04d09c 100644
--- a/pandora_console/godmode/reporting/reporting_builder.php
+++ b/pandora_console/godmode/reporting/reporting_builder.php
@@ -369,7 +369,10 @@ switch ($action) {
 			$search_name = "%$search%' OR description LIKE '%$search%";
 		}
 		
-		$table_aux->width = '99%';
+		$table_aux->width = '100%';
+		$table_aux->class = 'databox filters';
+		$table_aux->cellpadding = 0;
+		$table_aux->cellspacing = 0;
 		if(defined('METACONSOLE')){
 			$table_aux->class = 'databox_filters';
 			$table_aux->width = '96%';
@@ -456,10 +459,15 @@ switch ($action) {
 		$table->width = '0px';
 		if (sizeof ($reports)) {
 			$table->id = 'report_list';
-			$table->width = '98%';
+			$table->width = '100%';
+			$table->class = 'databox data';
+			$table->cellpadding = 0;
+			$table->cellspacing = 0;
 			if(defined('METACONSOLE')){
+				$table->class = 'databox';
 				$table->width = '100%';
 			}
+			
 			$table->head = array ();
 			$table->align = array ();
 			$table->align[2] = 'center';
@@ -470,6 +478,13 @@ switch ($action) {
 			$table->head[1] = __('Description');
 			$table->head[2] = __('HTML');
 			$table->head[3] = __('XML');
+			$table->size[0] = '20%';
+			$table->size[1] = '30%';
+			$table->size[2] = '2%';
+			$table->size[3] = '2%';
+			$table->size[4] = '2%';
+			$table->size[5] = '2%';
+			$table->size[6] = '2%';
 			
 			$next = 4;
 			//Calculate dinamically the number of the column
@@ -481,21 +496,22 @@ switch ($action) {
 			if (check_acl ($config['id_user'], 0, "RM")) {
 				
 				$table->head[$next] = __('Private');
-				$table->size[$next] = '40px';
+				$table->size[$next] = '2%';
 				if(defined('METACONSOLE'))
 					$table->align[$next] = '';
 				else
 					$table->align[$next] = 'center';
 				$next++;
 				$table->head[$next] = __('Group');
-				$table->align[$next] = 'center';
+				$table->size[$next] = '15%';
+
 				$next++;
 				if(!defined('METACONSOLE'))
 					$table->head[$next] = '<span title="Operations">' .
 						__('Op.') . '</span>';
 					
-				$table->size = array ();
-				$table->size[$next] = '80px';
+				//$table->size = array ();
+				$table->size[$next] = '5%';
 				$table->style[$next] = 'text-align:center;';
 			
 			}
@@ -632,15 +648,14 @@ switch ($action) {
 			html_print_table ($table);
 		}
 		else{
-			echo "<br />";
-			echo "<div class='nf'>".__('No data found.')."</div>";
+			ui_print_info_message ( array ( 'no_close' => true, 'message' =>  __('No data found.') ) );
 		}
 		if (check_acl ($config['id_user'], 0, "RW")) {
 			echo '<form method="post" action="index.php?sec=reporting&sec2=godmode/reporting/reporting_builder&tab=main&action=new&pure='.$pure.'">';
 			if (defined("METACONSOLE"))
 				echo '<div class="action-buttons" style="width: 100%; ">';
 			else
-				echo '<div class="action-buttons" style="width: 98%; margin-top: 5px;">';
+				echo '<div class="action-buttons" style="width: 100%;">';
 			html_print_submit_button (__('Create report'), 'create', false, 'class="sub next"');
 			echo "</div>";
 			echo "</form>";
diff --git a/pandora_console/godmode/reporting/visual_console_builder.data.php b/pandora_console/godmode/reporting/visual_console_builder.data.php
index f3bf4a0399..019d1c423f 100644
--- a/pandora_console/godmode/reporting/visual_console_builder.data.php
+++ b/pandora_console/godmode/reporting/visual_console_builder.data.php
@@ -84,7 +84,7 @@ switch ($action) {
 		break;
 }
 
-$table->width = '98%';
+$table->width = '100%';
 if (defined('METACONSOLE')) {
 	$table->width = '100%';
 	$table->class = 'databox data';
diff --git a/pandora_console/godmode/reporting/visual_console_builder.wizard.php b/pandora_console/godmode/reporting/visual_console_builder.wizard.php
index ba88c295df..2196865ded 100644
--- a/pandora_console/godmode/reporting/visual_console_builder.wizard.php
+++ b/pandora_console/godmode/reporting/visual_console_builder.wizard.php
@@ -47,7 +47,8 @@ $table->id = 'wizard_table';
 $table->head = array ();
 if (!defined('METACONSOLE')) {
 	$metaconsole_hack = '';
-	$table->width = '98%';
+	$table->width = '100%';
+	$table->class = 'databox filters';
 }
 else {
 	$metaconsole_hack = '../../';
@@ -59,21 +60,17 @@ else {
 }
 
 $table->style = array ();
-if (!defined('METACONSOLE')) {
-	$table->style[0] = 'font-weight: bold; vertical-align: text-top;';
-	$table->style[1] = 'font-weight: bold; vertical-align: middle;';
-	$table->style[2] = 'font-weight: bold; vertical-align: top';
-}
-else{
-	$table->style[0] = 'font-weight: bold; ';
-	$table->style[1] = 'font-weight: bold; ';
-	$table->style[2] = 'font-weight: bold; ';
-}
+
+$table->style[0] = 'font-weight: bold; ';
+$table->style[1] = 'font-weight: bold; ';
+$table->style[2] = 'font-weight: bold; ';
+
 $table->size = array ();
-$table->size[0] = "20%";
-$table->size[1] = "20%";
-$table->size[2] = "20%";
-$table->size[3] = "20%";
+$table->size[0] = "15%";
+$table->size[1] = "15%";
+$table->size[2] = "15%";
+$table->size[3] = "15%";
+
 
 $table->align = array();
 $table->align[0] = 'left';
diff --git a/pandora_console/godmode/setup/setup_visuals.php b/pandora_console/godmode/setup/setup_visuals.php
index a44a821ef6..0ae45ec0fb 100644
--- a/pandora_console/godmode/setup/setup_visuals.php
+++ b/pandora_console/godmode/setup/setup_visuals.php
@@ -495,6 +495,17 @@ $table->data[$row][1] = html_print_input_text ('custom_graph_widht',
 
 $row++;
 
+$table->data[$row][0] = __('Render data of module type is proc.');
+$table->data[$row][1] = __('Yes') . '&nbsp;' . 
+		html_print_radio_button ('render_proc', 1, '',
+		$config["render_proc"], true) .
+	'&nbsp;&nbsp;';
+$table->data[$row][1] .= __('No') . '&nbsp;' .
+	html_print_radio_button ('render_proc', 0, '',
+		$config["render_proc"], true);
+
+$row++;
+
 
 echo '<form id="form_setup" method="post">';
 html_print_input_hidden ('update_config', 1);
diff --git a/pandora_console/godmode/snmpconsole/snmp_alert.php b/pandora_console/godmode/snmpconsole/snmp_alert.php
index a6c8b8724b..966de85031 100755
--- a/pandora_console/godmode/snmpconsole/snmp_alert.php
+++ b/pandora_console/godmode/snmpconsole/snmp_alert.php
@@ -503,7 +503,7 @@ if ($create_alert || $update_alert) {
 	
 	/* SNMP alert filters */
 	
-	echo '<table cellpadding="4" cellspacing="4" width="98%" class="databox" style="font-weight: bold">';
+	echo '<table cellpadding="0" cellspacing="0" width="100%" class="databox filter" style="font-weight: bold">';
 	
 	// Description
 	echo '<tr><td class="datos" valign="top">'.__('Description').'</td><td class="datos">';
@@ -863,7 +863,8 @@ else {
 	$offset = (int) get_parameter ('offset');
 	
 	$table_filter = new stdClass();
-	$table_filter->width = "98%";
+	$table_filter->width = "100%";
+	$table_filter->class = "databox filters";
 	$table_filter->data = array();
 	$table_filter->data[0][0] = __('Free search') . ui_print_help_tip(
 		__('Search by these fields description, OID, Custom Value, SNMP Agent (IP), Single value, each Variable bindings/Datas.'), true);
@@ -884,7 +885,7 @@ else {
 	$form_filter .= '</div>';
 	$form_filter .= '</form>';
 	
-	echo "<br>";
+	//echo "<br>";
 	ui_toggle($form_filter,__('Alert SNMP control filter'), __('Toggle filter(s)'));
 	
 	$filter = array();
@@ -948,7 +949,7 @@ else {
 	//Overview
 	if ($count == 0) {
 		$result = array ();
-		echo "<div class='nf'>" . __('There are no SNMP alerts') . "</div>";
+		ui_print_info_message ( array('no_close'=>true, 'message'=>  __('There are no SNMP alerts') ) );
 	}
 	else {
 		ui_pagination ($count, $url_pagination);
@@ -965,8 +966,8 @@ else {
 	$table->size = array ();
 	$table->cellpadding = 4;
 	$table->cellspacing = 4;
-	$table->width = "98%";
-	$table->class= "databox";
+	$table->width = "100%";
+	$table->class= "databox data";
 	$table->align = array ();
 	
 	$table->head[0] = '<span title="' . __('Position') . '">' . __('P.') . '</span>';
diff --git a/pandora_console/godmode/snmpconsole/snmp_trap_generator.php b/pandora_console/godmode/snmpconsole/snmp_trap_generator.php
index 5ccb32c60a..a9c18529c5 100755
--- a/pandora_console/godmode/snmpconsole/snmp_trap_generator.php
+++ b/pandora_console/godmode/snmpconsole/snmp_trap_generator.php
@@ -58,30 +58,31 @@ if ($generate_trap) {
 }
 
 $traps_generator = '<form method="POST" action="index.php?sec=snmpconsole&sec2=godmode/snmpconsole/snmp_trap_generator">';
-$table->width = '90%';
+$table->width = '100%';
+$table->class = 'databox filters';
 $table->size = array ();
 $table->data = array ();
 
 $table->data[0][0] = __('Host address');
 $table->data[0][1] = html_print_input_text('snmp_host_address', $snmp_host_address, '', 50, 255, true);
 
-$table->data[1][0] = __('Community');
-$table->data[1][1] = html_print_input_text('snmp_community', $snmp_community, '', 50, 255, true);
+$table->data[0][2] = __('Community');
+$table->data[0][3] = html_print_input_text('snmp_community', $snmp_community, '', 50, 255, true);
 
 $table->data[2][0] = __('Enterprise String');
 $table->data[2][1] = html_print_input_text('snmp_oid', $snmp_oid, '', 50, 255, true);
 
+$table->data[2][2] = __('Value');
+$table->data[2][3] = html_print_input_text('snmp_value', $snmp_value, '', 50, 255, true);
+
 $table->data[3][0] = __('SNMP Agent');
 $table->data[3][1] = html_print_input_text('snmp_agent', $snmp_agent, '', 50, 255, true);
 
-$table->data[4][0] = __('SNMP Type').' '.ui_print_help_icon ("snmp_trap_types", true);
-$table->data[4][1] = html_print_input_text('snmp_type', $snmp_type, '', 50, 255, true);
+$table->data[3][2] = __('SNMP Type').' '.ui_print_help_icon ("snmp_trap_types", true);
+$table->data[3][3] = html_print_input_text('snmp_type', $snmp_type, '', 50, 255, true);
 
 $types = array(0 => 'Cold start (0)', 1 => 'Warm start (1)', 2 => 'Link down (2)', 3 => 'Link up (3)', 4 => 'Authentication failure (4)', 5 => 'EGP neighbor loss (5)', 6 => 'Enterprise (6)');
-$table->data[4][1] = html_print_select($types, 'snmp_type', $snmp_type, '', __('Select'), -1, true, false, false);
-
-$table->data[5][0] = __('Value');
-$table->data[5][1] = html_print_input_text('snmp_value', $snmp_value, '', 50, 255, true);
+$table->data[3][3] = html_print_select($types, 'snmp_type', $snmp_type, '', __('Select'), -1, true, false, false);
 
 
 $traps_generator .= html_print_table($table, true);
diff --git a/pandora_console/images/add.png b/pandora_console/images/add.png
index 6bae74843b..02864d72da 100644
Binary files a/pandora_console/images/add.png and b/pandora_console/images/add.png differ
diff --git a/pandora_console/images/advanced.png b/pandora_console/images/advanced.png
index fc0508b4c2..38f9c6a5ac 100644
Binary files a/pandora_console/images/advanced.png and b/pandora_console/images/advanced.png differ
diff --git a/pandora_console/images/agent.png b/pandora_console/images/agent.png
old mode 100755
new mode 100644
index 28758e17c3..ca5a958831
Binary files a/pandora_console/images/agent.png and b/pandora_console/images/agent.png differ
diff --git a/pandora_console/images/agent_critical.png b/pandora_console/images/agent_critical.png
old mode 100755
new mode 100644
index cf9d190fee..2dc009ebe1
Binary files a/pandora_console/images/agent_critical.png and b/pandora_console/images/agent_critical.png differ
diff --git a/pandora_console/images/agent_mc.png b/pandora_console/images/agent_mc.png
old mode 100755
new mode 100644
index c4d7aa9d43..ca5a958831
Binary files a/pandora_console/images/agent_mc.png and b/pandora_console/images/agent_mc.png differ
diff --git a/pandora_console/images/agent_notinit.png b/pandora_console/images/agent_notinit.png
old mode 100755
new mode 100644
index 5f60679b31..aa2b49b44f
Binary files a/pandora_console/images/agent_notinit.png and b/pandora_console/images/agent_notinit.png differ
diff --git a/pandora_console/images/agent_ok.png b/pandora_console/images/agent_ok.png
old mode 100755
new mode 100644
index 53fd3d33e6..0c29fa8e5d
Binary files a/pandora_console/images/agent_ok.png and b/pandora_console/images/agent_ok.png differ
diff --git a/pandora_console/images/agent_unknown.png b/pandora_console/images/agent_unknown.png
old mode 100755
new mode 100644
index 74bfda385e..b99497e843
Binary files a/pandora_console/images/agent_unknown.png and b/pandora_console/images/agent_unknown.png differ
diff --git a/pandora_console/images/agent_warning.png b/pandora_console/images/agent_warning.png
old mode 100755
new mode 100644
index a63e0ac4fb..238f3067e0
Binary files a/pandora_console/images/agent_warning.png and b/pandora_console/images/agent_warning.png differ
diff --git a/pandora_console/images/application_edit.png b/pandora_console/images/application_edit.png
index bd34201d82..aa1053ba8f 100644
Binary files a/pandora_console/images/application_edit.png and b/pandora_console/images/application_edit.png differ
diff --git a/pandora_console/images/application_not_writable.png b/pandora_console/images/application_not_writable.png
index 61737f2f2a..e471c7fd48 100644
Binary files a/pandora_console/images/application_not_writable.png and b/pandora_console/images/application_not_writable.png differ
diff --git a/pandora_console/images/applications.png b/pandora_console/images/applications.png
index 0859571a78..ca69adc924 100644
Binary files a/pandora_console/images/applications.png and b/pandora_console/images/applications.png differ
diff --git a/pandora_console/images/attachment.png b/pandora_console/images/attachment.png
index a15132fea6..f827bc818a 100644
Binary files a/pandora_console/images/attachment.png and b/pandora_console/images/attachment.png differ
diff --git a/pandora_console/images/backgrounds/fondo_madera_bn_1100.jpg b/pandora_console/images/backgrounds/fondo_madera_bn_1100.jpg
new file mode 100644
index 0000000000..36d5be2943
Binary files /dev/null and b/pandora_console/images/backgrounds/fondo_madera_bn_1100.jpg differ
diff --git a/pandora_console/images/backgrounds/fondo_madera_bn_1400.jpg b/pandora_console/images/backgrounds/fondo_madera_bn_1400.jpg
new file mode 100644
index 0000000000..22569bd688
Binary files /dev/null and b/pandora_console/images/backgrounds/fondo_madera_bn_1400.jpg differ
diff --git a/pandora_console/images/backgrounds/fondo_madera_bn_2000.jpg b/pandora_console/images/backgrounds/fondo_madera_bn_2000.jpg
new file mode 100644
index 0000000000..434221c56d
Binary files /dev/null and b/pandora_console/images/backgrounds/fondo_madera_bn_2000.jpg differ
diff --git a/pandora_console/images/backgrounds/fondo_madera_bn_2500.jpg b/pandora_console/images/backgrounds/fondo_madera_bn_2500.jpg
new file mode 100644
index 0000000000..761e9db7a7
Binary files /dev/null and b/pandora_console/images/backgrounds/fondo_madera_bn_2500.jpg differ
diff --git a/pandora_console/images/bell_error.png b/pandora_console/images/bell_error.png
index f5d2d6b79f..f1f3a40075 100644
Binary files a/pandora_console/images/bell_error.png and b/pandora_console/images/bell_error.png differ
diff --git a/pandora_console/images/binary.disabled.png b/pandora_console/images/binary.disabled.png
index fcc08c0ec9..b5213b9441 100644
Binary files a/pandora_console/images/binary.disabled.png and b/pandora_console/images/binary.disabled.png differ
diff --git a/pandora_console/images/binary.png b/pandora_console/images/binary.png
index 95e5e06427..5b81136bdf 100644
Binary files a/pandora_console/images/binary.png and b/pandora_console/images/binary.png differ
diff --git a/pandora_console/images/bricks.png b/pandora_console/images/bricks.png
old mode 100644
new mode 100755
index a7355cddb3..ca5a958831
Binary files a/pandora_console/images/bricks.png and b/pandora_console/images/bricks.png differ
diff --git a/pandora_console/images/candado_login.png b/pandora_console/images/candado_login.png
new file mode 100644
index 0000000000..36d488e9b7
Binary files /dev/null and b/pandora_console/images/candado_login.png differ
diff --git a/pandora_console/images/chart.png b/pandora_console/images/chart.png
old mode 100755
new mode 100644
index 7841aa9c6a..4ee334ae06
Binary files a/pandora_console/images/chart.png and b/pandora_console/images/chart.png differ
diff --git a/pandora_console/images/chart_curve.disabled.png b/pandora_console/images/chart_curve.disabled.png
old mode 100755
new mode 100644
index 8d156b2a2c..53dce24be3
Binary files a/pandora_console/images/chart_curve.disabled.png and b/pandora_console/images/chart_curve.disabled.png differ
diff --git a/pandora_console/images/chart_curve.png b/pandora_console/images/chart_curve.png
old mode 100755
new mode 100644
index 7841aa9c6a..4ee334ae06
Binary files a/pandora_console/images/chart_curve.png and b/pandora_console/images/chart_curve.png differ
diff --git a/pandora_console/images/collapse.png b/pandora_console/images/collapse.png
old mode 100755
new mode 100644
index 41bf8953a4..258285ae31
Binary files a/pandora_console/images/collapse.png and b/pandora_console/images/collapse.png differ
diff --git a/pandora_console/images/copy.png b/pandora_console/images/copy.png
index f47f6b00dc..11a03a5e9d 100755
Binary files a/pandora_console/images/copy.png and b/pandora_console/images/copy.png differ
diff --git a/pandora_console/images/copy_visualmap.disabled.png b/pandora_console/images/copy_visualmap.disabled.png
index 891533c1cf..fa9d3259b1 100755
Binary files a/pandora_console/images/copy_visualmap.disabled.png and b/pandora_console/images/copy_visualmap.disabled.png differ
diff --git a/pandora_console/images/copy_visualmap.png b/pandora_console/images/copy_visualmap.png
old mode 100644
new mode 100755
index 61a51e862d..11a03a5e9d
Binary files a/pandora_console/images/copy_visualmap.png and b/pandora_console/images/copy_visualmap.png differ
diff --git a/pandora_console/images/create_file.png b/pandora_console/images/create_file.png
old mode 100755
new mode 100644
index 29bb9db636..50caf63db2
Binary files a/pandora_console/images/create_file.png and b/pandora_console/images/create_file.png differ
diff --git a/pandora_console/images/csv.png b/pandora_console/images/csv.png
old mode 100755
new mode 100644
index 68cb69e2dc..fc843bed6c
Binary files a/pandora_console/images/csv.png and b/pandora_console/images/csv.png differ
diff --git a/pandora_console/images/csv_mc.png b/pandora_console/images/csv_mc.png
old mode 100755
new mode 100644
index 3023e5a55c..fc843bed6c
Binary files a/pandora_console/images/csv_mc.png and b/pandora_console/images/csv_mc.png differ
diff --git a/pandora_console/images/custom_field.png b/pandora_console/images/custom_field.png
old mode 100755
new mode 100644
index 2ee78fdaa8..32990237e3
Binary files a/pandora_console/images/custom_field.png and b/pandora_console/images/custom_field.png differ
diff --git a/pandora_console/images/custom_field_col.png b/pandora_console/images/custom_field_col.png
old mode 100755
new mode 100644
index 2ee78fdaa8..8a74c0f6ce
Binary files a/pandora_console/images/custom_field_col.png and b/pandora_console/images/custom_field_col.png differ
diff --git a/pandora_console/images/dashboard.png b/pandora_console/images/dashboard.png
old mode 100755
new mode 100644
index ad2730b71f..3063c0a770
Binary files a/pandora_console/images/dashboard.png and b/pandora_console/images/dashboard.png differ
diff --git a/pandora_console/images/dashboard_col.png b/pandora_console/images/dashboard_col.png
old mode 100755
new mode 100644
index ad2730b71f..acda45d446
Binary files a/pandora_console/images/dashboard_col.png and b/pandora_console/images/dashboard_col.png differ
diff --git a/pandora_console/images/data.png b/pandora_console/images/data.png
index 02464bca96..fc91e441a3 100644
Binary files a/pandora_console/images/data.png and b/pandora_console/images/data.png differ
diff --git a/pandora_console/images/database.png b/pandora_console/images/database.png
index 02464bca96..fc91e441a3 100644
Binary files a/pandora_console/images/database.png and b/pandora_console/images/database.png differ
diff --git a/pandora_console/images/database_mc.png b/pandora_console/images/database_mc.png
index f357c03368..fc91e441a3 100644
Binary files a/pandora_console/images/database_mc.png and b/pandora_console/images/database_mc.png differ
diff --git a/pandora_console/images/default_list.png b/pandora_console/images/default_list.png
index c89f1a309d..5983ff7758 100644
Binary files a/pandora_console/images/default_list.png and b/pandora_console/images/default_list.png differ
diff --git a/pandora_console/images/disk.png b/pandora_console/images/disk.png
index 7a56880d80..89eef478a5 100644
Binary files a/pandora_console/images/disk.png and b/pandora_console/images/disk.png differ
diff --git a/pandora_console/images/div.png b/pandora_console/images/div.png
index 8b521f40a2..1769e5c94c 100644
Binary files a/pandora_console/images/div.png and b/pandora_console/images/div.png differ
diff --git a/pandora_console/images/donut.png b/pandora_console/images/donut.png
index fb111734a4..b148ff7236 100644
Binary files a/pandora_console/images/donut.png and b/pandora_console/images/donut.png differ
diff --git a/pandora_console/images/down.png b/pandora_console/images/down.png
old mode 100755
new mode 100644
index f7de885350..082c62955c
Binary files a/pandora_console/images/down.png and b/pandora_console/images/down.png differ
diff --git a/pandora_console/images/dynamic_network_icon.png b/pandora_console/images/dynamic_network_icon.png
index 9f0949f18d..e97e415ea6 100644
Binary files a/pandora_console/images/dynamic_network_icon.png and b/pandora_console/images/dynamic_network_icon.png differ
diff --git a/pandora_console/images/edit.png b/pandora_console/images/edit.png
index 60a1ddcc54..40ec55b01f 100644
Binary files a/pandora_console/images/edit.png and b/pandora_console/images/edit.png differ
diff --git a/pandora_console/images/email.png b/pandora_console/images/email.png
index 4fb4d02ab1..1f0b101a6e 100644
Binary files a/pandora_console/images/email.png and b/pandora_console/images/email.png differ
diff --git a/pandora_console/images/email_inbox.png b/pandora_console/images/email_inbox.png
old mode 100755
new mode 100644
index 1e337d19fc..22358cf90b
Binary files a/pandora_console/images/email_inbox.png and b/pandora_console/images/email_inbox.png differ
diff --git a/pandora_console/images/email_mc.png b/pandora_console/images/email_mc.png
old mode 100755
new mode 100644
index 50a8740c4b..1f0b101a6e
Binary files a/pandora_console/images/email_mc.png and b/pandora_console/images/email_mc.png differ
diff --git a/pandora_console/images/email_outbox.png b/pandora_console/images/email_outbox.png
old mode 100755
new mode 100644
index 467ef52f13..b89898fce6
Binary files a/pandora_console/images/email_outbox.png and b/pandora_console/images/email_outbox.png differ
diff --git a/pandora_console/images/event_responses_col.png b/pandora_console/images/event_responses_col.png
index 6c33514e11..9509462f2f 100644
Binary files a/pandora_console/images/event_responses_col.png and b/pandora_console/images/event_responses_col.png differ
diff --git a/pandora_console/images/events_list.png b/pandora_console/images/events_list.png
old mode 100755
new mode 100644
index 7ee106a8c4..4571a13087
Binary files a/pandora_console/images/events_list.png and b/pandora_console/images/events_list.png differ
diff --git a/pandora_console/images/expand.png b/pandora_console/images/expand.png
index 3e537a47dc..cf33b37ee5 100644
Binary files a/pandora_console/images/expand.png and b/pandora_console/images/expand.png differ
diff --git a/pandora_console/images/export25.png b/pandora_console/images/export25.png
old mode 100755
new mode 100644
index c219e65aa9..52d4403604
Binary files a/pandora_console/images/export25.png and b/pandora_console/images/export25.png differ
diff --git a/pandora_console/images/extensions.png b/pandora_console/images/extensions.png
old mode 100755
new mode 100644
index bf408cc821..506816e8c1
Binary files a/pandora_console/images/extensions.png and b/pandora_console/images/extensions.png differ
diff --git a/pandora_console/images/eye.png b/pandora_console/images/eye.png
index 7a516b647b..52c38f3a2f 100644
Binary files a/pandora_console/images/eye.png and b/pandora_console/images/eye.png differ
diff --git a/pandora_console/images/filter.png b/pandora_console/images/filter.png
index 5f85304b13..cdf64f3c15 100644
Binary files a/pandora_console/images/filter.png and b/pandora_console/images/filter.png differ
diff --git a/pandora_console/images/fullscreen.png b/pandora_console/images/fullscreen.png
index 82ca9d58fd..297f5bc9ca 100644
Binary files a/pandora_console/images/fullscreen.png and b/pandora_console/images/fullscreen.png differ
diff --git a/pandora_console/images/global.png b/pandora_console/images/global.png
index b3587bbf4c..8f00b62067 100644
Binary files a/pandora_console/images/global.png and b/pandora_console/images/global.png differ
diff --git a/pandora_console/images/gm_log.png b/pandora_console/images/gm_log.png
old mode 100755
new mode 100644
index adf752a7e3..9d1fa46f68
Binary files a/pandora_console/images/gm_log.png and b/pandora_console/images/gm_log.png differ
diff --git a/pandora_console/images/gm_resources.menu.png b/pandora_console/images/gm_resources.menu.png
index 9af2c14e97..4e02d65528 100644
Binary files a/pandora_console/images/gm_resources.menu.png and b/pandora_console/images/gm_resources.menu.png differ
diff --git a/pandora_console/images/go.png b/pandora_console/images/go.png
old mode 100755
new mode 100644
index 4323b3be2f..21a497db9b
Binary files a/pandora_console/images/go.png and b/pandora_console/images/go.png differ
diff --git a/pandora_console/images/group_green.png b/pandora_console/images/group_green.png
index 77be39179f..de11fe9379 100644
Binary files a/pandora_console/images/group_green.png and b/pandora_console/images/group_green.png differ
diff --git a/pandora_console/images/header_down.png b/pandora_console/images/header_down.png
old mode 100755
new mode 100644
index 3ac530630b..aa237d4190
Binary files a/pandora_console/images/header_down.png and b/pandora_console/images/header_down.png differ
diff --git a/pandora_console/images/header_help.png b/pandora_console/images/header_help.png
old mode 100755
new mode 100644
index 6b4046131e..477f69e061
Binary files a/pandora_console/images/header_help.png and b/pandora_console/images/header_help.png differ
diff --git a/pandora_console/images/header_logout.png b/pandora_console/images/header_logout.png
index 2fe2a7c269..0ecb083a9f 100644
Binary files a/pandora_console/images/header_logout.png and b/pandora_console/images/header_logout.png differ
diff --git a/pandora_console/images/header_ready.png b/pandora_console/images/header_ready.png
index 165dbc1cc2..5ebf350861 100644
Binary files a/pandora_console/images/header_ready.png and b/pandora_console/images/header_ready.png differ
diff --git a/pandora_console/images/header_refresh.png b/pandora_console/images/header_refresh.png
index 823297ff79..e7f8da34df 100644
Binary files a/pandora_console/images/header_refresh.png and b/pandora_console/images/header_refresh.png differ
diff --git a/pandora_console/images/header_refresh_disabled.png b/pandora_console/images/header_refresh_disabled.png
old mode 100755
new mode 100644
index c37d6a4d44..5bab9661c6
Binary files a/pandora_console/images/header_refresh_disabled.png and b/pandora_console/images/header_refresh_disabled.png differ
diff --git a/pandora_console/images/header_user.png b/pandora_console/images/header_user.png
index 00e4d9b6f8..202afb785c 100644
Binary files a/pandora_console/images/header_user.png and b/pandora_console/images/header_user.png differ
diff --git a/pandora_console/images/header_user_admin.png b/pandora_console/images/header_user_admin.png
index edaa6a7b27..b345c3a6b7 100644
Binary files a/pandora_console/images/header_user_admin.png and b/pandora_console/images/header_user_admin.png differ
diff --git a/pandora_console/images/header_warning.png b/pandora_console/images/header_warning.png
index d1377944fb..5175116a0e 100644
Binary files a/pandora_console/images/header_warning.png and b/pandora_console/images/header_warning.png differ
diff --git a/pandora_console/images/header_yellow.png b/pandora_console/images/header_yellow.png
new file mode 100644
index 0000000000..610266c551
Binary files /dev/null and b/pandora_console/images/header_yellow.png differ
diff --git a/pandora_console/images/help.png b/pandora_console/images/help.png
index 1d5fe71cf8..e750207337 100644
Binary files a/pandora_console/images/help.png and b/pandora_console/images/help.png differ
diff --git a/pandora_console/images/history.png b/pandora_console/images/history.png
index cc5c867d2c..e8ef8a2bd7 100644
Binary files a/pandora_console/images/history.png and b/pandora_console/images/history.png differ
diff --git a/pandora_console/images/hourglass_dark.png b/pandora_console/images/hourglass_dark.png
index 2a55fdb5e4..ec3ef8570a 100644
Binary files a/pandora_console/images/hourglass_dark.png and b/pandora_console/images/hourglass_dark.png differ
diff --git a/pandora_console/images/html.png b/pandora_console/images/html.png
old mode 100755
new mode 100644
index f78ccafc0f..908b2e55a9
Binary files a/pandora_console/images/html.png and b/pandora_console/images/html.png differ
diff --git a/pandora_console/images/html_disabled.png b/pandora_console/images/html_disabled.png
index 45a946a0cd..2f0b0d9cc8 100644
Binary files a/pandora_console/images/html_disabled.png and b/pandora_console/images/html_disabled.png differ
diff --git a/pandora_console/images/info.png b/pandora_console/images/info.png
index 1b4058cbd0..1cfc7db418 100644
Binary files a/pandora_console/images/info.png and b/pandora_console/images/info.png differ
diff --git a/pandora_console/images/information.png b/pandora_console/images/information.png
index 1b4058cbd0..1cfc7db418 100644
Binary files a/pandora_console/images/information.png and b/pandora_console/images/information.png differ
diff --git a/pandora_console/images/information_alerts.png b/pandora_console/images/information_alerts.png
new file mode 100644
index 0000000000..99394ac639
Binary files /dev/null and b/pandora_console/images/information_alerts.png differ
diff --git a/pandora_console/images/input_add.disabled.png b/pandora_console/images/input_add.disabled.png
old mode 100644
new mode 100755
index d6f86609db..4011ac63f5
Binary files a/pandora_console/images/input_add.disabled.png and b/pandora_console/images/input_add.disabled.png differ
diff --git a/pandora_console/images/input_add.png b/pandora_console/images/input_add.png
old mode 100644
new mode 100755
index d611dd56a6..4a66b34ea1
Binary files a/pandora_console/images/input_add.png and b/pandora_console/images/input_add.png differ
diff --git a/pandora_console/images/input_agent.disabled.png b/pandora_console/images/input_agent.disabled.png
new file mode 100644
index 0000000000..afdc9b6e2d
Binary files /dev/null and b/pandora_console/images/input_agent.disabled.png differ
diff --git a/pandora_console/images/input_agent.png b/pandora_console/images/input_agent.png
old mode 100644
new mode 100755
index 2c08f84b51..4e0b99d4b2
Binary files a/pandora_console/images/input_agent.png and b/pandora_console/images/input_agent.png differ
diff --git a/pandora_console/images/input_cog.disabled.png b/pandora_console/images/input_cog.disabled.png
old mode 100644
new mode 100755
index d8f75228ca..6778e81fe9
Binary files a/pandora_console/images/input_cog.disabled.png and b/pandora_console/images/input_cog.disabled.png differ
diff --git a/pandora_console/images/input_cog.png b/pandora_console/images/input_cog.png
old mode 100644
new mode 100755
index 854ed756f8..2014d38354
Binary files a/pandora_console/images/input_cog.png and b/pandora_console/images/input_cog.png differ
diff --git a/pandora_console/images/input_config.disabled.png b/pandora_console/images/input_config.disabled.png
old mode 100644
new mode 100755
index 13886a8f20..fff21ee615
Binary files a/pandora_console/images/input_config.disabled.png and b/pandora_console/images/input_config.disabled.png differ
diff --git a/pandora_console/images/input_config.png b/pandora_console/images/input_config.png
old mode 100644
new mode 100755
index 29fd069ded..07213f30ab
Binary files a/pandora_console/images/input_config.png and b/pandora_console/images/input_config.png differ
diff --git a/pandora_console/images/input_cross.disabled.png b/pandora_console/images/input_cross.disabled.png
old mode 100644
new mode 100755
index fc44da554b..7b5ea3f768
Binary files a/pandora_console/images/input_cross.disabled.png and b/pandora_console/images/input_cross.disabled.png differ
diff --git a/pandora_console/images/input_cross.png b/pandora_console/images/input_cross.png
old mode 100644
new mode 100755
index 2937ea20b0..9369552467
Binary files a/pandora_console/images/input_cross.png and b/pandora_console/images/input_cross.png differ
diff --git a/pandora_console/images/input_delete.disabled.png b/pandora_console/images/input_delete.disabled.png
old mode 100644
new mode 100755
index 6761109a9f..820866fdb1
Binary files a/pandora_console/images/input_delete.disabled.png and b/pandora_console/images/input_delete.disabled.png differ
diff --git a/pandora_console/images/input_delete.png b/pandora_console/images/input_delete.png
old mode 100644
new mode 100755
index 5c7d1f23d3..521c6d0568
Binary files a/pandora_console/images/input_delete.png and b/pandora_console/images/input_delete.png differ
diff --git a/pandora_console/images/input_filter.disabled.png b/pandora_console/images/input_filter.disabled.png
old mode 100644
new mode 100755
index 53de15ff60..73221b2dd3
Binary files a/pandora_console/images/input_filter.disabled.png and b/pandora_console/images/input_filter.disabled.png differ
diff --git a/pandora_console/images/input_filter.png b/pandora_console/images/input_filter.png
old mode 100644
new mode 100755
index 32a9f54989..f60370dc04
Binary files a/pandora_console/images/input_filter.png and b/pandora_console/images/input_filter.png differ
diff --git a/pandora_console/images/input_go.disabled.png b/pandora_console/images/input_go.disabled.png
old mode 100644
new mode 100755
index fdedc947d8..38de17fc84
Binary files a/pandora_console/images/input_go.disabled.png and b/pandora_console/images/input_go.disabled.png differ
diff --git a/pandora_console/images/input_go.png b/pandora_console/images/input_go.png
old mode 100644
new mode 100755
index f6df4983be..dd05ed7741
Binary files a/pandora_console/images/input_go.png and b/pandora_console/images/input_go.png differ
diff --git a/pandora_console/images/input_lock.png b/pandora_console/images/input_lock.png
old mode 100644
new mode 100755
index fe1c647acd..cce715bfe3
Binary files a/pandora_console/images/input_lock.png and b/pandora_console/images/input_lock.png differ
diff --git a/pandora_console/images/input_pdf.png b/pandora_console/images/input_pdf.png
old mode 100644
new mode 100755
index 1ff4020ca3..695e2e7663
Binary files a/pandora_console/images/input_pdf.png and b/pandora_console/images/input_pdf.png differ
diff --git a/pandora_console/images/inventory.png b/pandora_console/images/inventory.png
old mode 100755
new mode 100644
index 4e0eeb5a09..b77d4191d9
Binary files a/pandora_console/images/inventory.png and b/pandora_console/images/inventory.png differ
diff --git a/pandora_console/images/lightbulb.png b/pandora_console/images/lightbulb.png
old mode 100644
new mode 100755
index c34651cfba..18749ecb37
Binary files a/pandora_console/images/lightbulb.png and b/pandora_console/images/lightbulb.png differ
diff --git a/pandora_console/images/lightbulb_off.png b/pandora_console/images/lightbulb_off.png
old mode 100644
new mode 100755
index 49a45b0312..9e41b5f925
Binary files a/pandora_console/images/lightbulb_off.png and b/pandora_console/images/lightbulb_off.png differ
diff --git a/pandora_console/images/lightning.png b/pandora_console/images/lightning.png
index c933224385..076cace0e8 100644
Binary files a/pandora_console/images/lightning.png and b/pandora_console/images/lightning.png differ
diff --git a/pandora_console/images/lightning_go.png b/pandora_console/images/lightning_go.png
index 6a5450e12b..1cd8eaffc0 100644
Binary files a/pandora_console/images/lightning_go.png and b/pandora_console/images/lightning_go.png differ
diff --git a/pandora_console/images/link2.png b/pandora_console/images/link2.png
index a15132fea6..f827bc818a 100644
Binary files a/pandora_console/images/link2.png and b/pandora_console/images/link2.png differ
diff --git a/pandora_console/images/list.png b/pandora_console/images/list.png
old mode 100755
new mode 100644
index 1a7e1e5e25..5983ff7758
Binary files a/pandora_console/images/list.png and b/pandora_console/images/list.png differ
diff --git a/pandora_console/images/lock.png b/pandora_console/images/lock.png
index b122b1396d..a10d4d5cab 100644
Binary files a/pandora_console/images/lock.png and b/pandora_console/images/lock.png differ
diff --git a/pandora_console/images/logo_login.png b/pandora_console/images/logo_login.png
new file mode 100644
index 0000000000..0545d22bde
Binary files /dev/null and b/pandora_console/images/logo_login.png differ
diff --git a/pandora_console/images/max.png b/pandora_console/images/max.png
index 87f2c12155..64fb5e04d5 100644
Binary files a/pandora_console/images/max.png and b/pandora_console/images/max.png differ
diff --git a/pandora_console/images/min.png b/pandora_console/images/min.png
index c1dd8d377f..eda5715cd0 100644
Binary files a/pandora_console/images/min.png and b/pandora_console/images/min.png differ
diff --git a/pandora_console/images/module.png b/pandora_console/images/module.png
old mode 100755
new mode 100644
index ae7d85245e..3dc1c4005f
Binary files a/pandora_console/images/module.png and b/pandora_console/images/module.png differ
diff --git a/pandora_console/images/module_critical.png b/pandora_console/images/module_critical.png
old mode 100755
new mode 100644
index 0eb9405e03..4ec82bee30
Binary files a/pandora_console/images/module_critical.png and b/pandora_console/images/module_critical.png differ
diff --git a/pandora_console/images/module_notinit.png b/pandora_console/images/module_notinit.png
old mode 100755
new mode 100644
index 37fb1e7dc8..2b02f3319c
Binary files a/pandora_console/images/module_notinit.png and b/pandora_console/images/module_notinit.png differ
diff --git a/pandora_console/images/module_ok.png b/pandora_console/images/module_ok.png
old mode 100755
new mode 100644
index da6f031a95..1b22594131
Binary files a/pandora_console/images/module_ok.png and b/pandora_console/images/module_ok.png differ
diff --git a/pandora_console/images/module_unknown.png b/pandora_console/images/module_unknown.png
old mode 100755
new mode 100644
index bb51239835..5deb84ae43
Binary files a/pandora_console/images/module_unknown.png and b/pandora_console/images/module_unknown.png differ
diff --git a/pandora_console/images/module_warning.png b/pandora_console/images/module_warning.png
old mode 100755
new mode 100644
index 1f8f3df1cc..bab28019b9
Binary files a/pandora_console/images/module_warning.png and b/pandora_console/images/module_warning.png differ
diff --git a/pandora_console/images/mul.png b/pandora_console/images/mul.png
index 4207857c11..6d76bcb529 100644
Binary files a/pandora_console/images/mul.png and b/pandora_console/images/mul.png differ
diff --git a/pandora_console/images/nettool.png b/pandora_console/images/nettool.png
new file mode 100644
index 0000000000..9a78741f1d
Binary files /dev/null and b/pandora_console/images/nettool.png differ
diff --git a/pandora_console/images/network.disabled.png b/pandora_console/images/network.disabled.png
old mode 100755
new mode 100644
index 44c8a0f7df..bc1bfe3565
Binary files a/pandora_console/images/network.disabled.png and b/pandora_console/images/network.disabled.png differ
diff --git a/pandora_console/images/network.png b/pandora_console/images/network.png
old mode 100755
new mode 100644
index 6e8f0f5b29..6175738f0d
Binary files a/pandora_console/images/network.png and b/pandora_console/images/network.png differ
diff --git a/pandora_console/images/network_mc.png b/pandora_console/images/network_mc.png
old mode 100755
new mode 100644
index b66cba74e7..b833802568
Binary files a/pandora_console/images/network_mc.png and b/pandora_console/images/network_mc.png differ
diff --git a/pandora_console/images/normalscreen.png b/pandora_console/images/normalscreen.png
index 964e580274..da19183df1 100644
Binary files a/pandora_console/images/normalscreen.png and b/pandora_console/images/normalscreen.png differ
diff --git a/pandora_console/images/ok.png b/pandora_console/images/ok.png
index 682e6645cb..ce8c8f05ea 100644
Binary files a/pandora_console/images/ok.png and b/pandora_console/images/ok.png differ
diff --git a/pandora_console/images/op_network.png b/pandora_console/images/op_network.png
index d33ef43beb..8a7fafe53a 100755
Binary files a/pandora_console/images/op_network.png and b/pandora_console/images/op_network.png differ
diff --git a/pandora_console/images/op_reporting.png b/pandora_console/images/op_reporting.png
index a0cde2d12d..50cd494aad 100644
Binary files a/pandora_console/images/op_reporting.png and b/pandora_console/images/op_reporting.png differ
diff --git a/pandora_console/images/op_satellite.png b/pandora_console/images/op_satellite.png
index e948e21bae..4798e852af 100644
Binary files a/pandora_console/images/op_satellite.png and b/pandora_console/images/op_satellite.png differ
diff --git a/pandora_console/images/op_snmp.png b/pandora_console/images/op_snmp.png
old mode 100755
new mode 100644
index b43951c9fd..562573e148
Binary files a/pandora_console/images/op_snmp.png and b/pandora_console/images/op_snmp.png differ
diff --git a/pandora_console/images/op_workspace.png b/pandora_console/images/op_workspace.png
index b2abde99b4..a11b071746 100644
Binary files a/pandora_console/images/op_workspace.png and b/pandora_console/images/op_workspace.png differ
diff --git a/pandora_console/images/operating_system.png b/pandora_console/images/operating_system.png
old mode 100755
new mode 100644
index ab3f2f9f2f..d121891753
Binary files a/pandora_console/images/operating_system.png and b/pandora_console/images/operating_system.png differ
diff --git a/pandora_console/images/page_white_text.png b/pandora_console/images/page_white_text.png
index 4e0eeb5a09..de544f9ada 100644
Binary files a/pandora_console/images/page_white_text.png and b/pandora_console/images/page_white_text.png differ
diff --git a/pandora_console/images/pen.png b/pandora_console/images/pen.png
index 6da42b23c3..4a31ef547c 100644
Binary files a/pandora_console/images/pen.png and b/pandora_console/images/pen.png differ
diff --git a/pandora_console/images/pencil.png b/pandora_console/images/pencil.png
index ea3895ce94..4a31ef547c 100644
Binary files a/pandora_console/images/pencil.png and b/pandora_console/images/pencil.png differ
diff --git a/pandora_console/images/photo.disabled.png b/pandora_console/images/photo.disabled.png
index 2b06ebba3e..3776ea95d8 100644
Binary files a/pandora_console/images/photo.disabled.png and b/pandora_console/images/photo.disabled.png differ
diff --git a/pandora_console/images/photo.png b/pandora_console/images/photo.png
index 76a074d9cc..a52b3b4537 100644
Binary files a/pandora_console/images/photo.png and b/pandora_console/images/photo.png differ
diff --git a/pandora_console/images/plugin.png b/pandora_console/images/plugin.png
index 2647a53457..41f63ef952 100644
Binary files a/pandora_console/images/plugin.png and b/pandora_console/images/plugin.png differ
diff --git a/pandora_console/images/plus.png b/pandora_console/images/plus.png
index 19c0cf3a5a..02864d72da 100644
Binary files a/pandora_console/images/plus.png and b/pandora_console/images/plus.png differ
diff --git a/pandora_console/images/policies.png b/pandora_console/images/policies.png
index c18feb4d4d..29fe11287d 100644
Binary files a/pandora_console/images/policies.png and b/pandora_console/images/policies.png differ
diff --git a/pandora_console/images/policies_mc.png b/pandora_console/images/policies_mc.png
old mode 100755
new mode 100644
index 3e181c1377..29fe11287d
Binary files a/pandora_console/images/policies_mc.png and b/pandora_console/images/policies_mc.png differ
diff --git a/pandora_console/images/policies_queue.png b/pandora_console/images/policies_queue.png
old mode 100755
new mode 100644
index c2a60c5a34..87a44187af
Binary files a/pandora_console/images/policies_queue.png and b/pandora_console/images/policies_queue.png differ
diff --git a/pandora_console/images/recon.png b/pandora_console/images/recon.png
old mode 100755
new mode 100644
index 9c11c5bf15..631665baf6
Binary files a/pandora_console/images/recon.png and b/pandora_console/images/recon.png differ
diff --git a/pandora_console/images/refresh.png b/pandora_console/images/refresh.png
old mode 100644
new mode 100755
index f12a6a9feb..72f8e8a556
Binary files a/pandora_console/images/refresh.png and b/pandora_console/images/refresh.png differ
diff --git a/pandora_console/images/refresh_mc.png b/pandora_console/images/refresh_mc.png
old mode 100644
new mode 100755
index da63bfe37a..72f8e8a556
Binary files a/pandora_console/images/refresh_mc.png and b/pandora_console/images/refresh_mc.png differ
diff --git a/pandora_console/images/remote_configuration.png b/pandora_console/images/remote_configuration.png
old mode 100755
new mode 100644
index 6611fd9023..595818b4f7
Binary files a/pandora_console/images/remote_configuration.png and b/pandora_console/images/remote_configuration.png differ
diff --git a/pandora_console/images/report_list.png b/pandora_console/images/report_list.png
old mode 100755
new mode 100644
index f3ad2118d6..129f7e4cba
Binary files a/pandora_console/images/report_list.png and b/pandora_console/images/report_list.png differ
diff --git a/pandora_console/images/rosette.png b/pandora_console/images/rosette.png
old mode 100644
new mode 100755
index 83049798b0..31ef0474a0
Binary files a/pandora_console/images/rosette.png and b/pandora_console/images/rosette.png differ
diff --git a/pandora_console/images/secure_console.png b/pandora_console/images/secure_console.png
new file mode 100644
index 0000000000..f8d5f63e24
Binary files /dev/null and b/pandora_console/images/secure_console.png differ
diff --git a/pandora_console/images/server_export.png b/pandora_console/images/server_export.png
old mode 100644
new mode 100755
index c219e65aa9..027a0bb2f2
Binary files a/pandora_console/images/server_export.png and b/pandora_console/images/server_export.png differ
diff --git a/pandora_console/images/server_export_mc.png b/pandora_console/images/server_export_mc.png
index c5178c7d57..027a0bb2f2 100755
Binary files a/pandora_console/images/server_export_mc.png and b/pandora_console/images/server_export_mc.png differ
diff --git a/pandora_console/images/service.png b/pandora_console/images/service.png
index 6bae941ecd..c158264a1f 100644
Binary files a/pandora_console/images/service.png and b/pandora_console/images/service.png differ
diff --git a/pandora_console/images/snmp.png b/pandora_console/images/snmp.png
old mode 100644
new mode 100755
index ccaade251b..562573e148
Binary files a/pandora_console/images/snmp.png and b/pandora_console/images/snmp.png differ
diff --git a/pandora_console/images/sub.png b/pandora_console/images/sub.png
index 8875b77c47..75edccc928 100644
Binary files a/pandora_console/images/sub.png and b/pandora_console/images/sub.png differ
diff --git a/pandora_console/images/sum.png b/pandora_console/images/sum.png
old mode 100644
new mode 100755
index f2066d8fa9..f3a5c8572c
Binary files a/pandora_console/images/sum.png and b/pandora_console/images/sum.png differ
diff --git a/pandora_console/images/tag_red.disabled.png b/pandora_console/images/tag_red.disabled.png
index 38cc646a31..bab054cbb2 100644
Binary files a/pandora_console/images/tag_red.disabled.png and b/pandora_console/images/tag_red.disabled.png differ
diff --git a/pandora_console/images/tag_red.png b/pandora_console/images/tag_red.png
index c99a3434c1..874e46d9ed 100644
Binary files a/pandora_console/images/tag_red.png and b/pandora_console/images/tag_red.png differ
diff --git a/pandora_console/images/target.png b/pandora_console/images/target.png
index fb111734a4..b148ff7236 100644
Binary files a/pandora_console/images/target.png and b/pandora_console/images/target.png differ
diff --git a/pandora_console/images/tick.png b/pandora_console/images/tick.png
index 1bb8eb32e3..9fce7dbfc1 100644
Binary files a/pandora_console/images/tick.png and b/pandora_console/images/tick.png differ
diff --git a/pandora_console/images/tick_dark.png b/pandora_console/images/tick_dark.png
index a90181c794..9fce7dbfc1 100644
Binary files a/pandora_console/images/tick_dark.png and b/pandora_console/images/tick_dark.png differ
diff --git a/pandora_console/images/tick_off.png b/pandora_console/images/tick_off.png
index 56e0a8bb8b..c6c24d6f29 100644
Binary files a/pandora_console/images/tick_off.png and b/pandora_console/images/tick_off.png differ
diff --git a/pandora_console/images/tick_white.png b/pandora_console/images/tick_white.png
index cd836bd779..9fce7dbfc1 100644
Binary files a/pandora_console/images/tick_white.png and b/pandora_console/images/tick_white.png differ
diff --git a/pandora_console/images/tree.png b/pandora_console/images/tree.png
index df648aa4b4..0c7064de7a 100644
Binary files a/pandora_console/images/tree.png and b/pandora_console/images/tree.png differ
diff --git a/pandora_console/images/upload_file.png b/pandora_console/images/upload_file.png
index 859839fc8e..e707b041a9 100644
Binary files a/pandora_console/images/upload_file.png and b/pandora_console/images/upload_file.png differ
diff --git a/pandora_console/images/user_green.png b/pandora_console/images/user_green.png
index 8412a15089..84b3b01cac 100644
Binary files a/pandora_console/images/user_green.png and b/pandora_console/images/user_green.png differ
diff --git a/pandora_console/images/user_suit.png b/pandora_console/images/user_suit.png
index 8d550ad6b5..cb24d59bd7 100644
Binary files a/pandora_console/images/user_suit.png and b/pandora_console/images/user_suit.png differ
diff --git a/pandora_console/images/usuario_login.png b/pandora_console/images/usuario_login.png
new file mode 100644
index 0000000000..1d6eec0743
Binary files /dev/null and b/pandora_console/images/usuario_login.png differ
diff --git a/pandora_console/images/version.png b/pandora_console/images/version.png
index 591403922b..174ae4b734 100644
Binary files a/pandora_console/images/version.png and b/pandora_console/images/version.png differ
diff --git a/pandora_console/images/visual_console.png b/pandora_console/images/visual_console.png
old mode 100755
new mode 100644
index 642b063e1b..e69b7fd1dc
Binary files a/pandora_console/images/visual_console.png and b/pandora_console/images/visual_console.png differ
diff --git a/pandora_console/images/visual_console_green.png b/pandora_console/images/visual_console_green.png
index 9ebe25bdaa..e69b7fd1dc 100644
Binary files a/pandora_console/images/visual_console_green.png and b/pandora_console/images/visual_console_green.png differ
diff --git a/pandora_console/images/vnc.png b/pandora_console/images/vnc.png
index e4d32af960..573530a4b3 100644
Binary files a/pandora_console/images/vnc.png and b/pandora_console/images/vnc.png differ
diff --git a/pandora_console/images/wand_agent.png b/pandora_console/images/wand_agent.png
index 7858b38013..f7c42975f5 100644
Binary files a/pandora_console/images/wand_agent.png and b/pandora_console/images/wand_agent.png differ
diff --git a/pandora_console/images/wand_interfaces.png b/pandora_console/images/wand_interfaces.png
index 04d22867bf..972ac3c7d0 100644
Binary files a/pandora_console/images/wand_interfaces.png and b/pandora_console/images/wand_interfaces.png differ
diff --git a/pandora_console/images/wand_services.png b/pandora_console/images/wand_services.png
index 2654e5ee9d..624014f09f 100644
Binary files a/pandora_console/images/wand_services.png and b/pandora_console/images/wand_services.png differ
diff --git a/pandora_console/images/wand_snmp.png b/pandora_console/images/wand_snmp.png
index 94feac62bd..6ce8930d6f 100644
Binary files a/pandora_console/images/wand_snmp.png and b/pandora_console/images/wand_snmp.png differ
diff --git a/pandora_console/images/wand_wmi.png b/pandora_console/images/wand_wmi.png
index 5920531392..c0894e3784 100644
Binary files a/pandora_console/images/wand_wmi.png and b/pandora_console/images/wand_wmi.png differ
diff --git a/pandora_console/images/warn.png b/pandora_console/images/warn.png
old mode 100755
new mode 100644
index 11c98b8b67..1052157eeb
Binary files a/pandora_console/images/warn.png and b/pandora_console/images/warn.png differ
diff --git a/pandora_console/images/warning_big.png b/pandora_console/images/warning_big.png
new file mode 100644
index 0000000000..9b3b65b102
Binary files /dev/null and b/pandora_console/images/warning_big.png differ
diff --git a/pandora_console/images/world.png b/pandora_console/images/world.png
index 841762ac1b..b1a8225d13 100644
Binary files a/pandora_console/images/world.png and b/pandora_console/images/world.png differ
diff --git a/pandora_console/images/wrench.png b/pandora_console/images/wrench.png
index 49da3f2ffd..c6fd68d718 100644
Binary files a/pandora_console/images/wrench.png and b/pandora_console/images/wrench.png differ
diff --git a/pandora_console/images/wrench_orange.png b/pandora_console/images/wrench_orange.png
index 49da3f2ffd..c6fd68d718 100644
Binary files a/pandora_console/images/wrench_orange.png and b/pandora_console/images/wrench_orange.png differ
diff --git a/pandora_console/images/write_paper.png b/pandora_console/images/write_paper.png
index cab84223f4..db996624cb 100644
Binary files a/pandora_console/images/write_paper.png and b/pandora_console/images/write_paper.png differ
diff --git a/pandora_console/images/xml.disabled.png b/pandora_console/images/xml.disabled.png
new file mode 100644
index 0000000000..187241132a
Binary files /dev/null and b/pandora_console/images/xml.disabled.png differ
diff --git a/pandora_console/images/xml.png b/pandora_console/images/xml.png
old mode 100755
new mode 100644
index 7f1237324e..683b6331d9
Binary files a/pandora_console/images/xml.png and b/pandora_console/images/xml.png differ
diff --git a/pandora_console/images/xml_disabled.png b/pandora_console/images/xml_disabled.png
index 4a3d74667e..187241132a 100644
Binary files a/pandora_console/images/xml_disabled.png and b/pandora_console/images/xml_disabled.png differ
diff --git a/pandora_console/images/zoom.png b/pandora_console/images/zoom.png
index 6d3003ff15..acdd0d2eab 100644
Binary files a/pandora_console/images/zoom.png and b/pandora_console/images/zoom.png differ
diff --git a/pandora_console/images/zoom_cross.disabled.png b/pandora_console/images/zoom_cross.disabled.png
index 10b4c7763b..2cfbfdf63f 100644
Binary files a/pandora_console/images/zoom_cross.disabled.png and b/pandora_console/images/zoom_cross.disabled.png differ
diff --git a/pandora_console/images/zoom_cross.png b/pandora_console/images/zoom_cross.png
index c27f53a305..7e6de84b7b 100644
Binary files a/pandora_console/images/zoom_cross.png and b/pandora_console/images/zoom_cross.png differ
diff --git a/pandora_console/images/zoom_mc.png b/pandora_console/images/zoom_mc.png
old mode 100755
new mode 100644
index be2fd2ea17..acdd0d2eab
Binary files a/pandora_console/images/zoom_mc.png and b/pandora_console/images/zoom_mc.png differ
diff --git a/pandora_console/include/ajax/events.php b/pandora_console/include/ajax/events.php
index c05db832d7..bf3457ad2b 100644
--- a/pandora_console/include/ajax/events.php
+++ b/pandora_console/include/ajax/events.php
@@ -509,6 +509,6 @@ if ($table_events) {
 		array_keys($groups), 'ER', 'event_condition', 'AND');
 	
 	events_print_event_table ("estado <> 1 $tags_condition", 10, '100%',
-		false, $id_agente);
+		false, $id_agente,true);
 }
 ?>
diff --git a/pandora_console/include/ajax/module.php b/pandora_console/include/ajax/module.php
index c6379a45fe..4182c52a9e 100755
--- a/pandora_console/include/ajax/module.php
+++ b/pandora_console/include/ajax/module.php
@@ -901,8 +901,26 @@ if ($list_modules) {
 		}
 		else {
 			if (is_numeric($module["datos"]) && !modules_is_string_type($module['id_tipo_modulo'])){
-				$salida = format_numeric($module["datos"]);
-				
+				if ( $config["render_proc"] ){
+					switch($module["id_tipo_modulo"]) {
+						case 2:
+						case 6:
+						case 9:
+						case 18:
+						case 21:
+						case 31:
+							if ($module["datos"]>=1) 
+								$salida ='OK';
+							else
+								$salida = 'FAIL';
+							break;
+						default:	
+							$salida = format_numeric($module["datos"]);
+						break;
+					}
+				}else{
+					$salida = format_numeric($module["datos"]);
+				}
 				// Show units ONLY in numeric data types
 				if (isset($module["unit"])){
 					$salida .= "&nbsp;" . '<i>'. io_safe_output($module["unit"]) . '</i>';
diff --git a/pandora_console/include/functions_config.php b/pandora_console/include/functions_config.php
index f6a72a3514..a1413d7d0e 100644
--- a/pandora_console/include/functions_config.php
+++ b/pandora_console/include/functions_config.php
@@ -461,6 +461,8 @@ function config_update_config () {
 						$error_update[] = __('Show the group name instead the group icon.');
 					if (!config_update_value ('custom_graph_widht', (int) get_parameter('custom_graph_widht', 1)))
 						$error_update[] = __('Default line thickness for the Custom Graph.');
+					if (!config_update_value ('render_proc', (int) get_parameter('render_proc', 0)))
+						$error_update[] = __('Render data of module type is proc.');
 					
 					
 					
@@ -1254,6 +1256,9 @@ function config_process_config () {
 	if (!isset($config['custom_graph_widht'])) {
 		config_update_value ('custom_graph_widht', 1);
 	}
+	if (!isset($config['render_proc'])) {
+		config_update_value ('render_proc', 0);
+	}
 	
 	if (!isset($config['command_snapshot'])) {
 		config_update_value ('command_snapshot', 1);
@@ -1364,6 +1369,7 @@ function config_check () {
 	
 	
 	if (enterprise_installed()) {
+		
 		if (!is_readable ($remote_config)) {
 			set_pandora_error_for_header(
 				__('Remote configuration directory is not readble for the console') .
diff --git a/pandora_console/include/functions_events.php b/pandora_console/include/functions_events.php
index bba8d14fb0..1b7df5b6bd 100644
--- a/pandora_console/include/functions_events.php
+++ b/pandora_console/include/functions_events.php
@@ -849,11 +849,11 @@ function events_print_event_table ($filter = "", $limit = 10, $width = 440, $ret
 	
 	if ($result === false) {
 		if ($return){
-			$returned = '<div class="nf">' . __('No events') . '</div>';
+			$returned = ui_print_info_message ( __('No events'),'',true );
 			return $returned;
 		}
 		else	
-			echo '<div class="nf">' . __('No events') . '</div>';
+			echo ui_print_info_message ( __('No events') );
 	}
 	else {
 		$table->id = 'latest_events_table';
@@ -871,7 +871,7 @@ function events_print_event_table ($filter = "", $limit = 10, $width = 440, $ret
 		$table->cellclass = array ();
 		$table->data = array ();
 		$table->align = array ();
-		$table->style[0] = $table->style[1] = $table->style[2] = 'width:25px; background: #E8E8E8;';
+		$table->style[0] = $table->style[1] = $table->style[2] = 'width:25px;';
 		if ($agent_id == 0) {
 			$table->style[3] = 'word-break: break-all;';
 		}
@@ -891,11 +891,13 @@ function events_print_event_table ($filter = "", $limit = 10, $width = 440, $ret
 		
 		if ($agent_id == 0) {
 			$table->head[4] = __('Agent name');
+			$table->size[4] = "15%";
 		}
 		
 		$table->head[5] = __('Timestamp');
 		$table->headclass[5] = "datos3 f9";
 		$table->align[5] = "left";
+		$table->size[5] = "15%";
 		
 		foreach ($result as $event) {
 			if (! check_acl ($config["id_user"], $event["id_grupo"], "ER")) {
diff --git a/pandora_console/include/functions_filemanager.php b/pandora_console/include/functions_filemanager.php
index a165d249b8..92bac4ac35 100644
--- a/pandora_console/include/functions_filemanager.php
+++ b/pandora_console/include/functions_filemanager.php
@@ -540,9 +540,12 @@ function filemanager_file_explorer($real_directory, $relative_directory,
 	
 	$files = filemanager_list_dir ($real_directory);
 	
-	$table->width = '98%';
 	$table->id = 'table_filemanager';
-	$table->class = 'databox alternate';
+	if (!defined('METACONSOLE')) {
+		$table->width = '100%';
+		$table->class = 'databox data';
+		$table->title = '<span>' . __('Index of %s', $relative_directory) . '</span>';
+	}
 	if (defined('METACONSOLE')){
 		$table->width = '100%';
 		$table->class = 'databox_tactical';
@@ -565,7 +568,13 @@ function filemanager_file_explorer($real_directory, $relative_directory,
 	$table->head[2] = __('Last modification');
 	$table->head[3] = __('Size');
 	$table->head[4] = __('Actions');
-	
+	if (!defined('METACONSOLE')) {
+		$table->headstyle[0] = 'background-color:#80BA27';
+		$table->headstyle[1] = 'background-color:#80BA27';
+		$table->headstyle[2] = 'background-color:#80BA27';
+		$table->headstyle[3] = 'background-color:#80BA27';
+		$table->headstyle[4] = 'background-color:#80BA27';
+	}
 	$prev_dir = explode ("/", $relative_directory);
 	$prev_dir_str = "";
 	for ($i = 0; $i < (count ($prev_dir) - 1); $i++) {
@@ -590,15 +599,13 @@ function filemanager_file_explorer($real_directory, $relative_directory,
 		$table->data[1][1] = '';
 		
 		$table->data[1][1] .= '<div id="create_folder" style="display: none;">';
-		if(!defined("METACONSOLE"))
-			$table->data[1][1] .= html_print_button(__('Close'), 'close',
-				false, 'show_main_buttons_folder();', "class='sub cancel' style='float: left;'", true);
 		$table->data[1][1] .= '<form method="post" action="' . $url . '">';
 		$table->data[1][1] .= html_print_input_text ('dirname', '', '', 15, 255, true);
-		$table->data[1][1] .= html_print_submit_button (__('Create'), 'crt', false, 'class="sub next"', true);
-		if(defined("METACONSOLE"))
-			$table->data[1][1] .= html_print_button(__('Close'), 'close',
+		$table->data[1][1] .= '&nbsp;&nbsp;' . html_print_submit_button (__('Create'), 'crt', false, 'class="sub next"', true);
+		
+		$table->data[1][1] .= '&nbsp;&nbsp;' . html_print_button(__('Close'), 'close',
 				false, 'show_main_buttons_folder();', "class='sub cancel'", true);
+		
 		$table->data[1][1] .= html_print_input_hidden ('directory', $relative_directory, true);
 		$table->data[1][1] .= html_print_input_hidden ('create_dir', 1, true);
 		$table->data[1][1] .= html_print_input_hidden('hash', md5($relative_directory . $config['dbpass']), true);
@@ -607,9 +614,7 @@ function filemanager_file_explorer($real_directory, $relative_directory,
 		$table->data[1][1] .= '</div>';
 		
 		$table->data[1][1] .= '<div id="upload_file" style="display: none;">';
-		if(!defined("METACONSOLE"))
-			$table->data[1][1] .= html_print_button(__('Close'), 'close',
-				false, 'show_main_buttons_folder();', "class='sub cancel' style='float: left;'", true);
+		
 		$table->data[1][1] .= '<form method="post" action="' . $url . '" enctype="multipart/form-data">';
 		$table->data[1][1] .= ui_print_help_tip (__("The zip upload in this dir, easy to upload multiple files."), true);
 		$table->data[1][1] .= html_print_input_file ('file', true, false);
@@ -617,10 +622,11 @@ function filemanager_file_explorer($real_directory, $relative_directory,
 		$table->data[1][1] .= html_print_checkbox('decompress', 1, false, true);
 		$table->data[1][1] .= __('Decompress');
 		$table->data[1][1] .= '&nbsp;&nbsp;&nbsp;';
-		$table->data[1][1] .= html_print_submit_button (__('Go'), 'go', false, 'class="sub next"', true);
-		if(defined("METACONSOLE"))
-			$table->data[1][1] .= html_print_button(__('Close'), 'close',
+		$table->data[1][1] .= '&nbsp;&nbsp;' . html_print_submit_button (__('Go'), 'go', false, 'class="sub next"', true);
+		
+		$table->data[1][1] .= '&nbsp;&nbsp;' . html_print_button(__('Close'), 'close',
 				false, 'show_main_buttons_folder();', "class='sub cancel'", true);
+		
 		$table->data[1][1] .= html_print_input_hidden ('real_directory', $real_directory, true);
 		$table->data[1][1] .= html_print_input_hidden ('directory', $relative_directory, true);
 		$table->data[1][1] .= html_print_input_hidden('hash', md5($real_directory . $relative_directory . $config['dbpass']), true);
@@ -630,15 +636,13 @@ function filemanager_file_explorer($real_directory, $relative_directory,
 		$table->data[1][1] .= '</div>';
 		
 		$table->data[1][1] .= '<div id="create_text_file" style="display: none;">';
-		if(!defined("METACONSOLE"))
-			$table->data[1][1] .= html_print_button(__('Close'), 'close',
-				false, 'show_main_buttons_folder();', "class='sub cancel' style='float: left;'", true);
 		$table->data[1][1] .= '<form method="post" action="' . $url . '">';
 		$table->data[1][1] .= html_print_input_text('name_file', '', '', 30, 50, true);
-		$table->data[1][1] .= html_print_submit_button (__('Create'), 'create', false, 'class="sub next"', true);
-		if(defined("METACONSOLE"))
-			$table->data[1][1] .= html_print_button(__('Close'), 'close',
+		$table->data[1][1] .= '&nbsp;&nbsp;' . html_print_submit_button (__('Create'), 'create', false, 'class="sub next"', true);
+		
+		$table->data[1][1] .= '&nbsp;&nbsp;' . html_print_button(__('Close'), 'close',
 				false, 'show_main_buttons_folder();', "class='sub cancel'", true);
+		
 		$table->data[1][1] .= html_print_input_hidden ('real_directory', $real_directory, true);
 		$table->data[1][1] .= html_print_input_hidden ('directory', $relative_directory, true);
 		$table->data[1][1] .= html_print_input_hidden('hash', md5($real_directory . $relative_directory . $config['dbpass']), true);
diff --git a/pandora_console/include/functions_modules.php b/pandora_console/include/functions_modules.php
index b67c435b63..ad4b7df719 100755
--- a/pandora_console/include/functions_modules.php
+++ b/pandora_console/include/functions_modules.php
@@ -1583,6 +1583,7 @@ function modules_get_next_data ($id_agent_module, $utimestamp = 0, $string = 0)
  */
 function modules_get_agentmodule_data ($id_agent_module, $period,
 	$date = 0, $trash=false, $conexion = false, $order = 'ASC') {
+	global $config;
 	
 	$module = db_get_row('tagente_modulo', 'id_agente_modulo',
 		$id_agent_module);
@@ -1619,6 +1620,28 @@ function modules_get_agentmodule_data ($id_agent_module, $period,
 				ORDER BY utimestamp %s",
 				$id_agent_module, $datelimit, $date, $order);
 			break;
+		case 2:
+		case 6:
+		case 9:
+		case 18:
+		case 21:
+		case 31:
+			if ( $config["render_proc"] ) {
+				$sql = sprintf ("SELECT IF(datos >= 1, 'OK', 'FAIL') as data, utimestamp
+					FROM tagente_datos
+					WHERE id_agente_modulo = %d
+						AND utimestamp > %d AND utimestamp <= %d
+					ORDER BY utimestamp %s",
+					$id_agent_module, $datelimit, $date, $order);
+			}else{
+				$sql = sprintf ("SELECT datos AS data, utimestamp
+				FROM tagente_datos
+				WHERE id_agente_modulo = %d
+					AND utimestamp > %d AND utimestamp <= %d
+				ORDER BY utimestamp %s",
+				$id_agent_module, $datelimit, $date, $order);
+			}
+			break;
 		default:
 			$sql = sprintf ("SELECT datos AS data, utimestamp
 				FROM tagente_datos
diff --git a/pandora_console/include/functions_snmp_browser.php b/pandora_console/include/functions_snmp_browser.php
index 6888d58ac7..19efca7c0c 100644
--- a/pandora_console/include/functions_snmp_browser.php
+++ b/pandora_console/include/functions_snmp_browser.php
@@ -484,37 +484,36 @@ function snmp_browser_print_oid ($oid = array(), $custom_action = '',
  * @return string The container div.
  * 
  */
-function snmp_browser_print_container ($return = false, $width = '95%', $height = '500px', $display = '') {
+function snmp_browser_print_container ($return = false, $width = '100%', $height = '500px', $display = '') {
 	
 	// Target selection
 	$table->width = '100%';
+	$table->class = 'databox filters';
 	$table->size = array ();
 	$table->data = array ();
 	
-	$table->data[0][0] = '<strong>'.__('Target IP').'</strong><br>';
+	$table->data[0][0] = '<strong>'.__('Target IP').'</strong> &nbsp;&nbsp;';
 	$table->data[0][0] .= html_print_input_text ('target_ip', '', '', 25, 0, true);
-	$table->data[0][1] = '<strong>'.__('Community').'</strong><br>';
+	$table->data[0][1] = '<strong>'.__('Community').'</strong> &nbsp;&nbsp;';
 	$table->data[0][1] .= html_print_input_text ('community', '', '', 25, 0, true);
-	$table->data[0][2] = '<strong>'.__('Starting OID').'</strong><br>';
+	$table->data[0][2] = '<strong>'.__('Starting OID').'</strong> &nbsp;&nbsp;';
 	$table->data[0][2] .= html_print_input_text ('starting_oid', '.1.3.6.1.2', '', 25, 0, true);
 	
-	$table->data[0][3] = '<strong>' . __('Version') . '</strong>';
+	$table->data[0][3] = '<strong>' . __('Version') . '</strong> &nbsp;&nbsp;';
 	$table->data[0][3] .= html_print_select (
 		array ('1' => 'v. 1',
 			'2' => 'v. 2',
 			'2c' => 'v. 2c',
 			'3' => 'v. 3'),
 		'snmp_browser_version', '', 'checkSNMPVersion();', '', '', true, false, false, '');
-	$table->cellstyle[0][3] = 'width: 15px;';
-	
-	$table->data[0][4] = html_print_button(__('Browse'), 'browse', false, 'snmpBrowse()', 'class="sub search"', true);
-	$table->cellstyle[0][4] = 'vertical-align: bottom;';
+
+	$table->data[0][4] = html_print_button(__('Browse'), 'browse', false, 'snmpBrowse()', 'class="sub search" style="margin-top:0px;"', true);
 	
 	// SNMP v3 options
-	$table3->width = '98%';
+	$table3->width = '100%';
 	
-	$table3->valign[0] = 'top';
-	$table3->valign[1] = 'top';
+	$table3->valign[0] = '';
+	$table3->valign[1] = '';
 	
 	$table3->data[2][1] = '<b>'.__('Auth user').'</b>';
 	$table3->data[2][2] = html_print_input_text ('snmp3_browser_auth_user', '', '', 15, 60, true);
@@ -535,6 +534,7 @@ function snmp_browser_print_container ($return = false, $width = '95%', $height
 	
 	// Search tools
 	$table2->width = '100%';
+	$table2->class = 'databox filters';
 	$table2->size = array ();
 	$table2->data = array ();
 	
diff --git a/pandora_console/include/functions_ui.php b/pandora_console/include/functions_ui.php
index 379496e603..416976c714 100755
--- a/pandora_console/include/functions_ui.php
+++ b/pandora_console/include/functions_ui.php
@@ -231,6 +231,9 @@ function ui_print_message ($message, $class = '', $attributes = '', $return = fa
 			case 'suc':
 				$text_title = __('Success');
 				break;
+			case 'warning':
+				$text_title = __('Warning');
+				break;
 		}
 	}
 	
@@ -246,6 +249,9 @@ function ui_print_message ($message, $class = '', $attributes = '', $return = fa
 			case 'suc':
 				$icon_image = 'images/suc.png';
 				break;
+			case 'warning':
+				$icon_image = 'images/warning_big.png';
+				break;
 		}
 		
 		$icon_image = $icon_image;
@@ -370,6 +376,21 @@ function ui_print_result_message ($result, $good = '', $bad = '', $attributes =
 	}
 }
 
+/** 
+ * Prints an warning message.
+ * 
+ * @param mixed The string warning message or array ('title', 'message', 'icon', 'no_close') to be displayed
+ * @param string Any other attributes to be set for the tag.
+ * @param bool Whether to output the string or return it
+ * @param string What tag to use (you could specify something else than
+ * h3 like div or h2)
+ *
+ * @return string HTML code if return parameter is true.
+ */
+function ui_print_warning_message ($message, $attributes = '', $return = false, $tag = 'h3') {
+	return ui_print_message ($message, 'warning', $attributes, $return, $tag);
+}
+
 /**
  * Evaluates a unix timestamp and returns a span (or whatever tag specified)
  * with as title the correctly formatted full timestamp and a time comparation
@@ -855,13 +876,13 @@ function ui_format_alert_row ($alert, $agent = true, $url = '', $agent_style = f
 	$actions = alerts_get_alert_agent_module_actions ($alert['id'], false);
 	
 	if (!empty($actions)) {
-		$actionText = '<div style="margin-left: 10px;"><ul class="action_list">';
+		$actionText = '<div><ul class="action_list">';
 		foreach ($actions as $action) {
-			$actionText .= '<div><span class="action_name"><li>' . $action['name'];
+			$actionText .= '<div style="margin-bottom: 5px;" ><span class="action_name"><li>' . $action['name'];
 			if ($action["fires_min"] != $action["fires_max"]){
 				$actionText .=  " (".$action["fires_min"] . " / ". $action["fires_max"] . ")";
 			}
-			$actionText .= '</li></span><br /></div>';
+			$actionText .= '</li></span></div>';
 		}
 		$actionText .= '</ul></div>';
 	}
@@ -2400,7 +2421,7 @@ function ui_print_page_header ($title, $icon = "", $return = false, $help = "",
 	$buffer .= '<span style="">' . 
 		ui_print_truncate_text($title, 38);
 	if ($help != "")
-		$buffer .= "<div class='head_help' style='float: right; margin-top: 3px !important; margin-left: 2px !important;'>" .
+		$buffer .= "<div class='head_help' style='float: right; margin-top: -2px !important; margin-left: 2px !important;'>" .
 			ui_print_help_icon ($help, true, '', 'images/help_w.png') . "</div>";
 	$buffer .= '</span></li></ul></div>';
 	
diff --git a/pandora_console/include/javascript/tiny_mce/themes/advanced/skins/default/ui.css b/pandora_console/include/javascript/tiny_mce/themes/advanced/skins/default/ui.css
index 77083f311d..023cd176b3 100644
--- a/pandora_console/include/javascript/tiny_mce/themes/advanced/skins/default/ui.css
+++ b/pandora_console/include/javascript/tiny_mce/themes/advanced/skins/default/ui.css
@@ -16,13 +16,13 @@
 .defaultSkin .mceExternalClose {position:absolute; top:3px; right:3px; width:7px; height:7px; background:url(../../img/icons.gif) -820px 0}
 
 /* Layout */
-.defaultSkin table.mceLayout {border:0; border-left:1px solid #CCC; border-right:1px solid #CCC}
+.defaultSkin table.mceLayout {border:0; border-left:1px solid #CCC; border-right:1px solid #CCC; margin-bottom:10px;}
 .defaultSkin table.mceLayout tr.mceFirst td {border-top:1px solid #CCC}
 .defaultSkin table.mceLayout tr.mceLast td {border-bottom:1px solid #CCC}
 .defaultSkin table.mceToolbar, .defaultSkin tr.mceFirst .mceToolbar tr td, .defaultSkin tr.mceLast .mceToolbar tr td {border:0; margin:0; padding:0;}
 .defaultSkin td.mceToolbar {background:#F0F0EE; padding-top:1px; vertical-align:top}
 .defaultSkin .mceIframeContainer {border-top:1px solid #CCC; border-bottom:1px solid #CCC}
-.defaultSkin .mceStatusbar {background:#F0F0EE; font-family:'MS Sans Serif',sans-serif,Verdana,Arial; font-size:9pt; line-height:16px; overflow:visible; color:#000; display:block; height:20px}
+.defaultSkin .mceStatusbar {background:#F0F0EE; font-family:'MS Sans Serif',sans-serif,Verdana,Arial; font-size:9pt; line-height:16px; overflow:visible; color:#000; display:block; height:10px;}
 .defaultSkin .mceStatusbar div {float:left; margin:2px}
 .defaultSkin .mceStatusbar a.mceResize {display:block; float:right; background:url(../../img/icons.gif) -800px 0; width:20px; height:20px; cursor:se-resize; outline:0}
 .defaultSkin .mceStatusbar a:hover {text-decoration:underline}
diff --git a/pandora_console/include/styles/menu.css b/pandora_console/include/styles/menu.css
index 542fd824fd..6255c9ea85 100644
--- a/pandora_console/include/styles/menu.css
+++ b/pandora_console/include/styles/menu.css
@@ -90,7 +90,6 @@ li:hover ul { display: block; }
 .submenu2 li a {
 	margin-left: 0px;
 	padding-left: 0px;
-	display:block;
 }
 
 .menu li img.toggle {
@@ -195,6 +194,7 @@ li:hover ul { display: block; }
 }
 #icon_god-extensions {
 	background: url(../../images/builder.menu.png) no-repeat 50% 50%;
+	
 }
 
 #menu_container {
@@ -220,11 +220,6 @@ ul li {
 	display: none;
 }
 
-/* Styles for Menu Items */
-ul li a {
-	display: block;
-}
-
 /* Fix IE. Hide from IE Mac \*/
 * html ul li { float: left; height: 1%; }
 * html ul li a { height: 1%; }
diff --git a/pandora_console/include/styles/pandora.css b/pandora_console/include/styles/pandora.css
index 9c8568b32a..525002b3f5 100755
--- a/pandora_console/include/styles/pandora.css
+++ b/pandora_console/include/styles/pandora.css
@@ -102,7 +102,7 @@ h1, h2, h3, h4 {
 	font-size: 1em;
 	font-family: Arial, Sans-serif;
 	text-transform: uppercase;
-	color: #3f4e2f;
+	color: #3F3F3F;
 	padding-bottom: 4px;
 	padding-top: 7px;
 }
@@ -116,9 +116,7 @@ h3 {
 	font-size: 14px;
 }
 h4 {
-	margin-bottom: 2px;
-	padding-bottom: 0px;
-	padding-top: 5px;
+	margin-bottom: 10px;
 	font-size: 13px;
 	color: #3F3F3F;
 	text-transform: none;
@@ -128,7 +126,7 @@ a {
 	text-decoration: none;
 }
 a:hover {
-	color: #003a3a;
+	color: #373737;
 	text-decoration: underline;
 }
 a.white_bold {
@@ -146,6 +144,7 @@ p.center {
 h1#log_title {
 	font-size: 18px;
 	margin-bottom: 0px;
+	color: #FFF !important;
 }
 div#log_msg {
 	display: none;
@@ -370,22 +369,10 @@ div#foot {
 #login_body {
 	/* Set rules to fill background */
 	min-height: 100%;
-	min-width: 960px;
-
-	/* Set up proportionate scaling */
+	min-width: 1024px;
 	width: 100%;
-	height: auto;
-
-	/* Set up positioning */
-	position: fixed;
-	top: 0;
-	left: 0;
-	z-index: -999;
-
-	background-color: #DDD;
-	background-image: url(../../images/login_background.jpg);
-	background-repeat: repeat;
-	background-position: center;
+	z-index: -9999;
+	position: absolute;
 }
 
 @media screen and (max-width: 1024px) { /* Specific to this particular image */
@@ -394,8 +381,37 @@ div#foot {
 		margin-left: -512px;   /* 50% */
 	}
 }
+@media screen and (max-width: 1100px) { /* Specific to this particular image */
+	#login_body {
+		background-image: url("../../images/backgrounds/fondo_madera_bn_1100.jpg");
+		background-repeat: repeat;
+		background-position: center center;
+	}
+}
+@media screen and (max-width: 1400px) { /* Specific to this particular image */
+	#login_body {
+		background-image: url("../../images/backgrounds/fondo_madera_bn_1400.jpg");
+		background-repeat: repeat;
+		background-position: center center;
+	}
+}
+@media screen and (max-width: 2000px) { /* Specific to this particular image */
+	#login_body {
+		background-image: url("../../images/backgrounds/fondo_madera_bn_2000.jpg");
+		background-repeat: repeat;
+		background-position: center center;
+	}
+}
+@media screen and (max-width: 2500px) { /* Specific to this particular image */
+	#login_body {
+		background-image: url("../../images/backgrounds/fondo_madera_bn_2500.jpg");
+		background-repeat: repeat;
+		background-position: center center;
+	}
+}
 
 p.log_in {
+	color: #FFF !important;
 	padding: 0px 10px;
 }
 h1#log_f {
@@ -404,10 +420,9 @@ h1#log_f {
 	padding-bottom: 3px;
 }
 div#login {
-	border-left: solid 1px #000;
-	border-top: solid 1px #000;
-	border-bottom: solid 2px #000;
-	border-right: solid 2px #000;
+	border-width: 2px 2px 2px 2px;
+	border-style: solid;
+	border-color: #000;
 	font-size: 12px !important;
 }
 div#login_in, #login_f {
@@ -416,57 +431,55 @@ div#login_in, #login_f {
 }
 
 .databox_login, .databox_logout {
-	border: none !important;
-	padding: 4px;
-	border-radius: 11px;
-	height: 227px;
+	border-radius: 5px;
+	height: 200px;
 }
 
 #login_inner {
 	width: 100%;
 	height: 100%;
-	border-radius: 4px;
-	overflow: hidden;
-
+	border-radius: 5px;
 	/* Browser without multibackground support */
-	background: #ffffff !important;
-    /* Safari 4-5, Chrome 1-9 */
-    background: -webkit-gradient(linear, 0% 0%, 0% 100%, from(#ffffff), to(#E9E9E9)) !important;
-    /* Safari 5.1+, Chrome 10+ */
-	background: -webkit-linear-gradient(top, #ffffff, #E9E9E9) !important;
-    /* Firefox 3.6+ */
-    background: -moz-linear-gradient(top, #ffffff, #E9E9E9) !important;
-    /* Opera 11.10+ */
-    background: -o-linear-background(top, #ffffff, #E9E9E9) !important;
-    /* IE 10 */
-    background: -ms-linear-background(top, #ffffff, #E9E9E9) !important;
-    /* estándar */
-    background: linear-background(top, #ffffff, #E9E9E9) !important;
+	background-color: #373737 !important;
+
 }
 #login_outer {
-	-moz-box-shadow: 8px 8px 30px #777;
-	-webkit-box-shadow: 8px 8px 30px #777;
-	box-shadow: 8px 8px 30px #777;
-	padding: 3px;
 	border-radius: 11px;
-	width: 431px !important;
-	margin: 100px auto;
-	background-color: #3f3f3f;
+	background-color: #000;
+	width: 500px !important;
+	color: #FFF !important;
+	margin: 0px auto;
 }
 
+.version_login{
+	transform: rotate(36deg);
+	float: right;
+	margin-top: 18px;
+	width: 80px;
+	height: 0px;
+	border-right: 13px solid transparent;
+	border-left: 25px solid transparent;
+	border-bottom: 18px solid #80BA27;
+	left: 16px;
+	position: relative;
+}
+
+
 #login_outer * {
 	font-family: Nunito, "Arial Rounded MT", Arial, Helvetica, sans-serif;
 	font-weight: bold;
 }
-
+.login_border{
+	border-right: 1px solid #FFF;
+	text-align: center;
+}
 table#login_layout {
-	width: 100%;
-	height: 213px;
+	width: 30%;
+	height: 160px;
+	position: absolute;
 }
 
 div#error_login {
-	#margin: 0 auto;
-	#margin-top: -10px;
 	text-align: center;
 	margin-top: 5px;
 	margin-left: 5px;
@@ -491,22 +504,40 @@ div#login_f {
 	margin-bottom: 25px;
 }
 
-IMG.login_logo {
-	border: 0px;
-	width: 140px;
-	margin-top: 15px;
-	margin-bottom: 15px;
-}
-
 a:focus, input:focus, button:focus {
 	utline-width: 0;
 	outline: 0;
 }
 
-DIV.login_button, DIV.login_links {
+DIV.login_links {
+	margin: 10px 0px 0px;
+	color: #FFF;
+	text-align: center;
+}
+
+DIV.login_links>a {
+	color: #FFF;
+}
+
+DIV.login_button{
 	text-align:right;
-	width: 191px;
-	margin: 16px 0px 17px 0px;
+	width: 68%;
+	margin-top: 15px;
+}
+
+DIV.login_button>input{
+	background-color: #373737 !important;
+	border: 0px none;
+	background-image: url("../../images/input_go.png") !important;
+	padding-right: 25px !important;
+}
+
+.login_page{
+	height: 200px;
+	padding-top: 10%;
+	text-align: center;
+	width: 100%;
+	position: absolute;
 }
 
 input.next_login {
@@ -521,7 +552,27 @@ input.next_login {
 }
 
 DIV.login_nick, DIV.login_pass {
-	text-align: left;
+	text-align:left;
+	padding-left: 15px;
+	margin-top: 10px;
+}
+
+DIV.login_nick>input, DIV.login_pass>input {
+	height: 25px;
+	border-radius:0px;
+	margin-left: 10px;
+}
+
+DIV.login_nick>input:focus,DIV.login_pass>input:focus {
+    outline-width: 0px;
+    border-color: #373737;
+    background-color: #373737;
+    font-size: 12px;
+    box-shadow: 0px 0px 3px 3px #e2e2e2;
+}
+
+DIV.login_nick>img, DIV.login_pass>img {
+	vertical-align: middle;
 }
 
 DIV.login_links a {
@@ -558,7 +609,6 @@ DIV.login_pass {
 
 input.login {
 	border: 0px none;
-	background-color: #ebebeb !important;
 	margin: 0px 0px;
 	width: 135px;
 	height: 18px;
@@ -569,22 +619,19 @@ input.login {
 
 input.login_user {
 	/* Browser without multibackground support */
-	background-color: #e2e2e2 !important;
+	color: #373737 !important;
 	padding-left: 8px;
 	width: 179px;
 	color: #222;
 	height: 18px;
-	-webkit-box-shadow: 0 0 0px 1000px #e2e2e2 inset;
 }
 
 input.login_password {
 	/* Browser without multibackground support */
-	background-color: #e2e2e2 !important;
 	padding-left: 8px;
 	width: 179px;
 	color: #222;
 	height: 18px;
-	-webkit-box-shadow: 0 0 0px 1000px #e2e2e2 inset;
 }
 .databox_error {
 	width: 657px !important;
@@ -595,15 +642,12 @@ input.login_password {
 }
 
 #ver_num {
-	color: #000;
-	font-size: xx-small;
-	background: white;
-	margin-top: 32px;
-	margin: 0 auto;
-	width: 100px;
+	margin: 0px auto;
+	width: 100%;
 	position: absolute;
 	bottom: 10px;
-	right: 0px;
+	color: #FFF;
+	text-align: center;
 }
 
 input:-webkit-autofill {
@@ -639,7 +683,7 @@ input.sub {
 
 	background-color: #333 !important;
 	background-repeat: no-repeat !important;
-	background-position: 92% 5px !important;
+	background-position: 92% 3px !important;
 
 	color: white !important;
 	padding: 3px 3px 5px 12px;
@@ -659,7 +703,6 @@ input.target, input.search, input.copy, input.add, input.graph,
 input.percentile, input.binary, input.camera, input.config,
 input.cancel, input.default, input.filter, input.pdf {
 	padding-right: 30px;
-	margin-top: 15px;
 	height: 23px;
 
 }
@@ -730,6 +773,10 @@ input.pdf {
 input.pdf:disabled {
 	background-image: url(../../images/input_pdf.disabled.png) !important;
 }
+input.camera {
+	background-image: url(../../images/camera.png) !important;
+}
+
 #toolbox #auto_save {
 	padding-top: 5px;
 }
@@ -969,6 +1016,10 @@ tr.disabled_row_user * {
 	color: #f85858;
 }
 
+.warning *{
+	color: #FAD403;
+}
+
 .help {
 	background: url(../../images/help.png) no-repeat;
 }
@@ -1176,7 +1227,7 @@ div.title_line {
 /*	text-transform: uppercase; */
 	padding: 0px 0px 0px 0px;
 	color: #fff;
-	font-size: 9pt;
+	font-size: 8.5pt;
 	font-weight: bold;
 	line-height: 18px;
 }
@@ -1301,13 +1352,12 @@ span.rmess, span.nrmess {
 /* New styles for data box */
 .databox, .databox_color, .databox_frame {
 	margin-bottom: 5px;
-	margin-top: 5px;
+	margin-top: 0px;
 	margin-left: 0px;
 	border: 1px solid #e2e2e2;
 	-moz-border-radius: 4px;
 	-webkit-border-radius: 4px;
 	border-radius: 4px;
-	padding-bottom: 5px;
 
 }
 .databox_color{
@@ -1336,6 +1386,9 @@ table.databox {
 	color: #fff;
 	padding-left: 10px;
 }
+.databox td {
+	#border-bottom: 1px solid #E2E2E2;
+}
 
 .databox th * {
 	color: #fff;
@@ -1488,7 +1541,6 @@ div#main_pure {
 }
 .img_help {
 	cursor: help;
-	margin-top: -5px;
 }
 #loading {
 	position:fixed;
@@ -1881,7 +1933,7 @@ div#steps_clean {
 	width: 100%;
 	padding-right: 0px;
 	margin-left: 0px !important;
-	margin-bottom: 15px;
+	margin-bottom: 20px;
 	height: 31px;
 }
 div#events_list {
@@ -1910,6 +1962,7 @@ div#logo_text3 {
 }
 .pagination {
 	margin-top: 15px;
+	margin-bottom: 5px;
 }
 .pagination * {
 	margin-left: 0px !important;
@@ -2071,6 +2124,7 @@ div.cellBig {
 .info_box {
 	background: #F9FAF9;
 	margin-top: 10px !important;
+	margin-bottom: 10px !important;
 	padding: 0px 5px 5px 10px;
 	border-color: #E2E2E2;
 	border-style: solid;
@@ -2455,8 +2509,8 @@ input.search_input {
 	margin-top: 8px !important;
 }
 
-a>img, td>input, td>span {
-	vertical-align: middle;
+a[id^='tgl_ctrl_']>img, a[id^='tgl_ctrl_']>b>img{
+	vertical-align:middle;
 }
 
 .noshadow {
@@ -2854,7 +2908,7 @@ table#policy_modules td * {
 
 .databox.data td{
 	padding-left: 10px;
-	border: 1px solid #EFEFEF;
+	border-bottom: 1px solid #E2E2E2;
 }
 
 .databox .search{
@@ -2937,9 +2991,28 @@ table#policy_modules td * {
 	margin-top: 0px !important ;
 }
 
+.databox.filters, .databox.data{
+	margin-bottom: 20px;
+}
+
 .databox.filters td{
 	padding: 10px;
+	padding-left:20px;
 }
+
+.databox.filters td>img, .databox.filters td>div>a>img, 
+.databox.filters td>span>img, .databox.filters td>span>a>img,
+.databox.filters td>a>img{
+	vertical-align: middle;
+	margin-left: 5px;
+}
+.databox.data td>img,.databox.data th>img, .databox.data td>div>a>img, 
+.databox.data td>span>img, .databox.data td>span>a>img,
+.databox.data td>a>img{
+	vertical-align: middle;
+	margin-left: 5px;
+}
+
 .databox_color td{
 	padding-left: 10px;
 }
diff --git a/pandora_console/include/styles/tree.css b/pandora_console/include/styles/tree.css
index 0e28a26f97..d97ad31d48 100644
--- a/pandora_console/include/styles/tree.css
+++ b/pandora_console/include/styles/tree.css
@@ -155,7 +155,7 @@ div.tree-table-cell.tree-table-cell-tree {
 
 div.tree-table-cell.tree-table-cell-detail {
 	padding-left: 10px;
-	width: 550px;
+	width: 60%;
 }
 
 div.tree-element-detail-closed {
diff --git a/pandora_console/operation/agentes/alerts_status.functions.php b/pandora_console/operation/agentes/alerts_status.functions.php
index 7d1ae0306f..587e71ef3a 100755
--- a/pandora_console/operation/agentes/alerts_status.functions.php
+++ b/pandora_console/operation/agentes/alerts_status.functions.php
@@ -41,6 +41,8 @@ function printFormFilterAlert($id_group, $filter, $free_search, $url, $filter_st
 	
 	$table->width = '100%';
 	$table->class = 'databox filters';
+	$table->cellpadding = '0';
+	$table->cellspacing = '0';
 	if(defined('METACONSOLE')){
 		$table->class = 'databox_filters';
 		$table->width = '96%';
@@ -105,10 +107,13 @@ function printFormFilterAlert($id_group, $filter, $free_search, $url, $filter_st
 	    $data = '<form style="background-color: #ECECEC;" method="post" action="'.$url.'">';
 	}
 	else{
-		$table->data[1][4] = html_print_submit_button(__('Filter'), 'filter_button', false, 'class="sub filter"', true);
 		$data = '<form method="post" action="'.$url.'">';
 	}
 	$data .= html_print_table ($table, true);
+	if ( !defined("METACONSOLE") )
+		$data .= "<div style='height:100%; text-align:right;'>" . 
+				html_print_submit_button(__('Filter'), 'filter_button', false, 'class="sub filter"', true) . "</div>";
+	
 	$data .= '</form>';
 	
 	if ($return) {
diff --git a/pandora_console/operation/agentes/alerts_status.php b/pandora_console/operation/agentes/alerts_status.php
index a597cf62cc..5ba3f06826 100755
--- a/pandora_console/operation/agentes/alerts_status.php
+++ b/pandora_console/operation/agentes/alerts_status.php
@@ -377,14 +377,16 @@ if ($print_agent) {
 		ui_toggle(printFormFilterAlert($id_group, $filter, $free_search, $url, $filter_standby, $tag_filter, true, $strict_user),__('Show Options'));;
 	}
 	else{
-		echo '<br>';
 		ui_toggle(printFormFilterAlert($id_group, $filter, $free_search, $url, $filter_standby, $tag_filter, true, $strict_user),__('Alert control filter'), __('Toggle filter(s)'));
 	}
 }
 
 $table->width = '100%';
 $table->class = "databox data";
+$table->cellpadding = '0';
+$table->cellspacing = '0';
 if(defined('METACONSOLE')){
+	$table->class = "databox";
 	$table->cellpadding = '0';
 	$table->cellspacing = '0';
 }
@@ -415,9 +417,11 @@ if ($isFunctionPolicies !== ENTERPRISE_NOT_HOOK) {
 		$table->head[7] = __('Last fired');
 		$table->head[8] = __('Status');
 		if (!defined('METACONSOLE')) {
+			$table->size[8] = '4%';
 			if (check_acl ($config["id_user"], $id_group, "LW") || check_acl ($config["id_user"], $id_group, "LM")) {
 				$table->head[9] = __('Validate');
 				$table->align[9] = 'center';
+				$table->size[9] = '5%';
 			}
 		}
 		
@@ -453,9 +457,11 @@ if ($isFunctionPolicies !== ENTERPRISE_NOT_HOOK) {
 		$table->head[6] = __('Last fired');
 		$table->head[7] = __('Status');
 		if (!defined('METACONSOLE')) {
+			$table->size[7] = '5%';
 			if (check_acl ($config["id_user"], $id_group, "LW") || check_acl ($config["id_user"], $id_group, "LM")) {
 				$table->head[8] = __('Validate');
 				$table->align[8] = 'center';
+				$table->size[8] = '5%';
 			}
 		}
 		$table->align[7] = 'center';
@@ -484,9 +490,11 @@ else {
 		$table->head[6] = __('Last fired');
 		$table->head[7] = __('Status');
 		if (!defined('METACONSOLE')) {
+			$table->size[7] = '5%';
 			if (check_acl ($config["id_user"], $id_group, "LW") || check_acl ($config["id_user"], $id_group, "LM")) {
 				$table->head[8] = __('Validate');
 				$table->align[8] = 'center';
+				$table->size[8] = '5%';
 			}
 		}
 		$table->align[7] = 'center';
@@ -515,9 +523,11 @@ else {
 		$table->head[5] = __('Last fired');
 		$table->head[6] = __('Status');
 		if (!defined('METACONSOLE')) {
+			$table->size[6] = '5%';
 			if (check_acl ($config["id_user"], $id_group, "LW") || check_acl ($config["id_user"], $id_group, "LM")) {
 				$table->head[7] = __('Validate');
 				$table->align[7] = 'center';
+				$table->size[7] = '5%';
 			}
 		}
 		$table->align[6] = 'center';
@@ -574,7 +584,7 @@ if (!empty ($table->data)) {
 	echo '</form>';
 }
 else {
-	ui_print_empty_data ( __('No alerts found') );
+	ui_print_info_message ( array('no_close'=>true, 'message'=>  __('No alerts found') ) );
 }
 
 //strict user hidden
diff --git a/pandora_console/operation/agentes/estado_agente.php b/pandora_console/operation/agentes/estado_agente.php
index 4c98e215b0..b4163d861b 100644
--- a/pandora_console/operation/agentes/estado_agente.php
+++ b/pandora_console/operation/agentes/estado_agente.php
@@ -197,15 +197,6 @@ echo '</td><td style="width:5%;">&nbsp;</td>';
 
 echo '</tr></table></form>';
 
-if (check_acl ($config['id_user'], 0, "AW") || check_acl ($config['id_user'], 0, "AM")) {
-	echo '<div style="text-align: right; float: right;">';
-	echo '<form method="post" action="index.php?sec=gagente&sec2=godmode/agentes/configurar_agente">';
-		html_print_input_hidden ('new_agent', 1);
-		html_print_submit_button (__('Create agent'), 'crt', false, 'class="sub next"');
-	echo "</form>";
-	echo '</div>';
-}
-
 if ($search != "") {
 	$filter = array ("string" => '%' . $search . '%');
 }
@@ -427,11 +418,11 @@ if (empty ($agents)) {
 
 // Prepare pagination
 ui_pagination ($total_agents,
-	ui_get_url_refresh (array ('group_id' => $group_id, 'recursion' => $recursion, 'search' => $search, 'sort_field' => $sortField, 'sort' => $sort, 'status' => $status)));
+ui_get_url_refresh (array ('group_id' => $group_id, 'recursion' => $recursion, 'search' => $search, 'sort_field' => $sortField, 'sort' => $sort, 'status' => $status)));
 
 // Show data.
-$table->cellpadding = 4;
-$table->cellspacing = 4;
+$table->cellpadding = 0;
+$table->cellspacing = 0;
 $table->width = "100%";
 $table->class = "databox data";
 
@@ -439,35 +430,52 @@ $table->head = array ();
 $table->head[0] = __('Agent'). ' ' .
 	'<a href="index.php?sec=estado&amp;sec2=operation/agentes/estado_agente&amp;refr=' . $refr . '&amp;offset=' . $offset . '&amp;group_id=' . $group_id . '&amp;recursion=' . $recursion . '&amp;search=' . $search . '&amp;status='. $status . '&amp;sort_field=name&amp;sort=up">' . html_print_image("images/sort_up.png", true, array("style" => $selectNameUp, "alt" => "up"))  . '</a>' .
 	'<a href="index.php?sec=estado&amp;sec2=operation/agentes/estado_agente&amp;refr=' . $refr . '&amp;offset=' . $offset . '&amp;group_id=' . $group_id . '&amp;recursion=' . $recursion . '&amp;search=' . $search . '&amp;status='. $status . '&amp;sort_field=name&amp;sort=down">' . html_print_image("images/sort_down.png", true, array("style" => $selectNameDown, "alt" => "down")) . '</a>';
+$table->size[0] = "10%";
+
 $table->head[1] = __('Description');
+$table->size[1] = "30%";
+
 $table->head[2] = __('OS'). ' ' .
 	'<a href="index.php?sec=estado&amp;sec2=operation/agentes/estado_agente&amp;refr=' . $refr . '&amp;offset=' . $offset . '&amp;group_id=' . $group_id . '&amp;recursion=' . $recursion . '&amp;search=' . $search . '&amp;status='. $status . '&amp;sort_field=os&amp;sort=up">' . html_print_image("images/sort_up.png", true, array("style" => $selectOsUp, "alt" => "up"))  . '</a>' .
 	'<a href="index.php?sec=estado&amp;sec2=operation/agentes/estado_agente&amp;refr=' . $refr . '&amp;offset=' . $offset . '&amp;group_id=' . $group_id . '&amp;recursion=' . $recursion . '&amp;search=' . $search . '&amp;status='. $status . '&amp;sort_field=os&amp;sort=down">' . html_print_image("images/sort_down.png", true, array("style" => $selectOsDown, "alt" => "down")) . '</a>';
+$table->size[2] = "4%";
+
 $table->head[3] = __('Interval'). ' ' .
 	'<a href="index.php?sec=estado&amp;sec2=operation/agentes/estado_agente&amp;refr=' . $refr . '&amp;offset=' . $offset . '&amp;group_id=' . $group_id . '&amp;recursion=' . $recursion . '&amp;search=' . $search . '&amp;status='. $status . '&amp;sort_field=interval&amp;sort=up">' . html_print_image("images/sort_up.png", true, array("style" => $selectIntervalUp, "alt" => "up")) . '</a>' .
 	'<a href="index.php?sec=estado&amp;sec2=operation/agentes/estado_agente&amp;refr=' . $refr . '&amp;offset=' . $offset . '&amp;group_id=' . $group_id . '&amp;recursion=' . $recursion . '&amp;search=' . $search . '&amp;status='. $status . '&amp;sort_field=interval&amp;sort=down">' . html_print_image("images/sort_down.png", true, array("style" => $selectIntervalDown, "alt" => "down")) . '</a>';
+$table->size[3] = "10%";
+
 $table->head[4] = __('Group'). ' ' .
 	'<a href="index.php?sec=estado&amp;sec2=operation/agentes/estado_agente&amp;refr=' . $refr . '&amp;offset=' . $offset . '&amp;group_id=' . $group_id . '&amp;recursion=' . $recursion . '&amp;search=' . $search . '&amp;status='. $status . '&amp;sort_field=group&amp;sort=up">' . html_print_image("images/sort_up.png", true, array("style" => $selectGroupUp, "alt" => "up")) . '</a>' .
 	'<a href="index.php?sec=estado&amp;sec2=operation/agentes/estado_agente&amp;refr=' . $refr . '&amp;offset=' . $offset . '&amp;group_id=' . $group_id . '&amp;recursion=' . $recursion . '&amp;search=' . $search . '&amp;status='. $status . '&amp;sort_field=group&amp;sort=down">' . html_print_image("images/sort_down.png", true, array("style" => $selectGroupDown, "alt" => "down")) . '</a>';
+$table->size[4] = "15%";
+
 $table->head[5] = __('Modules');
+$table->size[5] = "10%";
+
 $table->head[6] = __('Status');
+$table->size[6] = "4%";
+
 $table->head[7] = __('Alerts');
+$table->size[7] = "4%";
+
 $table->head[8] = __('Last contact'). ' ' .
 	'<a href="index.php?sec=estado&amp;sec2=operation/agentes/estado_agente&amp;refr=' . $refr . '&amp;offset=' . $offset . '&amp;group_id=' . $group_id . '&amp;recursion=' . $recursion . '&amp;search=' . $search . '&amp;status='. $status . '&amp;sort_field=last_contact&amp;sort=up">' . html_print_image("images/sort_up.png", true, array("style" => $selectLastContactUp, "alt" => "up")) . '</a>' .
 	'<a href="index.php?sec=estado&amp;sec2=operation/agentes/estado_agente&amp;refr=' . $refr . '&amp;offset=' . $offset . '&amp;group_id=' . $group_id . '&amp;recursion=' . $recursion . '&amp;search=' . $search . '&amp;status='. $status . '&amp;sort_field=last_contact&amp;sort=down">' . html_print_image("images/sort_down.png", true, array("style" => $selectLastContactDown, "alt" => "down")) . '</a>';
+$table->size[8] = "15%";
 
 $table->align = array ();
 
 $table->align[2] = "center";
-$table->align[3] = "center";
-$table->align[4] = "center";
-$table->align[5] = "center";
+$table->align[3] = "left";
+$table->align[4] = "left";
+$table->align[5] = "left";
 $table->align[6] = "center";
 $table->align[7] = "center";
-$table->align[8] = "right";
+$table->align[8] = "left";
 
 $table->style = array();
-$table->style[0] = 'width: 15%';
+//$table->style[0] = 'width: 15%';
 
 $table->data = array ();
 
@@ -489,14 +497,14 @@ foreach ($agents as $agent) {
 	
 	$data = array ();
 	
-	$data[0] = '';
-	$data[0] .= '<span class="left">';
+	$data[0] = '<div class="left_' . $agent["id_agente"] . '">';
+	$data[0] .= '<span>';
 	if ($agent['quiet']) {
 		$data[0] .= html_print_image("images/dot_green.disabled.png", true, array("border" => '0', "title" => __('Quiet'), "alt" => "")) . "&nbsp;";
 	}
 	$data[0] .= ui_print_agent_name($agent["id_agente"], true, 60, 'font-size:6.5pt !important;', true);
 	$data[0] .= '</span>';
-	$data[0] .= '<div class="left actions" style="visibility: hidden; clear: left">';
+	$data[0] .= '<div class="agentleft_' . $agent["id_agente"] . '" style="visibility: hidden; clear: left;">';
 	$data[0] .= '<a href="index.php?sec=estado&sec2=operation/agentes/ver_agente&id_agente='.$agent["id_agente"].'">'.__('View').'</a>';
 	$data[0] .= ' | ';
 	$data[0] .= '<a href="index.php?sec=estado&sec2=operation/agentes/ver_agente&id_agente='.$agent["id_agente"].'&tab=data">'.__('Data').'</a>';
@@ -504,7 +512,7 @@ foreach ($agents as $agent) {
 		$data[0] .= ' | ';
 		$data[0] .= '<a href="index.php?sec=gagente&amp;sec2=godmode/agentes/configurar_agente&amp;id_agente='.$agent["id_agente"].'">'.__('Edit').'</a>';
 	}
-	$data[0] .= '</div>';
+	$data[0] .= '</div></div>';
 	
 	$data[1] = ui_print_truncate_text(strip_tags(ui_bbcode_to_html($agent["description"])), 'description', false, true, true, '[&hellip;]', 'font-size: 6.5pt');
 	
@@ -541,6 +549,14 @@ foreach ($agents as $agent) {
 
 if (!empty ($table->data)) {
 	html_print_table ($table);
+	if (check_acl ($config['id_user'], 0, "AW") || check_acl ($config['id_user'], 0, "AM")) {
+		echo '<div style="text-align: right; float: right;">';
+		echo '<form method="post" action="index.php?sec=gagente&sec2=godmode/agentes/configurar_agente">';
+			html_print_input_hidden ('new_agent', 1);
+			html_print_submit_button (__('Create agent'), 'crt', false, 'class="sub next"');
+		echo "</form>";
+		echo '</div>';
+	}
 	ui_pagination ($total_agents,
 		ui_get_url_refresh(array(
 			'group_id' => $group_id,
@@ -550,20 +566,20 @@ if (!empty ($table->data)) {
 			'status' => $status)),
 		0, 0, false, 'offset', false);
 	unset ($table);
+	
 }
 else {
-	echo '<div class="nf">'.__('There are no defined agents').'</div>';
+	ui_print_info_message ( array ( 'no_close' => true, 'message' => __('There are no defined agents') ) );
 }
 ?>
 
 <script type="text/javascript">
 $(document).ready (function () {
-	
-	$("table#table1 tr").hover (function () {
-			$(".actions", this).css ("visibility", "");
-		},
-		function () {
-			$(".actions", this).css ("visibility", "hidden");
+	$("[class^='left']").mouseenter (function () {
+		console.log($(this));
+		$(".agent"+$(this)[0].className).css('visibility', '');
+	}).mouseleave(function () {
+		$(".agent"+$(this)[0].className).css('visibility', 'hidden');
 	});
 });
 </script>
diff --git a/pandora_console/operation/agentes/estado_generalagente.php b/pandora_console/operation/agentes/estado_generalagente.php
index 1fe7cf476f..79d873e02b 100755
--- a/pandora_console/operation/agentes/estado_generalagente.php
+++ b/pandora_console/operation/agentes/estado_generalagente.php
@@ -60,9 +60,9 @@ if (! check_acl ($config["id_user"], $agent["id_grupo"], "AR") && !$is_extra) {
 
 // START: TABLE AGENT BUILD
 $table_agent->id = 'agent_details_main';
-$table_agent->width = '450px';
-$table_agent->cellspacing = 4;
-$table_agent->cellpadding = 4;
+$table_agent->width = '82%';
+$table_agent->cellspacing = 0;
+$table_agent->cellpadding = 0;
 $table_agent->class = 'databox';
 $table_agent->style[0] = 'width: 16px; text-align:center; padding: 0px;';
 $table_agent->style[5] = 'width: 16px; text-align:center; padding: 0px;';
@@ -124,7 +124,7 @@ $table_agent->cellstyle[count($table_agent->data)][0] =
 
 $data[2] = ui_print_os_icon ($agent["id_os"], false, true, true, false, false, false, array('title' => __('OS') . ': ' . get_os_name ($agent["id_os"])));
 $table_agent->cellstyle[count($table_agent->data)][2] =
-	'width: 16px; text-align: right; padding: 0px; vertical-align: top;';
+	'width: 16px; text-align: right; padding: 0px;';
 $data[3] = empty($agent["os_version"]) ? get_os_name ((int) $agent["id_os"]) : $agent["os_version"];
 $table_agent->colspan[count($table_agent->data)][3] = 2;
 
@@ -144,7 +144,7 @@ if (!empty($address)) {
 	$data = array();
 	$data[2] = html_print_image('images/world.png', true, array('title' => __('IP address')));
 	$table_agent->cellstyle[count($table_agent->data)][2] =
-		'width: 16px; text-align: right; padding: 0px; vertical-align: top;';
+		'width: 16px; text-align: right; padding: 0px;';
 	$data[3] = '<span style="vertical-align:top; display: inline-block;">';
 	$data[3] .= empty($address) ? '<em>' . __('N/A') . '</em>' : $address;
 	$data[3] .= '</span>';
@@ -156,7 +156,7 @@ if (!empty($address)) {
 $data = array();
 $data[2] = html_print_image('images/version.png', true, array('title' => __('Agent Version')));
 $table_agent->cellstyle[count($table_agent->data)][2] =
-	'width: 16px; text-align: right; padding: 0px; vertical-align: top;';
+	'width: 16px; text-align: right; padding: 0px;';
 $data[3] = '<span style="vertical-align:top; display: inline-block;">';
 $data[3] .= empty($agent["agent_version"]) ? '<i>' . __('N/A') . '</i>' : $agent["agent_version"];
 $data[3] .= '</span>';
@@ -168,7 +168,7 @@ $data = array();
 $data[2] = html_print_image('images/default_list.png', true,
 	array('title' => __('Description')));
 $table_agent->cellstyle[count($table_agent->data)][2] =
-	'width: 16px; text-align: right; padding: 0px; vertical-align: top;';
+	'width: 16px; text-align: right; padding: 0px;';
 $data[3] = '<span style="vertical-align:top; display: inline-block;">';
 $data[3] .= empty($agent["comentarios"]) ?
 	'<em>' . __('N/A') . '</em>' :
@@ -184,8 +184,8 @@ $table_agent->rowclass[] = '';
 // START: TABLE CONTACT BUILD
 $table_contact->id = 'agent_contact_main';
 $table_contact->width = '100%';
-$table_contact->cellspacing = 4;
-$table_contact->cellpadding = 4;
+$table_contact->cellspacing = 0;
+$table_contact->cellpadding = 0;
 $table_contact->class = 'databox data';
 $table_contact->style[0] = 'width: 30%;';
 $table_contact->style[1] = 'width: 70%;';
@@ -227,8 +227,8 @@ $table_contact->data[] = $data;
 // START: TABLE DATA BUILD
 $table_data->id = 'agent_data_main';
 $table_data->width = '100%';
-$table_data->cellspacing = 4;
-$table_data->cellpadding = 4;
+$table_data->cellspacing = 0;
+$table_data->cellpadding = 0;
 $table_data->class = 'databox data';
 $table_data->style[0] = 'width: 30%;';
 $table_data->style[1] = 'width: 70%;';
@@ -355,8 +355,8 @@ if ($last_incident != false) {
 	
 	$table_incident->id = 'agent_incident_main';
 	$table_incident->width = '100%';
-	$table_incident->cellspacing = 4;
-	$table_incident->cellpadding = 4;
+	$table_incident->cellspacing = 0;
+	$table_incident->cellpadding = 0;
 	$table_incident->class = 'databox';
 	$table_incident->style[0] = 'width: 30%;';
 	$table_incident->style[1] = 'width: 70%;';
@@ -484,8 +484,8 @@ if (!empty($network_interfaces)) {
 $table = null;
 $table->id = 'agent_details';
 $table->width = '100%';
-$table->cellspacing = 4;
-$table->cellpadding = 4;
+$table->cellspacing = 0;
+$table->cellpadding = 0;
 $table->class = 'agents';
 $table->style = array_fill(0, 3, 'vertical-align: top;');
 
@@ -508,7 +508,7 @@ $access_agent = db_get_value_sql("SELECT COUNT(id_agent)
 
 if ($config["agentaccess"] && $access_agent > 0) {
 	$data[0] .=
-		'<table width=100% class="databox" style="position: static;">
+		'<br /><table width=82% class="databox" style="">
 		<tr><th>' . 
 				__('Agent access rate (24h)') . 
 			'</th></tr>' . 
diff --git a/pandora_console/operation/agentes/estado_monitores.php b/pandora_console/operation/agentes/estado_monitores.php
index 7ed66d8a0e..a9e0ef036a 100755
--- a/pandora_console/operation/agentes/estado_monitores.php
+++ b/pandora_console/operation/agentes/estado_monitores.php
@@ -72,8 +72,8 @@ if (is_ajax ()) {
 		
 		$table_relations = new stdClass();
 		$table_relations->id = 'module_' . $id_agente_modulo . '_relations';
-		$table_relations->width = '98%';
-		$table_relations->class = 'databox';
+		$table_relations->width = '100%';
+		$table_relations->class = 'databox filters';
 		$table_relations->style = array();
 		$table_relations->style[0] = 'font-weight: bold;';
 		$table_relations->style[2] = 'font-weight: bold;';
@@ -419,6 +419,9 @@ function print_form_filter_monitors($id_agent, $status_filter_monitor = -1,
 	$form_text = '';
 	$table->class = "databox filters";
 	$table->width = "100%";
+	$table->style[0] = 'font-weight: bold;';
+	$table->style[2] = 'font-weight: bold;';
+	$table->style[4] = 'font-weight: bold;';
 	$table->data[0][0] = html_print_input_hidden('filter_monitors', 1, true);
 	$table->data[0][0] .= html_print_input_hidden('monitors_change_filter', 1, true);
 	$table->data[0][0] .= __('Status:');
@@ -450,7 +453,7 @@ function print_form_filter_monitors($id_agent, $status_filter_monitor = -1,
 	}
 	$table->data[0][5] = html_print_select ($rows_select,'status_module_group', $status_module_group, '', '',0, true);
 	$table->data[0][6] = html_print_button(__('Filter'), 'filter', false, 'filter_modules();', 'class="sub search"', true);
-	$table->data[0][7] = '&nbsp;' . html_print_button(__('Reset'), 'filter', false, 'reset_filter_modules();', 'class="sub upd"', true);
+	$table->data[0][7] = '&nbsp;' . html_print_button(__('Reset'), 'filter', false, 'reset_filter_modules();', 'class="sub upd" style="margin-top:0px;"', true);
 	$form_text .= html_print_table($table, true);
 	
 	$filter_hidden = false;
@@ -459,6 +462,6 @@ function print_form_filter_monitors($id_agent, $status_filter_monitor = -1,
 		$filter_hidden = true;
 	}
 	
-	ui_toggle($form_text, __('Form filter'), __('Form filter'), $filter_hidden);
+	echo $form_text;
 }
 ?>
diff --git a/pandora_console/operation/agentes/gis_view.php b/pandora_console/operation/agentes/gis_view.php
index e96cc42f96..a0d3a2a043 100644
--- a/pandora_console/operation/agentes/gis_view.php
+++ b/pandora_console/operation/agentes/gis_view.php
@@ -52,7 +52,7 @@ echo "<div style='margin-bottom: 30px;'></div>";
 echo "<div id=\"" . $agent_name . "_agent_map\" style=\"border:1px solid black; width:100%; height: 30em;\"></div>";
 
 if (!gis_get_agent_map($id_agente, "500px", "100%", true, true, $period)) {
-	ui_print_error_message(__("There is no default map. Please go to the setup for to set a default map."));
+	ui_print_error_message( __("There is no default map. Please go to the setup for to set a default map.") );
 	echo "<script type='text/javascript'>
 		$(document).ready(function() {
 			$('#" . $agent_name . "_agent_map').hide();
@@ -82,26 +82,24 @@ gis_activate_ajax_refresh(null, $timestampLastOperation);
 gis_activate_select_control();
 
 if ($agentData === false) {
-	echo "<p>" .
-		__("There is no GIS data for this agent, so it's positioned in default position of map.") .
-		"</p>";
+	ui_print_info_message (
+		__("There is no GIS data for this agent, so it's positioned in default position of map.") );
 }
 
-echo "<br />";
 $dataLastPosition = gis_get_data_last_position_agent($agentId);
 if ($dataLastPosition !== false) {
 	echo "<b>" . __("Last position in ") .
 		$dataLastPosition['start_timestamp'] . ":</b> " .
 		$dataLastPosition['stored_longitude'] . ", " . $dataLastPosition['stored_latitude'] . ", " . $dataLastPosition['stored_altitude'];
 }
-echo "<br />";
+
 echo "<form class='' action='index.php?" . $url . "' method='POST'>";
 echo "<table width=100% class='databox filters'>";
 echo "<tr><td>" . __("Period to show data as path") . ": ";
 echo "<td>";
 html_print_extended_select_for_time ('period', $period, '', '', '0', 10);
 echo "<td>";
-html_print_submit_button(__('Refresh path'), 'refresh', false, 'class = "sub upd"');
+html_print_submit_button(__('Refresh path'), 'refresh', false, 'class = "sub upd" style="margin-top:0px"');
 echo "</table></form>";
 
 echo "<h4>" . __("Positional data from the last") . " " . human_time_description_raw ($period) ."</h4>";
diff --git a/pandora_console/operation/agentes/graphs.php b/pandora_console/operation/agentes/graphs.php
index a42704673f..e6363786d5 100644
--- a/pandora_console/operation/agentes/graphs.php
+++ b/pandora_console/operation/agentes/graphs.php
@@ -107,10 +107,11 @@ if (empty($modules)) {
 
 $table = null;
 $table->width = '100%';
+$table->class = 'databox filters';
 
-$table->style[0] = 'font-weight: bolder; text-align: right;';
+$table->style[0] = 'font-weight: bolder; text-align: left;';
 $table->style[1] = '';
-$table->style[2] = 'font-weight: bolder; text-align: right;';
+$table->style[2] = 'font-weight: bolder; text-align: left;';
 
 $table->rowspan[0][0] = 6;
 $table->rowspan[0][1] = 6;
@@ -154,7 +155,9 @@ $htmlForm = '<form method="post" action="index.php?sec=estado&sec2=operation/age
 $htmlForm .= html_print_table($table, true);
 $htmlForm .= html_print_input_hidden('filter', 1, true);
 $htmlForm .= '<div class="action-buttons" style="width: '.$table->width.'">';
-$htmlForm .= html_print_submit_button (__('Filter'), 'filter_button', false, 'class="sub upd"', true);
+$htmlForm .= html_print_button(__('Save as custom graph'), 'save_custom_graph',
+		false, 'save_custom_graph();', 'class="sub add" style="margin-top:10px"',true) . '&nbsp;&nbsp;' .
+		 html_print_submit_button (__('Filter'), 'filter_button', false, 'class="sub upd" style="margin-top:10px"', true);
 $htmlForm .= '</div>';
 $htmlForm .= '</form>';
 
@@ -170,9 +173,7 @@ else
 
 if ($combined) {
 	
-	echo "<div style='width: 555px;'><strong style='font-size:9pt;'>" . __('Combined graph') . '</strong>&nbsp;&nbsp;';
-	html_print_button(__('Save as custom graph'), 'save_custom_graph',
-		false, 'save_custom_graph();', 'class="sub add" style="margin:0px"');
+	echo "<div style='width: 555px;'><strong style='font-size:9pt;'>" . __('Combined graph') . '</strong>';
 	echo "</div>";
 	
 	custom_graphs_print(0,
diff --git a/pandora_console/operation/agentes/group_view.php b/pandora_console/operation/agentes/group_view.php
index 31a59fdc67..3a5b8bd20a 100644
--- a/pandora_console/operation/agentes/group_view.php
+++ b/pandora_console/operation/agentes/group_view.php
@@ -90,12 +90,12 @@ foreach ($result_groups as $data) {
 	$monitor_critical += $data["_monitors_critical_"];
 	$monitor_unknown += $data["_monitors_unknown_"];
 }
-$total = $monitor_ok + $monitor_warning + $monitor_critical;
-//$total_ok = format_numeric (($total_agentes / $monitor_ok / 100), 1);
+$total = $monitor_ok + $monitor_warning + $monitor_critical+$monitor_unknown;
 $total_ok = format_numeric (($monitor_ok*100)/$total,0);
 $total_warning = format_numeric (($monitor_warning*100)/$total,0);
 $total_critical = format_numeric (($monitor_critical*100)/$total,0);
 $total_unknown = format_numeric (($monitor_unknown*100)/$total,0);
+
 echo '<table cellpadding="0" cellspacing="0" border="0" width="100%" class="databox">';
 	echo "<tr>";
 		echo "<th style='text-align: center;'>" . __("Summary of the status groups") . "</th>";
@@ -110,8 +110,6 @@ echo '<table cellpadding="0" cellspacing="0" border="0" width="100%" class="data
 	echo "</tr>";
 echo "</table>";
 
-
-
 ui_pagination($count);
 
 if (!empty($result_groups)) {
@@ -126,15 +124,15 @@ if (!empty($result_groups)) {
 		echo "<tr>";
 			echo "<th style='width: 26px;'>" . __("Force") . "</th>";
 			echo "<th width='30%' style='min-width: 60px;'>" . __("Group") . "</th>";
-			echo "<th width='10%' style='min-width: 60px;'>" . __("Total") . "</th>";
-			echo "<th width='10%' style='min-width: 60px;'>" . __("Unknown") . "</th>";
-			echo "<th width='10%' style='min-width: 60px;'>" . __("Not init") . "</th>";
-			echo "<th width='10%' style='min-width: 60px;'>" . __("Unknown") . "</th>";
-			echo "<th width='10%' style='min-width: 60px;'>" . __("Not Init") . "</th>";
-			echo "<th width='10%' style='min-width: 60px;'>" . __("Normal") . "</th>";
-			echo "<th width='10%' style='min-width: 60px;'>" . __("Warning") . "</th>";
-			echo "<th width='10%' style='min-width: 60px;'>" . __("Critical") . "</th>";
-			echo "<th width='10%' style='min-width: 60px;'>" . __("Alert fired") . "</th>";
+			echo "<th width='10%' style='min-width: 60px;text-align:center;'>" . __("Total") . "</th>";
+			echo "<th width='10%' style='min-width: 60px;text-align:center;'>" . __("Unknown") . "</th>";
+			echo "<th width='10%' style='min-width: 60px;text-align:center;'>" . __("Not init") . "</th>";
+			echo "<th width='10%' style='min-width: 60px;text-align:center;'>" . __("Unknown") . "</th>";
+			echo "<th width='10%' style='min-width: 60px;text-align:center;'>" . __("Not Init") . "</th>";
+			echo "<th width='10%' style='min-width: 60px;text-align:center;'>" . __("Normal") . "</th>";
+			echo "<th width='10%' style='min-width: 60px;text-align:center;'>" . __("Warning") . "</th>";
+			echo "<th width='10%' style='min-width: 60px;text-align:center;'>" . __("Critical") . "</th>";
+			echo "<th width='10%' style='min-width: 60px;text-align:center;'>" . __("Alert fired") . "</th>";
 		echo "</tr>";
 		foreach ($result_groups as $data) {
 			
@@ -331,7 +329,6 @@ if (!empty($result_groups)) {
 		}
 	echo '</table>';
 } else {
-	echo "<div class='nf'>" . __('There are no defined agents') .
-		"</div>";
+	ui_print_info_message ( __('There are no defined agents'));
 }
 ?>
\ No newline at end of file
diff --git a/pandora_console/operation/agentes/networkmap.php b/pandora_console/operation/agentes/networkmap.php
index 3cc7512e0c..6e83586e14 100644
--- a/pandora_console/operation/agentes/networkmap.php
+++ b/pandora_console/operation/agentes/networkmap.php
@@ -420,8 +420,6 @@ if ($delete_networkmap || $add_networkmap || $save_networkmap) {
 
 // CONFIGURATION FORM
 
-echo "<br>";
-
 // Layout selection
 $layout_array = array (
 	'circular' => 'circular',
@@ -450,6 +448,12 @@ $form_elems[] = __('Store group') . '&nbsp;' .
 $form_elems[] = __('Group') . '&nbsp;' .
 	html_print_select_groups(false, 'AR', false, 'group', $group, '', 'All', 0, true);
 
+// Free text
+if ($activeTab != 'radial_dynamic') {
+	$form_elems[] = __('Free text for search (*):') . '&nbsp;' .
+		html_print_input_text('text_filter', $text_filter, '', 25, 100, true);
+}
+
 // Module group
 if ($activeTab == 'groups' || $activeTab == 'policies' || $activeTab == 'radial_dynamic') {
 	$form_elems[] = __('Module group') . '&nbsp;' .
@@ -458,12 +462,6 @@ if ($activeTab == 'groups' || $activeTab == 'policies' || $activeTab == 'radial_
 			FROM tmodule_group', 'module_group', $module_group, '', 'All', 0, true);
 }
 
-// Interfaces
-if ($activeTab == 'topology') {
-	$form_elems[] = __('Show interfaces') . '&nbsp;' .
-		html_print_checkbox ('show_snmp_modules', '1', $show_snmp_modules, true);
-}
-
 // Layout
 if ($activeTab != 'dinamic' && $activeTab != 'radial_dynamic') {
 	$form_elems[] = __('Layout') . '&nbsp;' .
@@ -480,6 +478,12 @@ if ($activeTab == 'groups') {
 		html_print_select ($depth_levels, 'depth', $depth, '', '', '', true, false, false);
 }
 
+// Interfaces
+if ($activeTab == 'topology') {
+	$form_elems[] = __('Show interfaces') . '&nbsp;' .
+		html_print_checkbox ('show_snmp_modules', '1', $show_snmp_modules, true);
+}
+
 // No overlap
 if ($activeTab != 'dinamic' && $activeTab != 'radial_dynamic') {
 	$form_elems[] = __('No Overlap') . '&nbsp;' .
@@ -534,12 +538,6 @@ if ($activeTab != 'dinamic' && $activeTab != 'radial_dynamic') {
 		html_print_input_text ('font_size', $font_size, $alt = 'Font size (in pt)', 2, 4, true);
 }
 
-// Free text
-if ($activeTab != 'radial_dynamic') {
-	$form_elems[] = __('Free text for search (*):') . '&nbsp;' .
-		html_print_input_text('text_filter', $text_filter, '', 30, 100, true);
-}
-
 // Don't show subgroups
 if (($activeTab == 'groups') || ($activeTab == 'topology')) {
 	$form_elems[] = __('Don\'t show subgroups:') .
@@ -561,11 +559,11 @@ if ($nooverlap == 1) {
 }
 
 unset($table);
-$table->width = '98%';
-$table->class = 'databox';
+$table->width = '100%';
+$table->class = 'databox filters';
 $table->data = array();
 
-$max_col = 5;
+$max_col = 4;
 $col = 0;
 $row = 0;
 
@@ -574,7 +572,7 @@ foreach ($form_elems as $key => $element) {
 		$col = 0;
 		$row++;
 	}
-	
+	$table->size[] = "25%";
 	$table->data[$row][$col] = $element;
 	$col++;
 }
diff --git a/pandora_console/operation/agentes/networkmap_list.php b/pandora_console/operation/agentes/networkmap_list.php
index 585440ec7c..4c50677c32 100644
--- a/pandora_console/operation/agentes/networkmap_list.php
+++ b/pandora_console/operation/agentes/networkmap_list.php
@@ -110,9 +110,9 @@ $type_search = get_parameter('type_filter', '0');
 
 ?>
 <form method="post" action="index.php?sec=network&amp;sec2=operation/agentes/networkmap_list">
-	<table style='width: 100%' class='databox'>
+	<table style='width: 100%' class='databox filters'>
 		<tr>
-			<td class='datos' >
+			<td class='datos' style="font-weight:bold;">
 				<?php echo __('Group'); ?>
 			</td>
 			<td class='datos'>
@@ -121,7 +121,7 @@ $type_search = get_parameter('type_filter', '0');
 					true, 'group_search', $group_search);
 				?>
 			</td>
-			<td class='datos'>
+			<td class='datos' style="font-weight:bold;">
 				<?php echo __('Type'); ?>
 			</td>
 			<td class='datos'>
@@ -144,14 +144,15 @@ $type_search = get_parameter('type_filter', '0');
 
 // Display table
 $table = new StdClass();
-$table->width = "98%";
+$table->width = "100%";
+$table->class = "databox data";
 
 $table->style = array();
 $table->style[0] = '';
-$table->style[1] = 'text-align: center;';
-$table->style[2] = 'text-align: center;';
-$table->style[3] = 'text-align: center;';
-$table->style[4] = 'text-align: center;';
+$table->style[1] = 'text-align: left;';
+$table->style[2] = 'text-align: left;';
+$table->style[3] = 'text-align: left;';
+$table->style[4] = 'text-align: left;';
 
 $table->size = array();
 $table->size[0] = '80%';
@@ -192,8 +193,7 @@ $user_info = users_get_user_by_id($config['id_user']);
 $network_maps = db_get_all_rows_filter('tnetwork_map', $where);
 
 if ($network_maps === false) {
-	echo "<div class='warn'>" . __('Not networkmap defined.') .
-		"</div>";
+	ui_print_info_message ( array('no_close'=>true, 'message'=> __('Not networkmap defined.') ) );
 }
 else {
 	$table->data = array();
@@ -237,9 +237,11 @@ else {
 if ($networkmaps_write || $networkmaps_manage) {
 	$table_manage = new StdClass();
 	$table_manage->width = "100%";
+	$table_manage->class = "databox filters";
 	$table_manage->style = array();
 	$table_manage->style[0] = 'font-weight: bold';
-	$table_manage->style[3] = 'text-align: right';
+	$table_manage->style[2] = 'font-weight: bold';
+	$table_manage->style[4] = 'text-align: right';
 	$table_manage->size = array();
 	$table_manage->head = array();
 	$table_manage->data = array();
@@ -256,6 +258,7 @@ if ($networkmaps_write || $networkmaps_manage) {
 	$row = array();
 	$row[] = __('Action');
 	$row[] = html_print_select($actions, 'action', 'create', '', '', 0, true, false, false);
+	$row[] = __('Type');
 	$row[] = html_print_select($networkmap_types, 'tab', 'topology', '', '', 0, true)
 		. html_print_select($delete_options, 'delete_options', 'selected', '', '', 0, true, false, false);
 	$row[] = html_print_submit_button (__('Execute'), 'crt', false, 'class="sub next"', true)
diff --git a/pandora_console/operation/agentes/status_monitor.php b/pandora_console/operation/agentes/status_monitor.php
index 006d4d00ae..b549b82361 100644
--- a/pandora_console/operation/agentes/status_monitor.php
+++ b/pandora_console/operation/agentes/status_monitor.php
@@ -453,14 +453,9 @@ $rows_select[0] = __('Not assigned');
 
 $table->data[0][5] = html_print_select($rows_select, 'modulegroup', $modulegroup, '', __('All'),-1,true, false, true, '', false, 'width: 120px;');
 
-
-if(defined('METACONSOLE')){
-	
-	$table->rowspan[0][6] = 2;
-	$table->data[0][6] = html_print_submit_button (__('Show'), "uptbutton",
-							false, 'class="sub search" style="margin-top:0px;"',true);
-
-}
+$table->rowspan[0][6] = 2;
+$table->data[0][6] = html_print_submit_button (__('Show'), "uptbutton",
+						false, 'class="sub search" style="margin-top:0px;"',true);
 
 $table->data[1][0] = __('Module name');
 
@@ -496,11 +491,6 @@ else {
 		$tag_filter, '', __('All'), '', true, false, true, '', false, 'width: 150px;');
 }
 
-
-if(!defined('METACONSOLE')){
-	$table->data[1][6] = html_print_submit_button (__('Show'), "uptbutton", false, 'class="sub search"',true);
-}
-
 $table_custom_fields = new stdClass();
 $table_custom_fields->class = 'filters';
 $table_custom_fields->width = '100%';
@@ -1239,7 +1229,27 @@ foreach ($result as $row) {
 		$row['min_critical'], $row['str_critical']);
 	
 	if (is_numeric($row["datos"])) {
-		$salida = format_numeric($row["datos"]);
+		if ( $config["render_proc"] ){
+				switch($row["module_type"]) {
+					case 2:
+					case 6:
+					case 9:
+					case 18:
+					case 21:
+					case 31:
+						
+						if ( $row["datos"] >= 1 ) 
+							$salida ='OK';
+						else
+							$salida = 'FAIL';
+						break;
+					default:	
+						$salida = format_numeric($row["datos"]);
+						break;
+				}
+		}else{
+			$salida = format_numeric($row["datos"]);
+		}
 		
 		// Show units ONLY in numeric data types
 		if (isset($row["unit"])) {
@@ -1343,7 +1353,7 @@ if (!empty ($table->data)) {
 	html_print_table ($table);
 }
 else {
-	echo "<div class='nf'>".__('This group doesn\'t have any monitor')."</div>";
+	ui_print_info_message ( array ( 'no_close' => true, 'message' => __('This group doesn\'t have any monitor') ) );
 }
 
 echo "<div id='monitor_details_window'></div>";
diff --git a/pandora_console/operation/menu.php b/pandora_console/operation/menu.php
index 690763c49d..b226078b86 100644
--- a/pandora_console/operation/menu.php
+++ b/pandora_console/operation/menu.php
@@ -139,11 +139,13 @@ if (check_acl ($config['id_user'], 0, "AR")) {
 	$sub["godmode/reporting/map_builder"]["type"] = "direct";
 	$sub["godmode/reporting/map_builder"]["subtype"] = "nolink";
 	$layouts = db_get_all_rows_in_table ('tlayout', 'name');
+	$sub2 = array ();
+	$sub2["godmode/reporting/map_builder"]["text"] = __("List of visual console");
 	if ($layouts === false) {
 		$layouts = array ();
 	}
 	else{
-		$sub2 = array ();
+		
 		$id = (int) get_parameter ('id', -1);
 		
 		$firstLetterNameVisualToShow = array('_', ',', '[', '(');
@@ -159,10 +161,10 @@ if (check_acl ($config['id_user'], 0, "AR")) {
 			else {
 				$firstLetter = $name[0];
 			}
-			/*
+			
 			if (!in_array($firstLetter, $firstLetterNameVisualToShow)) {
 				continue;
-			}*/
+			}
 			$sub2["operation/visual_console/render_view&amp;id=".$layout["id"]]["text"] = mb_substr ($name, 0, 19);
 			$sub2["operation/visual_console/render_view&amp;id=".$layout["id"]]["title"] = $name;
 			if (!empty($config['vc_refr'])) {
@@ -186,7 +188,7 @@ if (check_acl ($config['id_user'], 0, "AR")) {
 			$sub["gismaps"]["type"] = "direct";
 			$sub["gismaps"]["subtype"] = "nolink";
 			$sub2 = array ();
-			
+			$sub2["operation/gis_maps/index"]["text"] = __("List of Gis maps");
 			$gisMaps = db_get_all_rows_in_table ('tgis_map', 'map_name');
 			if ($gisMaps === false) {
 				$gisMaps = array ();
@@ -322,11 +324,11 @@ $sub["operation/users/webchat"]["refr"] = 0;
 if (check_acl ($config['id_user'], 0, "IR") == 1) {
 	$temp_sec2 = $sec2; 
 	if($config['integria_enabled']) {
-		$sec2 = "operation/integria_incidents/incident";
+		$sec2 = "incident";
 		$sec2sub = "operation/integria_incidents/incident_statistics";
 	}
 	else {
-		$sec2 = "operation/incidents/incident";
+		$sec2 = "incident";
 		$sec2sub = "operation/incidents/incident_statistics";
 	}
 	
@@ -339,6 +341,7 @@ if (check_acl ($config['id_user'], 0, "IR") == 1) {
 		"operation/integria_incidents");
 	
 	$sub2 = array ();
+	$sub2['operation/incidents/incident']["text"] = _("List of Incidents");
 	$sub2[$sec2sub]["text"] = __('Statistics');
 	
 	$sub[$sec2]["sub2"] = $sub2;
@@ -347,14 +350,15 @@ if (check_acl ($config['id_user'], 0, "IR") == 1) {
 
 
 // Messages
-$sub["operation/messages/message_list"]["text"] = __('Messages');
-$sub["operation/messages/message_list"]["refr"] = 0;
-$sub["operation/messages/message_list"]["type"] = "direct";
-$sub["operation/messages/message_list"]["subtype"] = "nolink";
+$sub["message_list"]["text"] = __('Messages');
+$sub["message_list"]["refr"] = 0;
+$sub["message_list"]["type"] = "direct";
+$sub["message_list"]["subtype"] = "nolink";
 $sub2 = array ();
+$sub2["operation/messages/message_list"]["text"] = __('Messages List');
 $sub2["operation/messages/message_edit&amp;new_msg=1"]["text"] = __('New message');
 
-$sub["operation/messages/message_list"]["sub2"] = $sub2;
+$sub["message_list"]["sub2"] = $sub2;
 
 $menu_operation["workspace"]["sub"] = $sub;
 
diff --git a/pandora_console/operation/netflow/nf_live_view.php b/pandora_console/operation/netflow/nf_live_view.php
index afc2774745..9f4cdff273 100644
--- a/pandora_console/operation/netflow/nf_live_view.php
+++ b/pandora_console/operation/netflow/nf_live_view.php
@@ -181,7 +181,7 @@ enterprise_hook('open_meta_frame');
 if (defined ('METACONSOLE')){
 	$class = "databox data";
 }else{
-	$class = "databox";
+	$class = "databox filters";
 }
 
 echo '<form method="post" action="' . $config['homeurl'] . 'index.php?sec=netf&sec2=operation/netflow/nf_live_view&pure='.$pure.'">';
@@ -332,7 +332,7 @@ echo '<form method="post" action="' . $config['homeurl'] . 'index.php?sec=netf&s
 		echo "<td></td>";
 	}
 	else {
-		echo "<td>" . __('Dst Ip'). ui_print_help_tip (__("Destination IP. A comma separated list of destination ip. If we leave the field blank, will show all ip. Example filter by ip:<br>25.46.157.214,160.253.135.249"), true) . "</td>";
+		echo "<td style='font-weight:bold;'>" . __('Dst Ip'). ui_print_help_tip (__("Destination IP. A comma separated list of destination ip. If we leave the field blank, will show all ip. Example filter by ip:<br>25.46.157.214,160.253.135.249"), true) . "</td>";
 		echo "<td colspan='2'>" . html_print_input_text ('ip_dst', $filter['ip_dst'], false, 30, 80, true) . "</td>";
 	}
 	
@@ -341,7 +341,7 @@ echo '<form method="post" action="' . $config['homeurl'] . 'index.php?sec=netf&s
 		echo "<td></td>";
 	}
 	else {
-		echo "<td>" . __('Src Ip'). ui_print_help_tip (__("Source IP. A comma separated list of source ip. If we leave the field blank, will show all ip. Example filter by ip:<br>25.46.157.214,160.253.135.249"), true) . "</td>";
+		echo "<td style='font-weight:bold;'>" . __('Src Ip'). ui_print_help_tip (__("Source IP. A comma separated list of source ip. If we leave the field blank, will show all ip. Example filter by ip:<br>25.46.157.214,160.253.135.249"), true) . "</td>";
 		echo "<td colspan='2'>" . html_print_input_text ('ip_src', $filter['ip_src'], false, 30, 80, true) . "</td>";
 	}
 	
@@ -353,7 +353,7 @@ echo '<form method="post" action="' . $config['homeurl'] . 'index.php?sec=netf&s
 		echo "<td></td>";
 	}
 	else {
-		echo "<td>" . __('Dst Port'). ui_print_help_tip (__("Destination port. A comma separated list of destination ports. If we leave the field blank, will show all ports. Example filter by ports 80 and 22:<br>80,22"), true) . "</td>";
+		echo "<td style='font-weight:bold;'>" . __('Dst Port'). ui_print_help_tip (__("Destination port. A comma separated list of destination ports. If we leave the field blank, will show all ports. Example filter by ports 80 and 22:<br>80,22"), true) . "</td>";
 		echo "<td colspan='2'>" . html_print_input_text ('dst_port', $filter['dst_port'], false, 30, 80, true) . "</td>";
 	}
 	
@@ -362,7 +362,7 @@ echo '<form method="post" action="' . $config['homeurl'] . 'index.php?sec=netf&s
 		echo "<td></td>";
 	}
 	else {
-		echo "<td>" . __('Src Port'). ui_print_help_tip (__("Source port. A comma separated list of source ports. If we leave the field blank, will show all ports. Example filter by ports 80 and 22:<br>80,22"), true) . "</td>";
+		echo "<td style='font-weight:bold;'>" . __('Src Port'). ui_print_help_tip (__("Source port. A comma separated list of source ports. If we leave the field blank, will show all ports. Example filter by ports 80 and 22:<br>80,22"), true) . "</td>";
 		echo "<td colspan='2'>" . html_print_input_text ('src_port', $filter['src_port'], false, 30, 80, true) . "</td>";
 	}
 	
@@ -393,26 +393,21 @@ echo '<form method="post" action="' . $config['homeurl'] . 'index.php?sec=netf&s
 	
 	echo "</table>";
 	
-	echo "<br />";
+	//echo "<br />";
 	
-	if (defined ('METACONSOLE')) {
-		echo "<table class='' width='100%' style='border: 0px; text-align:right;'><tr><td>";
-	}
-	
-	
-	html_print_submit_button (__('Draw'), 'draw_button', false, 'class="sub upd"');
+	echo "<table class='' width='100%' style='border: 0px; text-align:right;'><tr><td>";
+
+	echo html_print_submit_button (__('Draw'), 'draw_button', false, 'class="sub upd"',true) . "&nbsp;&nbsp;" ;
 	
 	if (!$netflow_disable_custom_lvfilters) {
 		if (check_acl ($config["id_user"], 0, "AW")) {
 			html_print_submit_button (__('Save as new filter'), 'save_button', false, 'class="sub upd" onClick="return defineFilterName();"');
-			
 			html_print_submit_button (__('Update current filter'), 'update_button', false, 'class="sub upd"');
 		}
 	}
 	
-	if (defined ('METACONSOLE')) {
-		echo "</td></tr></table>";
-	}
+	echo "</td></tr></table>";
+
 echo'</form>';
 
 if ($draw != '') {
diff --git a/pandora_console/operation/snmpconsole/snmp_mib_uploader.php b/pandora_console/operation/snmpconsole/snmp_mib_uploader.php
index bf565a93a5..f4ab411c68 100644
--- a/pandora_console/operation/snmpconsole/snmp_mib_uploader.php
+++ b/pandora_console/operation/snmpconsole/snmp_mib_uploader.php
@@ -65,7 +65,7 @@ $real_directory = realpath ($config['homedir'] . '/' . $directory);
 
 ui_print_info_message(__("MIB files will be installed on the system. Please note that a MIB may depend on other MIB. To customize trap definitions use the SNMP trap editor."));
 
-echo '<h4>' . __('Index of %s', $directory) . '</h4>';
+//echo '<h4>' . __('Index of %s', $directory) . '</h4>';
 
 filemanager_file_explorer($real_directory,
 	$directory,
diff --git a/pandora_console/operation/snmpconsole/snmp_statistics.php b/pandora_console/operation/snmpconsole/snmp_statistics.php
index ad7b63bfff..179318315c 100755
--- a/pandora_console/operation/snmpconsole/snmp_statistics.php
+++ b/pandora_console/operation/snmpconsole/snmp_statistics.php
@@ -113,7 +113,7 @@ $traps_generated_by_oid = db_get_all_rows_sql($sql_traps_generated_by_oid);
 
 // No traps 
 if (empty($traps_generated_by_source) || empty($traps_generated_by_oid)) {
-	echo '<div class="nf">'.__('There are no SNMP traps in database').'</div>';
+	ui_print_info_message ( array('no_close'=>true, 'message'=> __('There are no SNMP traps in database') ) );
 	return;
 }
 
@@ -123,6 +123,7 @@ $water_mark = array('file' => $config['homedir'] .  "/images/logo_vertical_water
 // By SOURCE
 $table_source = new StdClass();
 $table_source->width = '100%';
+$table_source->class = 'databox data';
 $table_source->head[] = __("Traps received by source") . " - " . sprintf(__('Top %d'), 25);
 $table_source->head_colspan[] = 2;
 $table_source->headstyle[] = "background-color: #82b92e";
diff --git a/pandora_console/operation/snmpconsole/snmp_view.php b/pandora_console/operation/snmpconsole/snmp_view.php
index 4c092c177f..5c54a5ae07 100755
--- a/pandora_console/operation/snmpconsole/snmp_view.php
+++ b/pandora_console/operation/snmpconsole/snmp_view.php
@@ -295,7 +295,10 @@ switch ($config["dbtype"]) {
 $sql_all = sprintf($sql_all, $whereSubquery);
 $sql_count = sprintf($sql_count, $whereSubquery);
 
-$table->width = '90%';
+$table->width = '100%';
+$table->cellpadding = 0;
+$table->cellspacing = 0;
+$table->class = 'databox filters';
 $table->size = array ();
 $table->size[0] = '120px';
 $table->data = array ();
@@ -364,8 +367,7 @@ $trapcount = (int) db_get_value_sql($sql_count);
 
 // No traps 
 if (empty ($traps)) {
-	echo '<div class="nf">' .
-		__('There are no SNMP traps in database') . '</div>';
+	ui_print_info_message ( array('no_close'=>true, 'message'=> __('There are no SNMP traps in database') ) );
 	return;
 }
 
@@ -394,10 +396,10 @@ ui_pagination ($trapcount, $urlPagination, $offset, $pagination);
 
 echo '<form name="eventtable" method="POST" action="' . $url_snmp . '">';
 
-$table->cellpadding = 4;
-$table->cellspacing = 4;
-$table->width = '99%';
-$table->class = "databox";
+$table->cellpadding = 0;
+$table->cellspacing = 0;
+$table->width = '100%';
+$table->class = "databox data";
 $table->head = array ();
 $table->size = array ();
 $table->data = array ();
diff --git a/pandora_console/operation/tree.php b/pandora_console/operation/tree.php
index 1488e3c388..ee8fe5b622 100755
--- a/pandora_console/operation/tree.php
+++ b/pandora_console/operation/tree.php
@@ -123,7 +123,8 @@ $table->width = "100%";
 $table->class='databox filters';
 $table->data = array();
 $table->rowspan = array();
-
+$table->style[0] = 'font-weight: bold;';
+$table->style[2] = 'font-weight: bold;';
 // Agent filter
 $agent_status_arr = array();
 $agent_status_arr[AGENT_STATUS_ALL] = __('All'); //default
@@ -183,7 +184,7 @@ if (defined('METACONSOLE')) {
 	ui_toggle($form_html, __('Show Options'));
 	echo "<br>";
 }else{
-	echo "<br>";
+	//echo "<br>";
 	ui_toggle($form_html, __('Tree search'));
 }
 
diff --git a/pandora_console/operation/users/webchat.php b/pandora_console/operation/users/webchat.php
index ddb1c82dc8..62dc70158f 100644
--- a/pandora_console/operation/users/webchat.php
+++ b/pandora_console/operation/users/webchat.php
@@ -72,7 +72,7 @@ ui_print_page_header (__('Webchat'), "images/comments.png", false, "", false, ""
 
 $table = null;
 
-$table->width = '95%';
+$table->width = '100%';
 $table->style[0][1] = 'text-align: right; vertical-align: top;';
 
 $table->data[0][0] = '<div id="chat_box" style="width: 95%;