diff --git a/pandora_console/ChangeLog b/pandora_console/ChangeLog
index 2b37d4f9e8..0791d13100 100644
--- a/pandora_console/ChangeLog
+++ b/pandora_console/ChangeLog
@@ -1,3 +1,22 @@
+2007-04-03 Raul Mateos <raulofpandora@gmail.com>
+
+	* include/languages/language_en.php, language_es_es.php: Added text
+	for no network profile.
+
+	* godmode/modules/manage_network_components.php: Added noscript tag
+	to avoid showing the "show" button if Javascript is enabled. Added
+	image to button Create.
+	
+	* godmode/modules/manage_network_templates.php: Added code to show
+	text if no netork template is defined. Added
+	image to button Create.
+	
+	* godmode/modules/manage_network_templates_form.php: Added code to 
+	avoid a notice error when creating new profile.
+	
+	* godmode/modules/manage_nc_groups.php: Added imaged to Button
+	Create.
+	
 2007-04-02 Raul Mateos <raulofpandora@gmail.com>
 
 	* images/ok.gif: Deleted
diff --git a/pandora_console/godmode/modules/manage_nc_groups.php b/pandora_console/godmode/modules/manage_nc_groups.php
index 81f591ec96..8ca06908f3 100644
--- a/pandora_console/godmode/modules/manage_nc_groups.php
+++ b/pandora_console/godmode/modules/manage_nc_groups.php
@@ -113,7 +113,7 @@ while ($row=mysql_fetch_array($result)){
 echo "<tr><td colspan='3'><div class='raya'></div></td></tr>";
 echo "<tr><td colspan='3' align='right'>";
 echo "<form method=post action='index.php?sec=gmodules&sec2=godmode/modules/manage_nc_groups_form&create=1'>";
-echo "<input type='submit' class='sub' name='crt' value='".$lang_label["create"]."'>";
+echo "<input type='submit' class='sub next' name='crt' value='".$lang_label["create"]."'>";
 echo "</form></td></tr></table>";
 
 ?>
\ No newline at end of file
diff --git a/pandora_console/godmode/modules/manage_network_components.php b/pandora_console/godmode/modules/manage_network_components.php
index c5b3fcd56a..a957883f10 100644
--- a/pandora_console/godmode/modules/manage_network_components.php
+++ b/pandora_console/godmode/modules/manage_network_components.php
@@ -173,13 +173,13 @@ echo "<select name='ncgroup' onChange='javascript:this.form.submit();'>";
 echo "<option value='$ncgroup'>".give_network_component_group_name($ncgroup);	
 if ($ncgroup != 0)
 	echo "<option value='0'>".$lang_label["all"];
-$sql1 = "SELECT * FROM tnetwork_component_group where id_sg != '$ncgroup'";
+$sql1 = "SELECT * FROM tnetwork_component_group WHERE id_sg != '$ncgroup'";
 $result = mysql_query($sql1);
 while ($row = mysql_fetch_array ($result))
 	echo "<option value='" . $row["id_sg"] . "'>". give_network_component_group_name ($row["id_sg"]);
 echo "</select>";
 echo "<td valign='middle'>";
-echo "<input name='uptbutton' type='submit' class='sub' value='".$lang_label["show"]."'>";
+echo "<noscript><input name='uptbutton' type='submit' class='sub' value='".$lang_label["show"]."'></noscript>";
 echo "</td></form></table><br><br>";
 
 if ($ncgroup != 0)
@@ -245,7 +245,7 @@ if ( $row = mysql_num_rows ($result)){
 	echo "<tr><td colspan='7'><div class='raya'></div></td></tr>";
 	echo "<tr><td colspan='7' align='right'>";
 	echo "<form method=post action='index.php?sec=gmodules&sec2=godmode/modules/manage_network_components_form&create=1'>";
-	echo "<input type='submit' class='sub' name='crt' value='".$lang_label["create"]."'>";
+	echo "<input type='submit' class='sub next' name='crt' value='".$lang_label["create"]."'>";
 	echo "</form></td></tr></table>";
 
 } else
diff --git a/pandora_console/godmode/modules/manage_network_templates.php b/pandora_console/godmode/modules/manage_network_templates.php
index dfb511cf23..1ed563e8f1 100644
--- a/pandora_console/godmode/modules/manage_network_templates.php
+++ b/pandora_console/godmode/modules/manage_network_templates.php
@@ -44,13 +44,16 @@ if (isset($_GET["delete"])){ // if delete
 
 echo "<h2>".$lang_label["network_profile_management"]."</h2>";
 
-echo "<table cellpadding=4 cellspacing=4 width=550>";
-echo "<th>".$lang_label["name"]."</th>";
-echo "<th>".$lang_label["description"]."</th>";
-echo "<th>".$lang_label["number_of_modules"]."</th>";
+
 $sql1='SELECT * FROM tnetwork_profile ORDER BY name';
 $result=mysql_query($sql1);
 $color=0;
+if (mysql_num_rows($result)) {
+	echo "<table cellpadding=4 cellspacing=4 width=550>";
+	echo "<th>".$lang_label["name"]."</th>";
+	echo "<th>".$lang_label["description"]."</th>";
+	echo "<th>".$lang_label["number_of_modules"]."</th>";
+}
 while ($row=mysql_fetch_array($result)){
 	if ($color == 1){
 		$tdcolor = "datos";
@@ -76,10 +79,15 @@ while ($row=mysql_fetch_array($result)){
 		</tr>";
 
 }
-echo "<tr><td colspan='3'><div class='raya'></div></td></tr>";
+if (mysql_num_rows($result)) {
+	echo "<tr><td colspan='3'><div class='raya'></div></td></tr>";
+} else {
+	echo "<div class='nf'>".$lang_label["no_netprofiles"]."</div>";
+	echo "<table>";
+}
 echo "<tr><td colspan='3' align='right'>";
 echo "<form method=post action='index.php?sec=gmodules&sec2=godmode/modules/manage_network_templates_form&id_np=-1'>";
-echo "<input type='submit' class='sub' name='crt' value='".$lang_label["create"]."'>";
+echo "<input type='submit' class='sub next' name='crt' value='".$lang_label["create"]."'>";
 echo "</form></td></tr></table>";
 
 ?>
\ No newline at end of file
diff --git a/pandora_console/godmode/modules/manage_network_templates_form.php b/pandora_console/godmode/modules/manage_network_templates_form.php
index b078f9991d..90bc3e82b1 100644
--- a/pandora_console/godmode/modules/manage_network_templates_form.php
+++ b/pandora_console/godmode/modules/manage_network_templates_form.php
@@ -118,7 +118,9 @@ echo "<input type='text' size=25 name='name' value='$name'>";
 echo "<tr><td class='datos2'>".$lang_label["description"];
 echo "<td class='datos2'>";
 echo "<textarea cols=50 rows=2 name='description'>";
-echo $description;
+if (isset($description)) {
+	echo $description;
+}
 echo "</textarea>";
 echo "</td></tr></table>";
 
@@ -150,7 +152,7 @@ if ($id_np != -1){
 			$id_tipo = $row2["type"];
 			$id_group = $row2["id_group"];
 			$nombre_modulo =$row2["name"];
-			$descripcion = $row2["description"];
+			$description = $row2["description"];
 			$module_group2 = $row2["id_module_group"];
 
 			echo "<tr><td class='".$tdcolor."_id'>";
@@ -159,7 +161,7 @@ if ($id_np != -1){
 			if ($id_tipo > 0) {
 				echo "<img src='images/".show_icon_type($id_tipo)."' border=0>";
 			}
-			echo "<td class='$tdcolor'>".substr($descripcion,0,30)."</td>";
+			echo "<td class='$tdcolor'>".substr($description,0,30)."</td>";
 			echo "<td class='$tdcolor'>".give_network_component_group_name($id_group)."</td>";
 			echo "<td class='$tdcolor'><a href='index.php?sec=gmodules&sec2=godmode/modules/manage_network_templates_form&id_np=$id_np&delete_module=$id_npc'><img src='images/cross.png'></a></td>";
 		}
diff --git a/pandora_console/include/languages/language_en.php b/pandora_console/include/languages/language_en.php
index f95fa1b2b6..c97aec3b13 100644
--- a/pandora_console/include/languages/language_en.php
+++ b/pandora_console/include/languages/language_en.php
@@ -743,6 +743,8 @@ $lang_label["version"]="Version";
 //2 Apr 2007
 $lang_label["no_rtask"]="There are no recon task configured";
 
+//3 Apr 2007
+$lang_label["no_netprofiles"]="There are no defined network profiles";
 
 global $lang_label; 
 global $help_label;
diff --git a/pandora_console/include/languages/language_es_es.php b/pandora_console/include/languages/language_es_es.php
index a4e7adb715..3bc1c7bfb6 100644
--- a/pandora_console/include/languages/language_es_es.php
+++ b/pandora_console/include/languages/language_es_es.php
@@ -662,6 +662,9 @@ $lang_label["parent"]="Padre";
 //2 Apr 2007
 $lang_label["no_rtask"]="No hay ninguna tarea de reconocimiento configurada";
 
+//3 Apr 2007
+$lang_label["no_netprofiles"]="No hay ning&uacute;n perfil de red definido";
+
 global $lang_label;
 global $help_label;
 ?>