diff --git a/pandora_console/general/main_menu.php b/pandora_console/general/main_menu.php
index 65b849bd62..bb40add98d 100644
--- a/pandora_console/general/main_menu.php
+++ b/pandora_console/general/main_menu.php
@@ -216,19 +216,16 @@ $(document).ready( function() {
 			}, 3500);
 		});
 		*/
-		$('#menu').css('width', '115px');
-		$('#main').css('margin', '0% 1.5% 0% 0%');
-		$('li.menu_icon').addClass( " no_hidden_menu" );
-		$('ul.submenu').css('left', '114px');
-		$(window).resize( function() {
-			if($(window).width() <= 1262){
-				$('#main').css('width', '86%');
-			}
-			else{
-				if($(window).width() >= 1300){
-					$('#main').css('width', '90%');
-				}
-			}
+		$('#menu').mouseenter(function() {
+			$('div#title_menu').show();
+			$('#menu').css('width', '130px');
+			$('li.menu_icon').addClass( " no_hidden_menu" );
+			$('ul.submenu').css('left', '129px');
+		}).mouseleave(function(){
+			$('#menu').css('width', '45px');
+			$('li.menu_icon').removeClass( " no_hidden_menu");
+			$('ul.submenu').css('left', '44px');
+			$('div#title_menu').hide();
 		});
 	}
 	else{
@@ -243,8 +240,8 @@ $(document).ready( function() {
 	openTime2 = 0;
 	handsIn = 0;
 	handsIn2 = 0;
-
-	$('.menu_icon').hover(function(){
+	
+	$('.menu_icon').mouseenter(function(){
 		table_hover = $(this);
 		handsIn = 1;
 		openTime = new Date().getTime();
@@ -268,7 +265,7 @@ $(document).ready( function() {
 	});
 	
 	
--	$('.has_submenu').hover(function(){
+-	$('.has_submenu').mouseenter(function(){
 		table_hover2 = $(this);
 		handsIn2 = 1;
 		openTime2 = new Date().getTime();
@@ -289,13 +286,28 @@ $(document).ready( function() {
 	});
 	
 	$(document).ready(function(){
-		$('#page').click(function(){
+		$('#container').click(function(){
 			openTime = 4000;
 			if( typeof(table_hover) != 'undefined')
 				$("ul#sub"+table_hover[0].id).hide();
 			if( typeof(table_hover2) != 'undefined')
 				$("ul#sub"+table_hover2[0].id).hide();
 		});
+		
+		$('div.menu>ul>li>ul>li>a').click(function(){
+			openTime = 4000;
+			if( typeof(table_hover) != 'undefined')
+				$("ul#sub"+table_hover[0].id).hide();
+			if( typeof(table_hover2) != 'undefined')
+				$("ul#sub"+table_hover2[0].id).hide();
+		});		
+		$('div.menu>ul>li>ul>li>ul>li>a').click(function(){
+			openTime = 4000;
+			if( typeof(table_hover) != 'undefined')
+				$("ul#sub"+table_hover[0].id).hide();
+			if( typeof(table_hover2) != 'undefined')
+				$("ul#sub"+table_hover2[0].id).hide();
+		});		
 	});
 	
 	
diff --git a/pandora_console/godmode/menu.php b/pandora_console/godmode/menu.php
index 6c484e4655..9d6dd80a24 100644
--- a/pandora_console/godmode/menu.php
+++ b/pandora_console/godmode/menu.php
@@ -100,7 +100,8 @@ if (check_acl ($config['id_user'], 0, "PM")) {
 	enterprise_hook('agents_submenu');
 	if (check_acl ($config['id_user'], 0, "AW")) {
 		$sub["gmassive"]["text"] = __('Massive operations');
-
+		$sub["gmassive"]["type"] = "direct";
+		$sub["gmassive"]["subtype"] = "nolink";
 		$sub2 = array ();
 		$sub2["godmode/massive/massive_operations&amp;tab=massive_agents"]["text"] = __('Agents operations');
 		$sub2["godmode/massive/massive_operations&amp;tab=massive_modules"]["text"] = __('Modules operations');
@@ -242,7 +243,8 @@ if (check_acl ($config['id_user'], 0, "PM")) {
 	$sub["gextmaneger"]["sub2"] = $sub2;
 	if (check_acl ($config['id_user'], 0, "DM")) {//meter en extensiones
 		$sub["gdbman"]["text"] = __('DB maintenance');
-
+		$sub["gdbman"]["type"] = "direct";
+		$sub["gdbman"]["subtype"] = "nolink";
 		$sub2 = array ();
 		$sub2["godmode/db/db_info"]["text"] = __('DB information');
 		$sub2["godmode/db/db_purge"]["text"] = __('Database purge');
@@ -261,6 +263,8 @@ if (check_acl ($config['id_user'], 0, "PM")) {
 		
 		$sub = array ();
 		$sub["gextmaneger"]["text"] = __('Extension manager');
+		$sub["gextmaneger"]["type"] = "direct";
+		$sub["gextmaneger"]["subtype"] = "nolink";
 		$sub2 = array ();
 
 		foreach ($config['extensions'] as $extension) {
diff --git a/pandora_console/include/functions_menu.php b/pandora_console/include/functions_menu.php
index 7384ef8e95..1bac6043fb 100644
--- a/pandora_console/include/functions_menu.php
+++ b/pandora_console/include/functions_menu.php
@@ -358,7 +358,13 @@ function menu_print_menu (&$menu) {
 		//Print out the first level
 		$output .= '<li class="'.implode (" ", $classes).' ' . $seleccionado . '" id="icon_'.$id.'">';
 						//onclick="location.href=\'index.php?sec='.$mainsec.'&amp;sec2='.$main["sec2"].($main["refr"] ? '&amp;refr='.$main["refr"] : '').'\'">';
-		$output .= '<div id="title_menu" style="color:#FFF">' . ui_print_truncate_text($main["text"] , 60). '</div>';
+
+		$length = strlen(__($main["text"]));
+		$padding_top = ( $length >= 18) ? 6 : 12;
+		
+		$output .= '<div id="title_menu" style="color:#FFF; padding-top:'. $padding_top . 'px; display:none;">' . $main["text"] . '</div>';
+		$padding_top = 0;
+		$length = 0;
 		//$output .= html_print_image("include/styles/images/toggle.png", true, array("class" => "toggle", "alt" => "toogle"));
 		if ($submenu_output != '') {
 			//WARNING: IN ORDER TO MODIFY THE VISIBILITY OF MENU'S AND SUBMENU'S (eg. with cookies) YOU HAVE TO ADD TO THIS ELSEIF. DON'T MODIFY THE CSS
diff --git a/pandora_console/include/styles/menu.css b/pandora_console/include/styles/menu.css
index c1a2661e9a..2db07ec2fb 100644
--- a/pandora_console/include/styles/menu.css
+++ b/pandora_console/include/styles/menu.css
@@ -70,7 +70,7 @@ li:hover ul { display: block; }
 	margin: 0px 0px 0px 0px;
 	position: absolute;
 	z-index: 999;
-	left: 39px;
+	left: 44px;
 	min-height: 30px;
 	height: 30px;
 	width: 160px;
@@ -95,7 +95,7 @@ li:hover ul { display: block; }
 }
 
 .submenu2 li a {
-	background-color: #111;
+	background-color: #222;
 	margin-left: 0px;
 	padding-left: 0px;
 	display:block;
diff --git a/pandora_console/include/styles/pandora.css b/pandora_console/include/styles/pandora.css
index e951df2bad..c2088582d6 100755
--- a/pandora_console/include/styles/pandora.css
+++ b/pandora_console/include/styles/pandora.css
@@ -233,9 +233,11 @@ div#page {
 	clear: both;
 }
 div#main {
-	width: 90%;
-	margin: 0px 4% 0px 0%;
+	width: auto;
+	margin: 0px 2% 0px 0%;
 	float: right;
+	position: relative;
+	min-height: 850px;
 }
 div#main_help {
 	width: 100%;
@@ -310,10 +312,11 @@ div#menu_container {
 }
 
 div#menu {
-	width: 40px;
+	width: 45px;
 	float: left;
-	margin-top: 10px;
 	height: 828px;
+	z-index: 999;
+	position: absolute;
 }
 
 div#head {
@@ -1860,8 +1863,6 @@ div.warn {
 	padding: 2px 1px 6px 25px;
 }
 
-
-
 .submenu_not_selected {
 	font-weight: normal !important;
 }
@@ -1881,7 +1882,8 @@ div#page {
 	width: auto;
 }
 div#main {
-	min-width: 720px;
+	max-width: 93%;
+	min-width: 93%;
 }
 
 ol.steps {
@@ -2239,7 +2241,7 @@ ul.godmode ul.submenu li a:hover {
 }
 
 ul.godmode ul.submenu li .SubNoLink:hover {
-	background: url('../../images/menu_gm_mark.png') repeat-y right;
+	background: url('../../images/menu_gm_mark.png') repeat-y right !important;
 	#font-weight: bold;
 }
 
@@ -2248,7 +2250,7 @@ ul.godmode ul.submenu li.selected>a {
 }
 
 ul.godmode ul.submenu li.selected .SubNoLink {
-	background: url('../../images/menu_gm_mark.png') repeat-y right;
+	background: url('../../images/menu_gm_mark.png') repeat-y right !important;
 }
 
 li.links a:hover  {
@@ -2881,16 +2883,13 @@ table#policy_modules td * {
 	color: #FFF;
 	float: right;
 	width: 70%;
-	#padding-top: 8.75px;
-	vertical-align:middle;
 	letter-spacing: 0pt;
 	font-size: 7pt;
 	white-space: pre-wrap;
-	height: 35px;
 }
 
 .no_hidden_menu{
-	background-position: 5% 50% !important;
+	background-position: 12% 50% !important;
 }
 
 
diff --git a/pandora_console/operation/menu.php b/pandora_console/operation/menu.php
index f0e7daabee..3e54825c35 100644
--- a/pandora_console/operation/menu.php
+++ b/pandora_console/operation/menu.php
@@ -80,7 +80,8 @@ if (check_acl ($config['id_user'], 0, "AR")) {
 	//SNMP Console
 	$sub["snmpconsole"]["text"] = __('SNMP');
 	$sub["snmpconsole"]["refr"] = 0;
-
+	$sub["snmpconsole"]["type"] = "direct";
+	$sub["snmpconsole"]["subtype"] = "nolink";
 	$sub2 = array();
 	$sub2["operation/snmpconsole/snmp_view"]["text"] = __("SNMP console");
 	$sub2["operation/snmpconsole/snmp_browser"]["text"] = __("SNMP browser");
@@ -135,7 +136,8 @@ 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');
 	if ($layouts === false) {
 		$layouts = array ();
@@ -181,7 +183,8 @@ if (check_acl ($config['id_user'], 0, "AR")) {
 		//INI GIS Maps
 		if ($config['activate_gis']) {
 			$sub["gismaps"]["text"] = __('GIS Maps');
-			
+			$sub["gismaps"]["type"] = "direct";
+			$sub["gismaps"]["subtype"] = "nolink";
 			$sub2 = array ();
 			
 			$gisMaps = db_get_all_rows_in_table ('tgis_map', 'map_name');
@@ -327,6 +330,8 @@ if (check_acl ($config['id_user'], 0, "IR") == 1) {
 	}
 	
 	$sub[$sec2]["text"] = __('Incidents');
+	$sub[$sec2]["type"] = "direct";
+	$sub[$sec2]["subtype"] = "nolink";
 	$sub[$sec2]["refr"] = 0;
 	$sub[$sec2]["subsecs"] = array(
 		"operation/incidents/incident_detail",
@@ -343,7 +348,8 @@ 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";
 $sub2 = array ();
 $sub2["operation/messages/message_edit&amp;new_msg=1"]["text"] = __('New message');