diff --git a/pandora_console/godmode/alerts/alert_templates.php b/pandora_console/godmode/alerts/alert_templates.php
index 352f9d5408..9720837178 100644
--- a/pandora_console/godmode/alerts/alert_templates.php
+++ b/pandora_console/godmode/alerts/alert_templates.php
@@ -232,8 +232,11 @@ $search_type = (string) get_parameter ('search_type');
 
 $table->width = '98%';
 if (defined("METACONSOLE")){
-	$table->width = '50%';	
-	$table->class = 'databox_filters';	
+	$table->width = '96%';	
+	$table->class = 'databox_filters';
+	$table->cellspacing = 0;
+	$table->cellpadding = 0;
+	
 }
 $table->data = array ();
 $table->head = array ();
diff --git a/pandora_console/godmode/reporting/reporting_builder.list_items.php b/pandora_console/godmode/reporting/reporting_builder.list_items.php
index 27c3547b6e..249813dbb9 100644
--- a/pandora_console/godmode/reporting/reporting_builder.list_items.php
+++ b/pandora_console/godmode/reporting/reporting_builder.list_items.php
@@ -148,36 +148,49 @@ if (!defined("METACONSOLE"))
 			array("title" => __('Toggle filter(s)'),
 			"id" => 'image_form_filter')) . '</a>';
 
-$table = null;
-$table->width = '100%';
-$table->data[0][0] = __('Agents');
-$table->data[0][1] = html_print_select($agents, 'agent_filter', $agentFilter, '', __('All'), 0, true);
-$table->data[0][2] = __('Modules');
-$table->data[0][3] = html_print_select($modules, 'module_filter', $moduleFilter, '', __('All'), 0, true);
-$table->data[1][0] = __('Type');
-$table->data[1][1] = html_print_select($types, 'type_filter', $typeFilter, '', __('All'), 0, true);
-$table->data[1][2] = $table->data[1][3] = '';
-
 if (!defined("METACONSOLE")){
-	echo '<div id="form_filter" style="display: none;">';
-	echo '<form method="post" action ="index.php?sec=reporting&sec2=godmode/reporting/reporting_builder&tab=list_items&action=filter&id_report=' . $idReport . '">';
+	$table = null;
+	$table->width = '100%';
+	$table->data[0][0] = __('Agents');
+	$table->data[0][1] = html_print_select($agents, 'agent_filter', $agentFilter, '', __('All'), 0, true);
+	$table->data[0][2] = __('Modules');
+	$table->data[0][3] = html_print_select($modules, 'module_filter', $moduleFilter, '', __('All'), 0, true);
+	$table->data[1][0] = __('Type');
+	$table->data[1][1] = html_print_select($types, 'type_filter', $typeFilter, '', __('All'), 0, true);
+	$table->data[1][2] = $table->data[1][3] = '';
 	
-	html_print_table ($table);
-	echo '<div class="action-buttons" style="width: '.$table->width.'">';
-	html_print_submit_button(__('Filter'), 'filter', false, 'class="sub upd"');
-	html_print_input_hidden('action', 'filter');
-	echo '</div>';
-	echo '</form>';
+	echo '<div id="form_filter" style="display: none;">';
+		echo '<form method="post" action ="index.php?sec=reporting&sec2=godmode/reporting/reporting_builder&tab=list_items&action=filter&id_report=' . $idReport . '">';
+			html_print_table ($table);
+			echo '<div class="action-buttons" style="width: '.$table->width.'">';
+				html_print_submit_button(__('Filter'), 'filter', false, 'class="sub upd"');
+				html_print_input_hidden('action', 'filter');
+			echo '</div>';
+		echo '</form>';
 	echo '</div>';
 }
 else{
+	$table = null;
+	$table->width = '96%';
 	$table->class = "databox_filters";
-	$table->width = '70%';
-	echo '<form class="filters_form" method="post" action ="index.php?sec=reporting&sec2=godmode/reporting/reporting_builder&tab=
+	$table->cellpadding = 0;
+	$table->cellspacing = 0;
+	$table->data[0][0] = __('Agents');
+	$table->data[0][1] = html_print_select($agents, 'agent_filter', $agentFilter, '', __('All'), 0, true);
+	$table->data[0][2] = __('Modules');
+	$table->data[0][3] = html_print_select($modules, 'module_filter', $moduleFilter, '', __('All'), 0, true);
+	$table->data[0][4] = __('Type');
+	$table->data[0][5] = html_print_select($types, 'type_filter', $typeFilter, '', __('All'), 0, true);
+	$table->style[6] = "text-align:right;";
+	$table->data[0][6] = html_print_submit_button(__('Filter'), 'filter', false, 'class="sub upd"',true) . 
+							html_print_input_hidden('action', 'filter',true);
+	
+	$filters = '<form class="filters_form" method="post" action ="index.php?sec=reporting&sec2=godmode/reporting/reporting_builder&tab=
 				list_items&action=filter&id_report=' . $idReport . '">';
-	$table->data[1][4] = html_print_submit_button(__('Filter'), 'filter', false, 'class="sub upd"',true) . html_print_input_hidden('action', 'filter',true);
-	html_print_table ($table);
-	echo '</form>';
+	
+	$filters .= html_print_table ($table,true);
+	$filters .= '</form>';
+	ui_toggle($filters, __("Show Options"));
 }
 
 $where = '1=1';
diff --git a/pandora_console/godmode/reporting/reporting_builder.php b/pandora_console/godmode/reporting/reporting_builder.php
index f4b9447c72..b2ac06d7b6 100644
--- a/pandora_console/godmode/reporting/reporting_builder.php
+++ b/pandora_console/godmode/reporting/reporting_builder.php
@@ -51,8 +51,6 @@ $idItem = get_parameter('id_item', 0);
 $pure = get_parameter('pure',0);
 $schedule_report = get_parameter('schbutton', '');
 
-$strict_user = db_get_value('strict_acl', 'tusuario', 'id_user', $config['id_user']);
-
 if ($schedule_report != '') {
 	
 	$id_user_task = 1;
@@ -372,12 +370,14 @@ switch ($action) {
 		$table_aux->width = '99%';
 		if(defined('METACONSOLE')){
 			$table_aux->class = 'databox_filters';
-			$table_aux->width = '70%';
+			$table_aux->width = '96%';
+			$table_aux->cellpadding = 0;
+			$table_aux->cellspacing = 0;
 		}
 		$table_aux->colspan[0][0] = 4;
 		$table_aux->data[0][0] = "<b>". __("Group") . "</b>";
 		
-		$table_aux->data[0][1] = html_print_select_groups(false, "AR", true, 'id_group', $id_group, '', '', '', true, false, true, '', false, 'width:150px', false, false, 'id_grupo', $strict_user);
+		$table_aux->data[0][1] = html_print_select_groups(false, "AR", true, 'id_group', $id_group, '', '', '', true, false, true, '', false, 'width:150px');
 		
 		$table_aux->data[0][2] = "<b>". __("Free text for search: ") . "</b>";
 		$table_aux->data[0][3] = html_print_input_text ("search", $search, '', 30, '', true);
@@ -385,15 +385,19 @@ switch ($action) {
 		$table_aux->data[0][6] = html_print_submit_button(__('Search'), 'search_submit', false, 'class="sub upd"', true);
 		
 		if(defined('METACONSOLE')){
-			echo "<form class ='filters_form' action='index.php?sec=reporting&sec2=godmode/reporting/reporting_builder&id_group=$id_group&pure=$pure'
+			$filter = "<form class ='filters_form' action='index.php?sec=reporting&sec2=godmode/reporting/reporting_builder&id_group=$id_group&pure=$pure'
 				method='post'>";
+			$filter .= html_print_table($table_aux,true);
+			$filter .= "</form>";
+			ui_toggle($filter, __("Show Option"));
 		}
 		else{
 			echo "<form action='index.php?sec=reporting&sec2=godmode/reporting/reporting_builder&id_group=$id_group&pure=$pure'
 				method='post'>";
-		}
 			html_print_table($table_aux);
-		echo "</form>";
+			echo "</form>";
+		}
+			
 		
 		ui_require_jquery_file ('pandora.controls');
 		ui_require_jquery_file ('ajaxqueue');
@@ -452,7 +456,6 @@ switch ($action) {
 			$table->id = 'report_list';
 			$table->width = '98%';
 			if(defined('METACONSOLE')){
-				echo "<br>";
 				$table->width = '100%';
 			}
 			$table->head = array ();
@@ -534,8 +537,7 @@ switch ($action) {
 				if (enterprise_hook ('load_custom_reporting_2') !== ENTERPRISE_NOT_HOOK) {
 					$next = 7;
 				}
-				
-				
+
 				//Admin options only for RM flag
 				if (check_acl ($config['id_user'], 0, "RM")) {
 					
diff --git a/pandora_console/godmode/reporting/visual_console_builder.elements.php b/pandora_console/godmode/reporting/visual_console_builder.elements.php
index e47ecf217f..0c1fc9b95c 100755
--- a/pandora_console/godmode/reporting/visual_console_builder.elements.php
+++ b/pandora_console/godmode/reporting/visual_console_builder.elements.php
@@ -51,7 +51,8 @@ if (!defined('METACONSOLE')) {
 	$table->width = '100%';
 }
 else {
-	$table->width = '780';
+	$table->width = '100%';
+	$table->class = 'databox';
 }
 $table->head = array();
 $table->head['icon'] = '';
@@ -69,15 +70,16 @@ $table->head[5] .= '<span title="' . __('Action') . '">' .
 $table->size = array();
 $table->size['icon'] = '1%';
 $table->size[0] = '25%';
-
 $table->align = array();
-$table->align[0] = "left";
-$table->align[1] = "right";
-$table->align[2] = "center";
-$table->align[3] = "center";
-$table->align[4] = "right";
-$table->align[5] = "center";
 
+if (!defined('METACONSOLE')) {
+	$table->align[0] = "left";
+	$table->align[1] = "right";
+	$table->align[2] = "center";
+	$table->align[3] = "center";
+	$table->align[4] = "right";
+	$table->align[5] = "center";
+}
 $table->data = array();
 
 //Background
@@ -454,21 +456,23 @@ if (!defined('METACONSOLE')) {
 else {
 	echo "<form method='post' action='index.php?operation=edit_visualmap&sec=screen&sec2=screens/screens&action=visualmap&pure=0&tab=list_elements&id_visual_console=" . $idVisualConsole . "'>";
 }
-echo '<div class="action-buttons" style="width: ' . $table->width . '">';
+if (!defined('METACONSOLE')) 
+	echo '<div class="action-buttons" style="width: ' . $table->width . '">';
 if (!defined('METACONSOLE')) {
 	html_print_input_hidden ('action', 'update');
 }
 else {
 	html_print_input_hidden ('action2', 'update');
 }
+if (!defined('METACONSOLE')) {
+	echo "<br>";
 
-echo "<br>";
-
-html_print_input_hidden ('id_visual_console', $visualConsole["id"]);
-html_print_submit_button (__('Update'), 'go', false, 'class="sub next"');
-echo "&nbsp;";
-html_print_button(__('Delete'), 'delete', false, 'submit_delete_multiple_items();', 'class="sub delete"');
-echo '</div>';
+	html_print_input_hidden ('id_visual_console', $visualConsole["id"]);
+	html_print_submit_button (__('Update'), 'go', false, 'class="sub next"');
+	echo "&nbsp;";
+	html_print_button(__('Delete'), 'delete', false, 'submit_delete_multiple_items();', 'class="sub delete"');
+	echo '</div>';
+}
 html_print_table($table);
 
 echo '<div class="action-buttons" style="width: ' . $table->width . '">';
diff --git a/pandora_console/godmode/reporting/visual_console_builder.wizard.php b/pandora_console/godmode/reporting/visual_console_builder.wizard.php
index a8fcdf67dd..0487f70d27 100644
--- a/pandora_console/godmode/reporting/visual_console_builder.wizard.php
+++ b/pandora_console/godmode/reporting/visual_console_builder.wizard.php
@@ -28,23 +28,31 @@ require_once ($config['homedir'] . '/include/functions_visual_map.php');
 require_once($config['homedir'] . "/include/functions_agents.php");
 
 $table->id = 'wizard_table';
+$table->head = array ();
 if (!defined('METACONSOLE')) {
 	$metaconsole_hack = '';
 	$table->width = '98%';
 }
 else {
 	$metaconsole_hack = '../../';
-	$table->width = '600';
-	
+	$table->width = '100%';
+	$table->class = 'databox data';
+	$table->styleTable = 'padding-top: 15px; margin-top:0px';
 	require_once($config['homedir'] .
 		"/enterprise/meta/include/functions_html_meta.php");
 }
 
 $table->style = array ();
-$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';
-
+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->size = array ();
 $table->size[0] = "20%";
 $table->size[1] = "20%";
@@ -248,6 +256,10 @@ else {
 		onsubmit="if (! confirm(\''.__('Are you sure to add many elements\nin visual map?').'\')) return false; else return check_fields();">';
 }
 
+if(defined("METACONSOLE")){
+	echo "<div class='title_tactical' style='margin-top: 15px; '>" . __('Wizard') . "</div>";
+}
+
 html_print_table ($table);
 
 echo '<div class="action-buttons" style="width: '.$table->width.'">';
@@ -285,7 +297,7 @@ $(document).ready (function () {
 	$("#process_value").change(function () {
 		selected = $("#process_value").val();
 		
-		if (selected == <?php echo PROCESS_VALUE_NONE;?>) {
+		if (selected == <?php echo PROCESS_VALUE_NONE; ?>) {
 			$("tr", "#wizard_table").filter(function () {return /^.*modulegraph_simplevalue.*/.test(this.id); }).hide();
 		}
 		else {
@@ -480,4 +492,4 @@ function metaconsole_init() {
 		color: red;
 		text-decoration: line-through;
 	}
-</style>
\ No newline at end of file
+</style>
diff --git a/pandora_console/godmode/users/user_list.php b/pandora_console/godmode/users/user_list.php
index 5df7d43f61..262b0ae008 100644
--- a/pandora_console/godmode/users/user_list.php
+++ b/pandora_console/godmode/users/user_list.php
@@ -281,10 +281,12 @@ $table->head[3] = __('Admin');
 $table->head[4] = __('Profile');
 $table->head[5] = __('Description');
 $table->head[6] = '<span title="Operations">' . __('Op.') . '</span>';
+if (!defined('METACONSOLE')) {
+	$table->align[2] = "right";
+	$table->size[2] = '150px';
+}
 
-$table->align[2] = "right";
 $table->align[3] = "center";
-$table->size[2] = '150px';
 
 if (defined('METACONSOLE')) {
 	$table->size[6] = '110px';
@@ -292,15 +294,15 @@ if (defined('METACONSOLE')) {
 else {
 	$table->size[6] = '85px';
 }
-
-$table->valign[0] = 'top';
-$table->valign[1] = 'top';
-$table->valign[2] = 'top';
-$table->valign[3] = 'top';
-$table->valign[4] = 'top';
-$table->valign[5] = 'top';
-$table->valign[6] = 'top';
-
+if (!defined('METACONSOLE')) {
+	$table->valign[0] = 'top';
+	$table->valign[1] = 'top';
+	$table->valign[2] = 'top';
+	$table->valign[3] = 'top';
+	$table->valign[4] = 'top';
+	$table->valign[5] = 'top';
+	$table->valign[6] = 'top';
+}
 
 
 $info1 = array ();
@@ -428,18 +430,34 @@ foreach ($info as $user_id => $user_info) {
 	$data[4] = "";
 	$result = db_get_all_rows_field_filter ("tusuario_perfil", "id_usuario", $user_id);
 	if ($result !== false) {
-		$data[4] .= "<table width='100%'>";
-		foreach ($result as $row) {
-			$data[4] .= "<tr>";
-			$data[4] .= "<td>";
-			$data[4] .= profile_get_name ($row["id_perfil"]);
-			$data[4] .= "</td>";
-			$data[4] .= "<td align='right'>";
-			$data[4] .= groups_get_name ($row["id_grupo"], true);
-			$data[4] .= "</td>";
-			$data[4] .= "</tr>";
+		if (defined("METACONSOLE")){
+			$data[4] .= "<div width='100%'>";
+			foreach ($result as $row) {
+				$data[4] .= "<div style='float:left;'>";
+				$data[4] .= profile_get_name ($row["id_perfil"]);
+				$data[4] .= "</div>";
+				$data[4] .= "<div style='float:right; padding-right:10px;'>";
+				$data[4] .= groups_get_name ($row["id_grupo"], true);
+				$data[4] .= "</div>";
+				$data[4] .= "<br />";
+				$data[4] .= "<br />";
+			}
+			$data[4] .= "</div>";
+		}
+		else{
+			$data[4] .= "<table width='100%'>";
+			foreach ($result as $row) {
+				$data[4] .= "<tr>";
+				$data[4] .= "<td>";
+				$data[4] .= profile_get_name ($row["id_perfil"]);
+				$data[4] .= "</td>";
+				$data[4] .= "<td align='right'>";
+				$data[4] .= groups_get_name ($row["id_grupo"], true);
+				$data[4] .= "</td>";
+				$data[4] .= "</tr>";
+			}
+			$data[4] .= "</table>";
 		}
-		$data[4] .= "</table>";
 	}
 	else {
 		$data[4] .= __('The user doesn\'t have any assigned profile/group');
diff --git a/pandora_console/include/functions_reporting.php b/pandora_console/include/functions_reporting.php
index a73774e7e6..87e923df9c 100644
--- a/pandora_console/include/functions_reporting.php
+++ b/pandora_console/include/functions_reporting.php
@@ -1523,6 +1523,7 @@ function reporting_get_stats_modules_status($data, $graph_width = 250, $graph_he
 	}
 	else{
 		$table_mbs->class = "tactical_view";
+		$table_mbs->style=array();
 		$output = '
 			<fieldset class="tactical_set">
 				<legend>' . 
@@ -8279,21 +8280,47 @@ function reporting_get_events ($data, $links = false) {
 	global $config;
 	
 	$table_events->width = "100%";
-	
-	$table_events->data[0][0] = html_print_image('images/module_critical.png', true, array('title' => __('Critical events')));
-	$table_events->data[0][0] .= "&nbsp;&nbsp;&nbsp;" .
-		"<a style='color: #FC4444;' href='" . $links['critical'] . "'><b><span style='font-size: 12pt; font-weight: bold; color: #FC4444;'>".format_numeric($data['critical'])."</span></b></a>";
-	
-	$table_events->data[0][1] = html_print_image('images/module_warning.png', true, array('title' => __('Warning events')));
-	$table_events->data[0][1] .= "&nbsp;&nbsp;&nbsp;" .
-		"<a style='color: #FAD403;' href='" . $links['warning'] . "'><b><span style='font-size: 12pt; font-weight: bold; color: #FAD403;'>".format_numeric($data['warning'])."</span></b></a>";
-	$table_events->data[0][2] = html_print_image('images/module_ok.png', true, array('title' => __('OK events')));
-	$table_events->data[0][2] .= "&nbsp;&nbsp;&nbsp;" .
-		"<a style='color: #80BA27;' href='" . $links['normal'] . "'><b><span style='font-size: 12pt; font-weight: bold; color: #80BA27;'>".format_numeric($data['normal'])."</span></b></a>";
-	$table_events->data[0][3] = html_print_image('images/module_unknown.png', true, array('title' => __('Unknown events')));
-	$table_events->data[0][3] .= "&nbsp;&nbsp;&nbsp;" .
-		"<a style='color: #B2B2B2;' href='" . $links['unknown'] . "'><b><span style='font-size: 12pt; font-weight: bold; color: #B2B2B2;'>".format_numeric($data['unknown'])."</span></b></a>";
-	
+	if (defined('METACONSOLE'))
+		$style = " vertical-align:middle;";
+	else
+		$style = "";
+	if (defined('METACONSOLE')){
+		$table_events->style[0] = "background-color:#FC4444";
+		$table_events->data[0][0] = html_print_image('images/module_event_critical.png', true, array('title' => __('Critical events')));
+		$table_events->data[0][0] .= "&nbsp;&nbsp;&nbsp;" .
+			"<a style='color:#FFF; font-size: 12pt; font-weight: bold;" . $style . "' href='" . $links['critical'] . "'>" . format_numeric($data['critical'])."</a>";
+		$table_events->style[1] = "background-color:#FAD403";
+		$table_events->data[0][1] = html_print_image('images/module_event_warning.png', true, array('title' => __('Warning events')));
+		$table_events->data[0][1] .= "&nbsp;&nbsp;&nbsp;" .
+			"<a style='color:#FFF; font-size: 12pt; font-weight: bold;" . $style . "' href='" . $links['warning'] . "'>" . format_numeric($data['warning'])."</a>";
+		$table_events->style[2] = "background-color:#80BA27";
+		$table_events->data[0][2] = html_print_image('images/module_event_ok.png', true, array('title' => __('OK events')));
+		$table_events->data[0][2] .= "&nbsp;&nbsp;&nbsp;" .
+			"<a style='color:#FFF; font-size: 12pt; font-weight: bold;" . $style . "' href='" . $links['normal'] . "'>" . format_numeric($data['normal'])."</a>";
+		$table_events->style[3] = "background-color:#B2B2B2";
+		$table_events->data[0][3] = html_print_image('images/module_event_unknown.png', true, array('title' => __('Unknown events')));
+		$table_events->data[0][3] .= "&nbsp;&nbsp;&nbsp;" .
+			"<a style='color:#FFF; font-size: 12pt; font-weight: bold;" . $style . "' href='" . $links['unknown'] . "'>" . format_numeric($data['unknown'])."</a>";
+		}
+	else{
+		$table_events->data[0][0] = html_print_image('images/module_critical.png', true, array('title' => __('Critical events')));
+		$table_events->data[0][0] .= "&nbsp;&nbsp;&nbsp;" .
+			"<a style='color: #FC4444;" . $style . "' href='" . $links['critical'] . "'><b><span style='font-size: 12pt; font-weight: bold; color: #FC4444;'>".
+						format_numeric($data['critical'])."</span></b></a>";
+		$table_events->data[0][1] = html_print_image('images/module_warning.png', true, array('title' => __('Warning events')));
+		$table_events->data[0][1] .= "&nbsp;&nbsp;&nbsp;" .
+			"<a style='color: #FAD403;" . $style . "' href='" . $links['warning'] . "'><b><span style='font-size: 12pt; font-weight: bold; color: #FAD403;'>".
+						format_numeric($data['warning'])."</span></b></a>";
+		$table_events->data[0][2] = html_print_image('images/module_ok.png', true, array('title' => __('OK events')));
+		$table_events->data[0][2] .= "&nbsp;&nbsp;&nbsp;" .
+			"<a style='color: #80BA27;" . $style . "' href='" . $links['normal'] . "'><b style='font-size: 12pt; font-weight: bold; color: #80BA27;'>".
+						format_numeric($data['normal'])."</b></a>";
+		$table_events->data[0][3] = html_print_image('images/module_unknown.png', true, array('title' => __('Unknown events')));
+		$table_events->data[0][3] .= "&nbsp;&nbsp;&nbsp;" .
+			"<a style='color: #B2B2B2;" . $style . "' href='" . $links['unknown'] . "'><b><span style='font-size: 12pt; font-weight: bold; color: #B2B2B2;'>".
+						format_numeric($data['unknown'])."</span></b></a>";
+
+	}
 	if (!defined('METACONSOLE')) {
 		$event_view = '<fieldset class="databox tactical_set">
 					<legend>' . 
@@ -8303,6 +8330,11 @@ function reporting_get_events ($data, $links = false) {
 	}
 	else{
 		$table_events->class="tactical_view";
+		$table_events->size[0]="10%";
+		$table_events->size[1]="10%";
+		$table_events->size[2]="10%";
+		$table_events->size[3]="10%";
+		
 		$event_view = '<fieldset class="tactical_set">
 					<legend>' . 
 						__('Events by criticity') . 
diff --git a/pandora_console/include/functions_users.php b/pandora_console/include/functions_users.php
index aa90631a56..c89725af90 100644
--- a/pandora_console/include/functions_users.php
+++ b/pandora_console/include/functions_users.php
@@ -31,8 +31,8 @@ function users_is_strict_acl($id_user = null) {
 	$strict_acl = (bool)db_get_value('strict_acl', 'tusuario',
 		'id_user', $id_user);
 	
-	html_debug_print($strict_acl, true);
-	html_debug_print($id_user, true);
+	//html_debug_print($strict_acl, true);
+	//html_debug_print($id_user, true);
 	
 	return $strict_acl;
 }
diff --git a/pandora_console/operation/agentes/alerts_status.functions.php b/pandora_console/operation/agentes/alerts_status.functions.php
index fb59cffaf3..073fe6a39f 100755
--- a/pandora_console/operation/agentes/alerts_status.functions.php
+++ b/pandora_console/operation/agentes/alerts_status.functions.php
@@ -42,10 +42,19 @@ function printFormFilterAlert($id_group, $filter, $free_search, $url, $filter_st
 	$table->width = '100%';
 	if(defined('METACONSOLE')){
 		$table->class = 'databox_filters';
-		$table->width = '60%';
+		$table->width = '96%';
+		$table->cellpadding = '0';
+		$table->cellspacing = '0';
 	}
 	$table->data = array ();
 	$table->style = array ();
+	if(defined('METACONSOLE')){
+		$table->style[0] = 'vertical-align:middle; font-weight: bold;';
+		$table->style[1] = 'vertical-align:middle; font-weight: bold;';
+		$table->style[2] = 'vertical-align:middle; font-weight: bold;';
+		$table->style[3] = 'vertical-align:middle; font-weight: bold;';
+		$table->style[4] = 'vertical-align:middle; font-weight: bold;';
+	}
 	
 	$table->data[0][0] = __('Group');
 	$table->data[0][1] = html_print_select_groups($config['id_user'], "AR", true, "ag_group", $id_group, '', '', '', true, false, false, '', false, '', false, false, 'id_grupo', $strict_user);
@@ -85,8 +94,8 @@ function printFormFilterAlert($id_group, $filter, $free_search, $url, $filter_st
 	$table->data[1][3] = html_print_select ($alert_standby, "filter_standby", $filter_standby, '', '', '', true);
 	
 	if(defined('METACONSOLE')){
-		$table->data[1][4] = html_print_submit_button(__('Filter'), 'filter_button', false, 'class="sub filter"', true);
-		$table->rowspan[1][4] = 2;
+		$table->data[0][7] = html_print_submit_button(__('Filter'), 'filter_button', false, 'class="sub filter"', true);
+		$table->rowspan[0][7] = 2;
 	    $data = '<form style="background-color: #ECECEC;" method="post" action="'.$url.'">';
 	}
 	else{
diff --git a/pandora_console/operation/agentes/alerts_status.php b/pandora_console/operation/agentes/alerts_status.php
index 313ebd7dd4..200e82e9f3 100755
--- a/pandora_console/operation/agentes/alerts_status.php
+++ b/pandora_console/operation/agentes/alerts_status.php
@@ -374,7 +374,7 @@ if ($pure) {
 // Filter form
 if ($print_agent) {
 	if(defined('METACONSOLE')){
-		echo printFormFilterAlert($id_group, $filter, $free_search, $url, $filter_standby, $tag_filter, true, $strict_user);
+		ui_toggle(printFormFilterAlert($id_group, $filter, $free_search, $url, $filter_standby, $tag_filter, true, $strict_user),__('Show Options'));;
 	}
 	else{
 		echo '<br>';
diff --git a/pandora_console/operation/agentes/status_monitor.php b/pandora_console/operation/agentes/status_monitor.php
index 332bc1b663..ef659adc24 100644
--- a/pandora_console/operation/agentes/status_monitor.php
+++ b/pandora_console/operation/agentes/status_monitor.php
@@ -90,16 +90,24 @@ if ($id_module) {
 }
 
 enterprise_hook('open_meta_frame');
+
 if (!defined('METACONSOLE')){
-	echo '<form method="post" action="index.php?sec=estado&amp;sec2=operation/agentes/status_monitor&amp;refr=' . $refr . '&amp;ag_group=' . 
+	$filters = '<form method="post" action="index.php?sec=estado&amp;sec2=operation/agentes/status_monitor&amp;refr=' . $refr . '&amp;ag_group=' . 
 			$ag_group . '&amp;ag_freestring=' . $ag_freestring . '&amp;ag_modulename=' . $ag_modulename . '&amp;status=' . $status . '&amp;sort_field=' . 
 				$sortField . '&amp;sort=' . $sort .'&amp;pure=' . $config['pure'] . $ag_custom_fields_params . '">';
-	echo '<table cellspacing="4" cellpadding="4" width="100%" class="databox"><tr>';
+	//echo '<table cellspacing="4" cellpadding="4" width="100%" class="databox"><tr>';
+	$table->width = "100%";
+	$table->cellspacing = 4;
+	$table->cellpadding = 4;
 }else{
-	echo '<form class="filters_form" method="post" action="index.php?sec=estado&amp;sec2=operation/agentes/status_monitor&amp;refr=' . $refr . '&amp;ag_group=' . 
+	$filters = '<form class="filters_form" method="post" action="index.php?sec=estado&amp;sec2=operation/agentes/status_monitor&amp;refr=' . $refr . '&amp;ag_group=' . 
 			$ag_group . '&amp;ag_freestring=' . $ag_freestring . '&amp;ag_modulename=' . $ag_modulename . '&amp;status=' . $status . '&amp;sort_field=' . 
 				$sortField . '&amp;sort=' . $sort .'&amp;pure=' . $config['pure'] . $ag_custom_fields_params . '">';
-	echo '<table cellspacing="" cellpadding="" width="70%" class="databox_filters"><tr>';
+	//echo '<table cellspacing="0" cellpadding="0" width="96%" class="databox_filters"><tr>';
+	$table->width = "96%";
+	$table->cellspacing = 0;
+	$table->cellpadding = 0;
+	$table->class = "databox_filters";
 }
 
 // Get Groups and profiles from user
@@ -393,19 +401,29 @@ if (defined('METACONSOLE')) {
 	if ($key_group_all !== false)
 		unset($groups_select[$key_group_all]);
 }
+if(defined("METACONSOLE")){
+	$table->style[0] = 'vertical-align:middle; font-weight: bold;';
+	$table->style[1] = 'vertical-align:middle; font-weight: bold;';
+	$table->style[2] = 'vertical-align:middle; font-weight: bold;';
+	$table->style[3] = 'vertical-align:middle; font-weight: bold;';
+	$table->style[4] = 'vertical-align:middle; font-weight: bold;';
+}
+else{
+	$table->style[0] = 'vertical-align:middle;';
+	$table->style[1] = 'vertical-align:middle;';
+	$table->style[2] = 'vertical-align:middle;';
+	$table->style[3] = 'vertical-align:middle;';
+	$table->style[4] = 'vertical-align:middle;';
+}
+$table->data[0][0] = __('Group');
 
-echo '
-<td valign="middle">' . __('Group') . '</td>
-<td valign="middle">' . 
-	html_print_select_groups($config['id_user'], "AR", true, "ag_group",
-		$ag_group, '',  '', '0', true, false, false, 'w130',
-		false, 'width:150px;', false, false,
-		'id_grupo', $strict_user) . '
-</td>';
+$table->data[0][1] = html_print_select_groups($config['id_user'], "AR", true, "ag_group",
+			$ag_group, '',  '', '0', true, false, false, 'w130',
+			false, 'width:150px;', false, false,
+			'id_grupo', $strict_user);
 
-echo '<td>' . __('Monitor status') . "</td>";
+$table->data[0][2] = __('Monitor status');
 
-echo "<td>";
 
 $fields = array ();
 $fields[AGENT_MODULE_STATUS_NORMAL] = __('Normal'); 
@@ -415,14 +433,11 @@ $fields[AGENT_MODULE_STATUS_UNKNOWN] = __('Unknown');
 $fields[AGENT_MODULE_STATUS_NOT_NORMAL] = __('Not normal'); //default
 $fields[AGENT_MODULE_STATUS_NOT_INIT] = __('Not init');
 
-html_print_select ($fields, "status", $status, '', __('All'), -1,
-	false, false, true, '', false, 'width: 150px;');
-echo '</td>';
+$table->data[0][3] = html_print_select ($fields, "status", $status, '', __('All'), -1,
+	true, false, true, '', false, 'width: 150px;');
 
+$table->data[0][4] = __('Module group');
 
-
-echo '<td valign="middle">' . __('Module group') . '</td>';
-echo '<td valign="middle">';
 if (!defined('METACONSOLE')) {
 	$rows = db_get_all_rows_sql("SELECT *
 		FROM tmodule_group ORDER BY name");
@@ -435,79 +450,71 @@ if (!defined('METACONSOLE')) {
 
 $rows_select[0] = __('Not assigned');
 
-html_print_select($rows_select, 'modulegroup', $modulegroup, '', __('All'),-1,false, false, true, '', false, 'width: 120px;');
-echo '</td>';
+$table->data[0][5] = html_print_select($rows_select, 'modulegroup', $modulegroup, '', __('All'),-1,true, false, true, '', false, 'width: 120px;');
 
-echo '</tr>';
 
-echo '<tr>';
+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);
 
-echo '<td valign="middle">' . __('Module name') . '</td>';
-echo '<td valign="middle">';
+}
+
+$table->data[1][0] = __('Module name');
 
 if (!defined('METACONSOLE'))
 	$modules = db_get_all_rows_sql($sql);
 
-html_print_select (index_array ($modules, 'nombre', 'nombre'), "ag_modulename",
-	$ag_modulename, '', __('All'), '', false, false, true, '', false, 'width: 150px;');
-
-echo '</td>';
+$table->data[1][1] = html_print_select (index_array ($modules, 'nombre', 'nombre'), "ag_modulename",
+	$ag_modulename, '', __('All'), '', true, false, true, '', false, 'width: 150px;');
 
 if (!defined('METACONSOLE'))
-	echo '<td valign="middle" align="right">' .
-		__('Search') .
-		'</td>';
+	$table->data[1][2] = __('Search');
 else
-	echo '<td valign="middle">' .
-		__('Search') .
-		'</td>';
+	$table->data[1][2] = __('Search');
 
-echo '<td valign="middle">';
-html_print_input_text ("ag_freestring", $ag_freestring, '', 20,30, false);
-echo '</td>';
+
+$table->data[1][3] = html_print_input_text ("ag_freestring", $ag_freestring, '', 20,30, true);
 
 if (!defined('METACONSOLE'))
-	echo '<td valign="middle" align="right" id="tag_td">' .
-		__('Tags') .
+	$table->data[1][4] = __('Tags') .
 		ui_print_help_tip(__('Only it is show tags in use.'), true);
 else
-	echo '<td valign="middle" id="tag_td">' .
-		__('Tags') .
+	$table->data[1][4] = __('Tags') .
 		ui_print_help_tip(__('Only it is show tags in use.'), true);
-echo '<td>';
 
 $tags = tags_get_user_tags();
 
 if (empty($tags)) {
-	echo __('No tags');
+	$table->data[1][5] = __('No tags');
 }
 else {
 	
-	html_print_select ($tags, "tag_filter",
-		$tag_filter, '', __('All'), '', false, false, true, '', false, 'width: 150px;');
+	$table->data[1][5] = html_print_select ($tags, "tag_filter",
+		$tag_filter, '', __('All'), '', true, false, true, '', false, 'width: 150px;');
 }
-echo '</td>';
 
-echo '<td valign="middle">';
-html_print_submit_button (__('Show'), "uptbutton", false, 'class="sub search"');
-echo "</td>";
 
-echo "</tr>";
-echo "<tr>";
+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 = 'databox';
 $table_custom_fields->width = '99%';
 if(defined('METACONSOLE')){
 		$table_custom_fields->width = '100%';
-		$table_custom_fields->class = 'databox_filters';
-		$table_custom_fields->styleTable = 'margin-left:0px';
+		$table_custom_fields->class = 'filters';
+		$table_custom_fields->styleTable = 'margin-left:0px; margin-top:15px;';
 		$table_custom_fields->cellpadding = '0';
 		$table_custom_fields->cellspacing = '0';
 }
 $table_custom_fields->style = array();
 if(!defined('METACONSOLE'))
 	$table_custom_fields->style[0] = 'font-weight: bold; width: 150px;';
+else
+	$table_custom_fields->style[0] = 'font-weight: bold;';
 $table_custom_fields->colspan = array();
 $table_custom_fields->data = array();
 
@@ -530,17 +537,23 @@ foreach ($custom_fields as $custom_field) {
 	$table_custom_fields->data[] = $row;
 }
 
-echo '<td valign="middle" colspan=7>';
-if(defined('METACONSOLE'))
-	echo html_print_table($table_custom_fields, true);
-else
-	ui_toggle(html_print_table($table_custom_fields, true), __('Agent custom fields'));
-echo "</td>";
-
-echo "<tr>";
-
-echo "</table>";
-echo "</form>";
+if(defined('METACONSOLE')){
+	$table->colspan[2][0] = 7;
+	$table->data[2][0] = ui_toggle(html_print_table($table_custom_fields, true), __('Advanced Options'),'',true,true);
+	
+	$filters .= html_print_table($table, true);
+	$filters .= "</form>";
+	ui_toggle($filters, __('Show Options'));
+}
+else{
+	$table->colspan[2][0] = 7;
+	$table->data[2][0] = ui_toggle(html_print_table($table_custom_fields, true), __('Agent custom fields'),'',true,true);
+	
+	$filters .= html_print_table($table, true);
+	$filters .= "</form>";
+	echo $filters;
+}
+unset($table);
 
 // Sort functionality
 
diff --git a/pandora_console/operation/events/events.build_table.php b/pandora_console/operation/events/events.build_table.php
index 9276f496a2..30e93121f3 100644
--- a/pandora_console/operation/events/events.build_table.php
+++ b/pandora_console/operation/events/events.build_table.php
@@ -656,7 +656,8 @@ if (!empty ($table->data)) {
 	echo '</div>';
 	
 	if ($allow_action) {
-		echo '<div style="width: 98%;" class="action-buttons">';
+		
+		echo '<div style="width:' . $table->width . ';" class="action-buttons">';
 		if (!$readonly && tags_check_acl ($config["id_user"], 0, "EW", $event['clean_tags']) == 1) {
 			html_print_button(__('Validate selected'), 'validate_button', false, 'validate_selected();', 'class="sub ok"');
 			// Fix: validated_selected JS function has to be included with the proper user ACLs 
diff --git a/pandora_console/operation/events/events_list.php b/pandora_console/operation/events/events_list.php
index 89b994d243..34e4bd396a 100644
--- a/pandora_console/operation/events/events_list.php
+++ b/pandora_console/operation/events/events_list.php
@@ -36,6 +36,12 @@ if (! check_acl ($config["id_user"], 0, "ER")) {
 	return;
 }
 
+if(defined('METACONSOLE')){
+	$jump = '&nbsp;&nbsp;';
+}
+else{
+	$jump = "<br>";
+}
 if (is_ajax()) {
 	$get_filter_values = get_parameter('get_filter_values', 0);
 	$save_event_filter = get_parameter('save_event_filter', 0);
@@ -195,14 +201,16 @@ if (check_acl ($config["id_user"], 0, "EW") || check_acl ($config["id_user"], 0,
 	$table->width = '98%';
 	$table->cellspacing = 4;
 	$table->cellpadding = 4;
+	$table->class = 'databox';
 	if(defined('METACONSOLE')){
 		$table->width = '100%';
+		$table->class = 'databox data';
 		$table->cellspacing = 0;
 		$table->cellpadding = 0;
 	}
-	$table->class = 'databox';
 	$table->styleTable = 'font-weight: bold; color: #555; text-align:left;';
-	$table->style[0] = 'width: 50%; width:50%;';
+	if(!defined("METACONSOLE"))
+		$table->style[0] = 'width: 50%; width:50%;';
 	
 	$data = array();
 	$table->rowid[0] = 'update_save_selector';
@@ -213,9 +221,9 @@ if (check_acl ($config["id_user"], 0, "EW") || check_acl ($config["id_user"], 0,
 	
 	$data = array();
 	$table->rowid[1] = 'save_filter_row1';
-	$data[0] = __('Filter name') . '<br>';
+	$data[0] = __('Filter name') . $jump;
 	$data[0] .= html_print_input_text ('id_name', '', '', 15, 255, true);
-	$data[1] = __('Filter group') . '<br>';
+	$data[1] = __('Filter group') . $jump;
 	# Fix : Only admin users can see group ALL
 	$data[1] .= html_print_select_groups($config["id_user"], "ER", users_can_manage_group_all(), 'id_group', $id_group, '', '', 0, true, false, false, 'w130');
 	$table->data[] = $data;
@@ -225,13 +233,14 @@ if (check_acl ($config["id_user"], 0, "EW") || check_acl ($config["id_user"], 0,
 	$table->rowid[2] = 'save_filter_row2';
 	$data[0] = html_print_submit_button (__('Save filter'), 'save_filter', false, 'class="sub upd"', true);
 	$table->colspan[2][0] = 2;
-	$table->cellstyle[2][0] = 'text-align:right;';
+	if(!defined("METACONSOLE"))
+		$table->cellstyle[2][0] = 'text-align:right;';
 	$table->data[] = $data;
 	$table->rowclass[] = '';
 	
 	$data = array();
 	$table->rowid[3] = 'update_filter_row1';
-	$data[0] = __("Overwrite filter") . '<br>';
+	$data[0] = __("Overwrite filter") . $jump;
 	# Fix  : Only admin user can see filters of group ALL for update
 	$_filters_update = events_get_event_filter_select(false);
 	
@@ -252,18 +261,20 @@ $table->id = 'load_filter_form';
 $table->width = '98%';
 $table->cellspacing = 4;
 $table->cellpadding = 4;
+$table->class = 'databox';
 if(defined('METACONSOLE')){
 	$table->width = '100%';
-	$table->cellspacing = 4;
-	$table->cellpadding = 4;
+	$table->cellspacing = 0;
+	$table->cellpadding = 0;
+	$table->class = 'databox data';
 }
-$table->class = 'databox';
-$table->styleTable = 'font-weight: bold; color: #555; text-align:left;';
-$table->style[0] = 'width: 50%; width:50%;';
 
+$table->styleTable = 'font-weight: bold; color: #555; text-align:left;';
+if(!defined("METACONSOLE"))
+	$table->style[0] = 'width: 50%; width:50%;';
 $data = array();
 $table->rowid[3] = 'update_filter_row1';
-$data[0] = __("Load filter") . '<br>';
+$data[0] = __("Load filter") . $jump;
 $data[0] .= html_print_select ($filters, "filter_id", '', '', __('None'), 0, true);
 $data[1] = html_print_submit_button (__('Load filter'), 'load_filter', false, 'class="sub upd"', true);
 $table->data[] = $data;
@@ -305,11 +316,15 @@ $tabletags_with->width = '100%';
 $tabletags_with->cellspacing = 4;
 $tabletags_with->cellpadding = 4;
 $tabletags_with->class = 'noshadow';
+$tabletags_with->styleTable = 'border: 0px;';
 if(defined('METACONSOLE')){
 	$tabletags_with->width = '100%';
 	$tabletags_with->class = 'nobady';
+	$tabletags_with->cellspacing = 0;
+	$tabletags_with->cellpadding = 0;
+	$tabletags_with->styleTable = 'border: 0px; margin-top:10px';
 }
-$tabletags_with->styleTable = 'border: 0px;';
+
 
 $data = array();
 $data[0] = html_print_select ($tags_select_with, 'select_with', '', '', '', 0,
@@ -332,6 +347,8 @@ $tabletags_without->class = 'noshadow';
 if(defined('METACONSOLE')){
 	$tabletags_without->width = '100%';
 	$tabletags_without->class = 'nobady';
+	$tabletags_without->cellspacing = 0;
+	$tabletags_without->cellpadding = 0;
 }
 $tabletags_without->styleTable = 'border: 0px;';
 
@@ -352,12 +369,10 @@ $tabletags_without->rowclass[] = '';
 // EVENTS FILTER
 // Table for filter controls
 if(defined('METACONSOLE')){
-	$jump = '&nbsp;&nbsp;';
 	$events_filter = '<form id="form_filter" class="filters_form" method="post" action="index.php?sec=eventos&amp;sec2=operation/events/events&amp;refr='. 
 		(int)get_parameter("refr", 0) .'&amp;pure='.$config["pure"].'&amp;section=' . $section . '&amp;history='.(int)$history.'">';
 }
 else{
-	$jump = "<br>";
 	$events_filter = '<form id="form_filter" method="post" action="index.php?sec=eventos&amp;sec2=operation/events/events&amp;refr='. 
 		(int)get_parameter("refr", 0) .'&amp;pure='.$config["pure"].'&amp;section=' . $section . '&amp;history='.(int)$history.'">';
 }
@@ -437,7 +452,7 @@ $table_advanced->rowclass[] = '';
 $data = array();
 $data[0] = __("Alert events") . $jump;
 $data[0] .= html_print_select (array('-1' => __('All'), '0' => __('Filter alert events'), '1' => __('Only alert events')), "filter_only_alert", $filter_only_alert, '', '', '', true);
-$data[1] = __('Block size for pagination') . '<br>';
+$data[1] = __('Block size for pagination') . $jump;
 $lpagination[25] = 25;
 $lpagination[50] = 50;
 $lpagination[100] = 100;
@@ -495,9 +510,6 @@ $table_advanced->rowclass[] = '';
 //- END ADVANCE FILTER -------------------------------------------------
 
 
-
-
-
 $table->id = 'events_filter_form';
 $table->width = '100%';
 $table->cellspacing = 4;
@@ -511,10 +523,10 @@ $table->styleTable = 'font-weight: bold; color: #555;';
 $table->data = array();
 
 $data = array();
-$data[0] = __('Group') . '<br>';
+$data[0] = __('Group') . $jump;
 
 $data[0] .= html_print_select_groups($config["id_user"], "ER", true, 
-	'id_group', $id_group, '', '', 0, true, false, false, 'w130', false, false, false, false, 'id_grupo', $strict_user). '<br>';
+	'id_group', $id_group, '', '', 0, true, false, false, 'w130', false, false, false, false, 'id_grupo', $strict_user). $jump;
 	
 //**********************************************************************
 // TODO
@@ -619,7 +631,7 @@ unset($table);
 $events_filter .= "</form>"; //This is the filter div
 
 if (defined('METACONSOLE'))
-	echo $events_filter;
+	ui_toggle($events_filter, __("Show Options"));
 else
 	ui_toggle($events_filter, __('Event control filter'), '', !$open_filter);
 
diff --git a/pandora_console/operation/netflow/nf_live_view.php b/pandora_console/operation/netflow/nf_live_view.php
index 6392da0dc3..894e226952 100644
--- a/pandora_console/operation/netflow/nf_live_view.php
+++ b/pandora_console/operation/netflow/nf_live_view.php
@@ -178,15 +178,22 @@ if (isset($config['netflow_disable_custom_lvfilters'])) {
 enterprise_hook('open_meta_frame');
 
 if (defined ('METACONSOLE')){
-	echo "<div class='title_tactical'>". __("Draw live filter")."</div>";
 	$class = "databox data";
 }else{
 	$class = "databox";
 }
 
 echo '<form method="post" action="' . $config['homeurl'] . 'index.php?sec=netf&sec2=operation/netflow/nf_live_view&pure='.$pure.'">';
-	echo "<table class='databox' width='100%'>";
-	
+	echo "<table class='".$class."' width='100%'>";
+	if (defined("METACONSOLE")){
+				echo "<thead>
+						<tr>
+							<th align=center colspan=6>
+								" . __('Draw live filter') . "
+							</th>
+						</tr>
+					</thead>";			
+	}
 	if (defined ('METACONSOLE')) {
 		$list_servers = array();
 		
@@ -382,7 +389,7 @@ echo '<form method="post" action="' . $config['homeurl'] . 'index.php?sec=netf&s
 	echo "<br />";
 	
 	if (defined ('METACONSOLE')) {
-		echo "<table class='' width='100%' style='border: 0px;'><tr><td>";
+		echo "<table class='' width='100%' style='border: 0px; text-align:right;'><tr><td>";
 	}
 	
 	
diff --git a/pandora_console/operation/tree.php b/pandora_console/operation/tree.php
index 30b8b3d984..5a55da0594 100755
--- a/pandora_console/operation/tree.php
+++ b/pandora_console/operation/tree.php
@@ -164,8 +164,11 @@ $row = array();
 $row[] = __('Agent status');
 $row[] = html_print_select($agent_status_arr, "status_agent", $status_agent, '', '', 0, true);
 $row[] = __('Search agent');
-$row[] = html_print_input_text("search_agent", $search_agent, '', 40, 30, true);
-
+if (defined('METACONSOLE'))
+	$row[] = html_print_input_text("search_agent", $search_agent, '', 70, 30, true);
+else
+	$row[] = html_print_input_text("search_agent", $search_agent, '', 40, 30, true);
+	
 // Button
 $row[] = html_print_submit_button(__('Filter'), "uptbutton", false, 'class="sub search"', true);
 $table->rowspan[][count($row)-1] = 2;
@@ -185,21 +188,27 @@ $row = array();
 $row[] = __('Module status');
 $row[] = html_print_select($module_status_arr, "status_module", $status_module, '', '', 0, true);
 $row[] = __('Search module');
-$row[] = html_print_input_text("search_module", $search_module, '', 40, 30, true);
+if (defined('METACONSOLE'))
+	$row[] = html_print_input_text("search_module", $search_module, '', 70, 30, true);
+else
+	$row[] = html_print_input_text("search_module", $search_module, '', 40, 30, true);
 
 $table->data[] = $row;
 
 if (defined('METACONSOLE')) {
-	$table->width = "70%";
-	$table->class='tree_filters';
-	echo "<div class='view_tree'>";
+	$table->width = "96%";
+	$table->cellpadding = "0";
+	$table->cellspacing = "0";
+	$table->class='databox_filters';
+	$table->styleTable='padding-top:0px';
 }
 if (!$strict_acl) {
 	$form_html = '<form id="tree_search" method="post" action="index.php?sec=monitoring&sec2=operation/tree&refr=0&tab='.$tab.'&pure='.$config['pure'].'">';
 	$form_html .= html_print_table($table, true);
 	$form_html .= '</form>';
 	if (defined('METACONSOLE')) {
-		echo $form_html;
+		echo "<div class='view_tree'>";
+		ui_toggle($form_html, __('Show Options'));
 		echo "<br>";
 	}else{
 		echo "<br>";
diff --git a/pandora_console/operation/users/user_edit.php b/pandora_console/operation/users/user_edit.php
index 6e951526ed..af6bfb7c19 100644
--- a/pandora_console/operation/users/user_edit.php
+++ b/pandora_console/operation/users/user_edit.php
@@ -178,13 +178,14 @@ if ($status != -1) {
 		__('User info successfully updated'),
 		__('Error updating user info'));
 }
-
+$jump = "<br />";
 $table->id = 'user_form';
 $table->width = '98%';
 $table->cellspacing = 4;
 $table->cellpadding = 4;
 $table->class = 'vertical_fields';
 if (defined('METACONSOLE')){
+	$jump = "&nbsp;&nbsp;";
 	$table->width = '100%';
 	$table->class = 'databox data';
 	$table->head[0] = __('Edit my User');
@@ -195,9 +196,9 @@ $table->style[2] = 'width: 175px;';
 
 $data = array();
 $data[0] = '<b>' . __('User ID') . '</b>';
-$data[0] .= '<br><br><span style="font-weight: normal;">' . $id . '</span>';
+$data[0] .= $jump . '<span style="font-weight: normal;">' . $id . '</span>';
 $data[1] = '<b>' . __('Full (display) name') . '</b>';
-$data[1] .= '<br>' . html_print_input_text_extended ("fullname", $user_info["fullname"], '', '', 40, 100, $view_mode, '', 'class="input"', true);
+$data[1] .= $jump . html_print_input_text_extended ("fullname", $user_info["fullname"], '', '', 40, 100, $view_mode, '', 'class="input"', true);
 // Show "Picture" (in future versions, why not, allow users to upload it's own avatar here.
 
 if (is_user_admin ($id)) {
@@ -219,9 +220,9 @@ $table->data[] = $data;
 
 $data = array();
 $data[0] = __('E-mail');
-$data[0] .= '<br>' . html_print_input_text_extended ("email", $user_info["email"], '', '', '40', '100', $view_mode, '', 'class="input"', true);
+$data[0] .= $jump . html_print_input_text_extended ("email", $user_info["email"], '', '', '40', '100', $view_mode, '', 'class="input"', true);
 $data[1] = __('Phone number');
-$data[1] .= '<br>' . html_print_input_text_extended ("phone", $user_info["phone"], '', '', '40', '30', $view_mode, '', 'class="input"', true);
+$data[1] .= $jump . html_print_input_text_extended ("phone", $user_info["phone"], '', '', '40', '30', $view_mode, '', 'class="input"', true);
 $table->rowclass[] = '';
 $table->rowstyle[] = 'font-weight: bold;';
 $table->data[] = $data;
@@ -230,9 +231,9 @@ if ($view_mode === false) {
 	if ($config["user_can_update_password"]) {
 		$data = array();
 		$data[0] = __('New Password');
-		$data[0] .= '<br>' . html_print_input_text_extended ("password_new", "", '', '', '40', '25', $view_mode, '', 'class="input"', true, true);
+		$data[0] .= $jump . html_print_input_text_extended ("password_new", "", '', '', '40', '25', $view_mode, '', 'class="input"', true, true);
 		$data[1] = __('Password confirmation');
-		$data[1] .= '<br>' . html_print_input_text_extended ("password_conf", "", '', '', '40', '25', $view_mode, '', 'class="input"', true, true);
+		$data[1] .= $jump . html_print_input_text_extended ("password_conf", "", '', '', '40', '25', $view_mode, '', 'class="input"', true, true);
 		$table->rowclass[] = '';
 		$table->rowstyle[] = 'font-weight: bold;';
 		$table->data[] = $data;
@@ -255,18 +256,18 @@ if ($user_info["block_size"] == 0) {
 else {
 	$block_size = $user_info["block_size"];
 }
-$data[0] .= '<br>' . html_print_input_text ('block_size', $block_size, '', 5, 5, true);
-$data[0] .= '<br>' . html_print_checkbox('default_block_size', 1, $user_info["block_size"] == 0, true);
+$data[0] .= $jump . html_print_input_text ('block_size', $block_size, '', 5, 5, true);
+$data[0] .= $jump . html_print_checkbox('default_block_size', 1, $user_info["block_size"] == 0, true);
 $data[0] .= __('Default').' ('.$config["global_block_size"].')';
 
 $values = array(-1 => __('Default'),1 => __('Yes'),0 => __('No'));
 
 $data[1] = __('Interactive charts') . ui_print_help_tip(__('Whether to use Javascript or static PNG graphs'), true);
-$data[1] .= '<br>' . html_print_select($values, 'flash_charts', $user_info["flash_chart"], '', '', -1, true, false, false);
+$data[1] .= $jump . html_print_select($values, 'flash_charts', $user_info["flash_chart"], '', '', -1, true, false, false);
 
 
 $data[2] = __('Language');
-$data[2] .= '<br>' . html_print_select_from_sql ('SELECT id_language, name FROM tlanguage',
+$data[2] .= $jump . html_print_select_from_sql ('SELECT id_language, name FROM tlanguage',
 	'language', $user_info["language"], '', __('Default'), 'default', true);
 
 $table->rowclass[] = '';
@@ -285,7 +286,7 @@ $id_usr = $config['id_user'];
 if (!$meta) {
 	$data = array();
 	$data[0] = __('Shortcut bar') . ui_print_help_tip(__('This will activate a shortcut bar with alerts, events, messages... information'), true);
-	$data[0] .= '<br>' . html_print_checkbox('shortcut_bar', 1, $user_info["shortcut"], true);
+	$data[0] .= $jump . html_print_checkbox('shortcut_bar', 1, $user_info["shortcut"], true);
 	
 	$data[1] = __('Home screen'). ui_print_help_tip(__('User can customize the home page. By default, will display \'Agent Detail\'. Example: Select \'Other\' and type sec=estado&sec2=operation/agentes/estado_agente to show agent detail view'), true);
 	$values = array (
@@ -301,7 +302,7 @@ if (!$meta) {
 		$values['Dashboard'] = __('Dashboard');
 	}
 	
-	$data[1] .= '<br>' . html_print_select($values, 'section', io_safe_output($user_info["section"]), 'show_data_section();', '', -1, true, false, false);
+	$data[1] .= $jump . html_print_select($values, 'section', io_safe_output($user_info["section"]), 'show_data_section();', '', -1, true, false, false);
 		
 	if (enterprise_installed()) {
 		$dashboards = get_user_dashboards ($config['id_user']);
@@ -337,7 +338,7 @@ if (!$meta) {
 	if (function_exists('skins_print_select')) {
 		if (count($usr_groups) > 1) {
 			$data[2] = __('Skin');
-			$data[2] .= '<br>' . skins_print_select($id_usr,'skin', $user_info['id_skin'], '', __('None'), 0, true);
+			$data[2] .= $jump . skins_print_select($id_usr,'skin', $user_info['id_skin'], '', __('None'), 0, true);
 		}
 	}
 	$table->rowclass[] = '';
@@ -349,7 +350,7 @@ if (!$meta) {
 $double_auth_enabled = (bool) db_get_value('id', 'tuser_double_auth', 'id_user', $config['id_user']);
 $data = array();
 $data[0] = __('Double authentication');
-$data[0] .= '<br>';
+$data[0] .= $jump;
 $data[0] .= html_print_checkbox('double_auth', 1, $double_auth_enabled, true);
 if ($double_auth_enabled) {
 	$data[0] .= '&nbsp;&nbsp;';