diff --git a/pandora_console/ChangeLog b/pandora_console/ChangeLog
index bb5a1972a8..9c5d0585bb 100644
--- a/pandora_console/ChangeLog
+++ b/pandora_console/ChangeLog
@@ -1,3 +1,10 @@
+2009-02-05  Esteban Sanchez  <estebans@artica.es>
+
+	* general/links_menu.php: Added classes to links. Style correction.
+
+	* general/main_menu.php: Fixed an error when the selected option was
+	the last one in a submenu.
+
 2009-02-04  Ramon Novoa  <rnovoa@artica.es>
 
 	* include/functions_db.php,
diff --git a/pandora_console/general/links_menu.php b/pandora_console/general/links_menu.php
index 413f587b55..10aa2512e2 100644
--- a/pandora_console/general/links_menu.php
+++ b/pandora_console/general/links_menu.php
@@ -20,8 +20,8 @@ $result = get_db_all_rows_sql ($sql);
 if ($result !== false) {
 	echo '<div class="tit bg4">:: '.__('Links').' ::</div>';
 	echo '<div class="menu links"><ul>';
-	foreach ($result as $row){
-		echo '<li><a href="'.$row["link"].'" target="_new">'.$row["name"].'</a></li>';
+	foreach ($result as $link) {
+		echo '<li class="menu_option menu_link"><a href="'.$link["link"].'" target="_new">'.$link["name"].'</a></li>';
 	}
 	echo '</ul></div>';
 }
diff --git a/pandora_console/general/main_menu.php b/pandora_console/general/main_menu.php
index 9f0b04f790..e4a862ffc6 100644
--- a/pandora_console/general/main_menu.php
+++ b/pandora_console/general/main_menu.php
@@ -77,18 +77,18 @@ function temp_print_menu ($menu, $classtype) {
 			//Set class
 			if ($sec2 == $subsec2 && isset ($sub[$subsec2]["options"])
 				&& (get_parameter_get ($sub[$subsec2]["options"]["name"]) == $sub[$subsec2]["options"]["value"])) {
-				//If the subclass is selected and there are options and that options value is true 
-				$class = ' submenu_selected';
+				//If the subclass is selected and there are options and that options value is true
+				$class = 'submenu_selected';
 				$selected = true;
 				$visible = true;
 			} elseif ($sec2 == $subsec2 && !isset ($sub[$subsec2]["options"])) {
 				//If the subclass is selected and there are no options
-				$class = ' submenu_selected';
+				$class = 'submenu_selected';
 				$selected = true;
 				$visible = true;
 			} else {
 				//Else it's invisible
-				$class = '';
+				$class = 'submenu_not_selected';
 			}
 			
 			if (! isset ($sub["refr"])) {
@@ -126,7 +126,7 @@ function temp_print_menu ($menu, $classtype) {
 		$output .= '<a href="index.php?sec='.$mainsec.'&amp;sec2='.$main["sec2"].($main["refr"] ? '&amp;refr='.$main["refr"] : '').'">'.$main["text"].'</a>';
 		$output .= '</div>';
 		
-		$output .= '<div class="submenu'.$class.($visible ? '' : ' invisible').'">';
+		$output .= '<div class="submenu'.($visible ? '' : ' invisible').'">';
 		$output .= '<ul>';
 		$output .= $submenu_output;
 		$output .= '</ul>';