diff --git a/pandora_console/ChangeLog b/pandora_console/ChangeLog
index 55b315f557..3d6e7c709f 100644
--- a/pandora_console/ChangeLog
+++ b/pandora_console/ChangeLog
@@ -8,7 +8,16 @@
 	
 	* images/groups_small/applications.png: New icon for applications group.
 	
+	* images/copy.png: New icon for copy data.
+	
 	* pandoradb_data.sql: Updated default applications icon name.
+	
+	* include/styles/pandora.css: Added style for copy icon.
+	
+	* include/languages/language_en.php: Added template text.
+	
+	* godmode/agentes/agent_template.php, manage_config.php: Updated with new
+	table styles. Updated texts and closed html tags.
 
 
 2007-06-02  Raul Mateos  <raulofpandora@gmail.com>
diff --git a/pandora_console/godmode/agentes/agent_template.php b/pandora_console/godmode/agentes/agent_template.php
index 28d6eb024f..75156b14ae 100644
--- a/pandora_console/godmode/agentes/agent_template.php
+++ b/pandora_console/godmode/agentes/agent_template.php
@@ -81,9 +81,7 @@ if (isset($_POST["template_id"])){
 			mysql_query ($module_sql);
 		}
 	}
-	echo "<div class='suc'>";
-	echo "Modules added successfully";
-	echo "</div>";
+	echo "<h3 class='suc'>".$lang_label["add_mod_ok"]."</h3>";
 }
 
 // Main header
@@ -96,17 +94,18 @@ echo "</h2>";
 // ==========================
 
 echo "<h3>".$lang_label["available_templates"]."</h3>";
-echo "<table width=300 border=0>";
-echo "<tr><td><br>";
-
 echo "<form method=post action='index.php?sec=gagente&sec2=godmode/agentes/configurar_agente&tab=template&id_agente=$id_agente'>";
-echo "<select name='template_id'>";
+
+echo "<table width='300' class='databox' cellpadding='4' cellspacing='4'>";
+echo "<tr><td>".$lang_label['template']."</td><td valign='middle'>";
+
+echo "<select name='template_id' class='w130'>";
 $sql1='SELECT * FROM tnetwork_profile ORDER BY name';
 $result=mysql_query($sql1);
 if (mysql_num_rows($result))
 	while ($row=mysql_fetch_array($result))
-		echo "<option value='".$row["id_np"]."'>".$row["name"];
-echo "</select>";
+		echo "<option value='".$row["id_np"]."'>".$row["name"]."</option>";
+echo "</select></td>";
 
 echo "<td>";
 echo "<input type='submit' class='sub next' name='crt' value='".$lang_label["assign"]."'>";
@@ -122,12 +121,12 @@ $sql1='SELECT * FROM tagente_modulo WHERE id_agente = "'.$id_agente.'"
 ORDER BY id_module_group, nombre ';
 $result=mysql_query($sql1);
 if ($row=mysql_num_rows($result)){
-	echo '<table width="700" cellpadding="3" cellspacing="3" class="fon">';
+	echo '<table width="700" cellpadding="4" cellspacing="4" class="databox">';
 	echo '<tr>';
-	echo "<th>".$lang_label["module_name"];
-	echo "<th>".$lang_label["type"];
-	echo "<th>".$lang_label["description"];
-	echo "<th width=50>".$lang_label["action"];
+	echo "<th>".$lang_label["module_name"]."</th>";
+	echo "<th>".$lang_label["type"]."</th>";
+	echo "<th>".$lang_label["description"]."</th>";
+	echo "<th width=50>".$lang_label["action"]."</th>";
 	$color=1;$last_modulegroup = "0";
 	while ($row=mysql_fetch_array($result)){
 		if ($color == 1){
@@ -162,7 +161,7 @@ if ($row=mysql_num_rows($result)){
 		update_module=".$row["id_agente_modulo"]."#modules'>
 		<img src='images/config.gif' border=0 alt='".$lang_label["update"]."' onLoad='type_change()'></b></a>";
 	}
-	echo "<tr><td colspan='7'><div class='raya'></div></td></tr>";
+	echo "</td></tr>";
 	echo "</table>";
 } else
 	echo "<div class='nf'>No modules</div>";
diff --git a/pandora_console/godmode/agentes/manage_config.php b/pandora_console/godmode/agentes/manage_config.php
index 172960c036..fdab0c9a67 100644
--- a/pandora_console/godmode/agentes/manage_config.php
+++ b/pandora_console/godmode/agentes/manage_config.php
@@ -26,7 +26,7 @@ if (comprueba_login() == 0)
 		
 		if ((isset($_GET["operacion"])) AND (! isset($_POST["update_agent"]))){
 			// DATA COPY
-			if (isset($_POST["copiar"])) {
+			if (isset($_POST["copy"])) {
 				echo "<h2>".$lang_label["datacopy"]."</h2>";
 				// Initial checkings
 				
@@ -112,7 +112,7 @@ if (comprueba_login() == 0)
 									echo "<br>&nbsp;&nbsp;".$lang_label["copymod"]." ->".$o_nombre;
 								}
 							}
-						} 
+						}
 				 	}
 					if ($multiple == 0)
 							$b=-1;
@@ -176,11 +176,11 @@ if (comprueba_login() == 0)
 							} //while
 						} // for
 					} 
-				} 
+				}
 			} //end if copy modules or alerts
 
 			// DELETE DATA
-			elseif (isset($_POST["eliminar"])) {
+			elseif (isset($_POST["delete"])) {
 				echo "<h2>".$lang_label["deletedata"]."</h2>";
 				// Initial checkings
 				
@@ -209,7 +209,7 @@ if (comprueba_login() == 0)
 				for ($a=0;$a <count($destino); $a++){ // for each agent
 					$id_agente = $destino[$a];
 					if ($modulos == 1){
-						echo "<br>".$lang_label["deletingdata"]." -> ".dame_nombre_agente($id_agente);
+						echo "<br>".$lang_label["deleting_data"]." -> ".dame_nombre_agente($id_agente);
 					
 						// Deleting data
 						$sql1='SELECT * FROM tagente_modulo WHERE id_agente = '.$id_agente;
@@ -233,7 +233,7 @@ if (comprueba_login() == 0)
 					}
 					// delete alerts definitions
 					if ($alertas == 1){ 
-						echo "<br>".$lang_label["deletingdata"]." -> ".dame_nombre_agente($id_agente);
+						echo "<br>".$lang_label["deleting_data"]." -> ".dame_nombre_agente($id_agente);
 					
 						// delete data
 						$sql1='SELECT * FROM tagente_modulo WHERE id_agente = '.$id_agente;
@@ -280,7 +280,7 @@ if (comprueba_login() == 0)
 				$sql1="SELECT * FROM tagente_modulo WHERE id_agente = ".$agente_modulo. " order by nombre";	
 				$result = mysql_query($sql1);
 				while ($row=mysql_fetch_array($result)){
-			 		echo "<option value=".$row["id_agente_modulo"].">".$row["nombre"];	
+			 		echo "<option value=".$row["id_agente_modulo"].">".$row["nombre"]."</option>";	
 				}
 			}
 			echo "</select>";
@@ -299,14 +299,14 @@ if (comprueba_login() == 0)
 			$sql1='SELECT * FROM tagente';
 			$result=mysql_query($sql1);
 			while ($row=mysql_fetch_array($result)){
-				echo "<option value=".$row["id_agente"].">".$row["nombre"];
+				echo "<option value=".$row["id_agente"].">".$row["nombre"]."</option>";
 			}
 			?>
 			</select>
 			
 			<td align="right" class="datosb">
-			<input type="submit" name="copiar" class="sub" value="<?php echo $lang_label["copy"].'" onClick="if (!confirm("'.$lang_label["are_you_sure"].'")) return false;>'; ?>
-			<input type="submit" name="eliminar" class="sub delete" value="<?php echo $lang_label["delete"].'" onClick="if (!confirm("'.$lang_label["are_you_sure"].'")) return false;>'; ?>
+			<input type="submit" name="copy" class="sub copy" value="<?php echo $lang_label["copy"].'" onClick="if (!confirm("'.$lang_label["are_you_sure"].'")) return false;>'; ?>
+			<input type="submit" name="delete" class="sub delete" value="<?php echo $lang_label["delete"].'" onClick="if (!confirm("'.$lang_label["are_you_sure"].'")) return false;>'; ?>
 			<tr><td colspan=2>
 			</div></td></tr>
 			</table>
diff --git a/pandora_console/images/copy.png b/pandora_console/images/copy.png
new file mode 100644
index 0000000000..e252606d3e
Binary files /dev/null and b/pandora_console/images/copy.png differ
diff --git a/pandora_console/include/languages/language_en.php b/pandora_console/include/languages/language_en.php
index 7cd0635f83..967c506b43 100644
--- a/pandora_console/include/languages/language_en.php
+++ b/pandora_console/include/languages/language_en.php
@@ -792,6 +792,8 @@ $lang_label["min_valid_value_help"]="Min. possible value to consider 'valid' val
 $lang_label["max_valid_value_help"]="Max. possible value to consider 'valid' values, above this limit, Pandora FMS will fire the alert";
 $lang_label["alert_time_threshold_help"]="This value must be al least Module Interval * (Min.Number of Alerts + 1)";
 $lang_label["style_template"]="Style template";
+$lang_label["template"]="Template";
+$lang_label["add_mod_ok"]="Modules added successfully";
 
 global $lang_label; 
 global $help_label;
diff --git a/pandora_console/include/styles/pandora.css b/pandora_console/include/styles/pandora.css
index 044d76d0ff..c3fa470c95 100644
--- a/pandora_console/include/styles/pandora.css
+++ b/pandora_console/include/styles/pandora.css
@@ -266,6 +266,10 @@ input.search {
 	padding-right: 21px;
 	background: #e5e5e5 url(../../images/zoom.png) no-repeat right 3px;
 }
+input.copy {
+	padding-right: 21px;
+	background: #e5e5e5 url(../../images/copy.png) no-repeat right 3px;
+}
 table, img {
 	border: 0px;
 }