diff --git a/edit_entry.css b/edit_entry.css
index 8d15a63..71e428a 100644
--- a/edit_entry.css
+++ b/edit_entry.css
@@ -35,13 +35,13 @@ form.appnitro
 	padding:0;
 	text-decoration:none;
 	text-indent:-8000px;
-	background-image: url('../../../images/machform.gif'); 
-	background-repeat: no-repeat; 
+	/*background-image: url('../../../images/machform.gif');
+	background-repeat: no-repeat;*/
 }
 
 #main_body h1 a
 {
-	
+
 	display:block;
 	height:100%;
 	min-height:40px;
@@ -193,9 +193,9 @@ form.appnitro
 
 #main_body .form_description
 {
-	
+
 	display: none;
-	
+
 }
 
 
@@ -249,7 +249,7 @@ form.appnitro
 {
 	font-size:110%;
 	margin-right:5px;
-	font-family: "Lucida Grande",Tahoma,Arial,Verdana,sans-serif; 
+	font-family: "Lucida Grande",Tahoma,Arial,Verdana,sans-serif;
 }
 
 /**** Inputs and Labels ****/
@@ -533,7 +533,7 @@ form.appnitro
 }
 
 /*** Success Message ****/
-.form_success 
+.form_success
 {
 	clear: both;
 	margin: 0;
@@ -591,7 +591,7 @@ form.appnitro
 /** Integrated Form **/
 .integrated *{
 	font-family:"Lucida Grande", Tahoma, Arial, Verdana, sans-serif;
-	color: #000; 
+	color: #000;
 }
 
 .integrated #top, .integrated #bottom, .integrated h1{
@@ -615,7 +615,7 @@ form.appnitro
 .integrated form.appnitro
 {
 	margin:0px 0px 0;
-	
+
 }
 
 .integrated form .section_break h3
@@ -626,7 +626,7 @@ form.appnitro
 .integrated #error_message h3
 {
 	border: none !important;
-	
+
 }
 
 
@@ -653,60 +653,60 @@ font-size: 11px;
 font-family:"Lucida Grande", Tahoma, Arial, Verdana, sans-serif;
 }
 
-.calendar .button { 
-text-align: center;    
-padding: 2px;          
+.calendar .button {
+text-align: center;
+padding: 2px;
 }
 
 .calendar .nav {
 background:#f5f5f5;
 }
 
-.calendar thead .title { 
-font-weight: bold;      
+.calendar thead .title {
+font-weight: bold;
 text-align: center;
 background: #dedede;
 color: #000;
 padding: 2px 0 3px 0;
 }
 
-.calendar thead .headrow { 
+.calendar thead .headrow {
 background: #f5f5f5;
 color: #444;
 font-weight:bold;
 }
 
-.calendar thead .daynames { 
+.calendar thead .daynames {
 background: #fff;
 color:#333;
 font-weight:bold;
 }
 
-.calendar thead .name { 
+.calendar thead .name {
 border-bottom: 1px dotted #ccc;
 padding: 2px;
 text-align: center;
 color: #000;
 }
 
-.calendar thead .weekend { 
+.calendar thead .weekend {
 color: #666;
 }
 
-.calendar thead .hilite { 
+.calendar thead .hilite {
 background-color: #444;
 color: #fff;
 padding: 1px;
 }
 
-.calendar thead .active { 
+.calendar thead .active {
 background-color: #d12f19;
 color:#fff;
 padding: 2px 0px 0px 2px;
 }
 
 
-.calendar tbody .day { 
+.calendar tbody .day {
 width:1.8em;
 color: #222;
 text-align: right;
@@ -734,19 +734,19 @@ background: #FFF1AF;
 background: #FFF1AF;
 }
 
-.calendar tbody td.hilite { 
+.calendar tbody td.hilite {
 padding: 1px 1px 1px 1px;
 background:#444 !important;
 color:#fff !important;
 }
 
-.calendar tbody td.active { 
+.calendar tbody td.active {
 color:#fff;
 background: #529214 !important;
 padding: 2px 2px 0px 2px;
 }
 
-.calendar tbody td.selected { 
+.calendar tbody td.selected {
 font-weight: bold;
 border: 1px solid #888;
 padding: 1px 1px 1px 1px;
@@ -754,11 +754,11 @@ background: #f5f5f5 !important;
 color: #222 !important;
 }
 
-.calendar tbody td.weekend { 
+.calendar tbody td.weekend {
 color: #666;
 }
 
-.calendar tbody td.today { 
+.calendar tbody td.today {
 font-weight: bold;
 color: #529214;
 background:#D9EFC2;
@@ -766,21 +766,21 @@ background:#D9EFC2;
 
 .calendar tbody .disabled { color: #999; }
 
-.calendar tbody .emptycell { 
+.calendar tbody .emptycell {
 visibility: hidden;
 }
 
-.calendar tbody .emptyrow { 
+.calendar tbody .emptyrow {
 display: none;
 }
 
-.calendar tfoot .footrow { 
+.calendar tfoot .footrow {
 text-align: center;
 background: #556;
 color: #fff;
 }
 
-.calendar tfoot .ttip { 
+.calendar tfoot .ttip {
 background: #222;
 color: #fff;
 font-size:10px;
@@ -788,14 +788,14 @@ border-top: 1px solid #dedede;
 padding: 3px;
 }
 
-.calendar tfoot .hilite { 
+.calendar tfoot .hilite {
 background: #aaf;
 border: 1px solid #04f;
 color: #000;
 padding: 1px;
 }
 
-.calendar tfoot .active { 
+.calendar tfoot .active {
 background: #77c;
 padding: 2px 0px 0px 2px;
 }
diff --git a/edit_form.php b/edit_form.php
index a6ea78a..3338ac9 100644
--- a/edit_form.php
+++ b/edit_form.php
@@ -112,6 +112,7 @@
 			order by
 					element_position asc";
 	$result = do_query($query);
+
 	$j=0;
 	while($row = do_fetch_result($result)){
 		$element_id = $row['element_id'];
@@ -130,7 +131,6 @@
 			}
 		}
 
-
 		//populate elements
 		$element[$j] = new stdClass();
 		$element[$j]->title 		= $row['element_title'];
@@ -150,6 +150,7 @@
 		}else{
 			$element[$j]->options 	= '';
 		}
+
 		$j++;
 	}
 
diff --git a/email_settings.php b/email_settings.php
index d4dab49..92355a3 100644
--- a/email_settings.php
+++ b/email_settings.php
@@ -327,7 +327,7 @@ EOT;
 <div id="form_manager">
 <?php show_message(); ?>
 <div class="info">
-	<h2><a class="breadcrumb" href="manage_form.php?id=<?php echo $form_id; ?>"><?php echo $form_name; ?></a> <img src="images/icons/resultset_next.gif" align="bottom" /> Emails de respuesta</h2>
+	<h2><a class="breadcrumb" href="manage_form.php?id=<?php echo $form_id; ?>"><?php echo $form_name; ?></a> <img src="images/icons/resultset_next.gif" align="bottom" /> Notificaciones de respuesta</h2>
 	<p>Indique a quién se enviará por email las respuestas del formulario</b></p>
 </div>
 <h2 style="font-size: 150%;margin-bottom: 10px;">Mandar notificaciones por email <img src="images/icons/arrow_right.gif" align="absmiddle" /></h2>
diff --git a/includes/header.php b/includes/header.php
index a0248b8..8939016 100644
--- a/includes/header.php
+++ b/includes/header.php
@@ -26,7 +26,7 @@
 <?php /*<img src="images/appnitro_logo.png" class="fix_png" id="appnitro_logo" width="179" height="55"/>*/ ?>
 <?php if(empty($hide_nav)){ ?>
 <ul id="header_tab">
-	<li><a href="manage_form.php" title="Formularios"><img src="images/manage_forms_active.gif" alt=""></a></li>
+	<li><a href="manage_form.php" title="Formularios"><img src="images/manage_forms_active.gif" alt="Formularios"></a></li>
 	<li class="lgo"><a href="logout.php" class="lbOn" title="Salir"><img src="images/logout.gif" alt=""></a></li>
 </ul>
 <?php } ?>
diff --git a/includes/standard-view-functions.php b/includes/standard-view-functions.php
index f72e77b..20b9fe1 100644
--- a/includes/standard-view-functions.php
+++ b/includes/standard-view-functions.php
@@ -186,6 +186,12 @@ EOT;
 		$span_required = '';
 		$guidelines = '';
 
+		if($_GET['id'] != 0){
+			if(($element->id == 1) && (!empty($_SESSION['email_key']))) {
+				$element->populated_value['element_'.$element->id]['default_value'] = $_SESSION['email_key'];
+			}
+		}
+
 		if(!empty($element->is_error)){
 			$error_class = 'class="error"';
 			$error_message = "<p class=\"error\">{$element->error_message}</p>";
diff --git a/manage_form.php b/manage_form.php
index ce6872d..683446a 100644
--- a/manage_form.php
+++ b/manage_form.php
@@ -466,9 +466,9 @@ EOT;
 			    <td width="9%"><a href="<?php echo "edit_css.php?id={$data['form_id']}"; ?>"><img src="images/icons/colorize_32.gif" /></a></td>
 			    <td width="9%"><a href="<?php echo "email_settings.php?id={$data['form_id']}"; ?>"><img src="images/icons/mail_forward_32.gif" /></a></td>
 			    <td width="9%"><a href="<?php echo "embed_code.php?id={$data['form_id']}"; ?>"><img src="images/icons/embed_code_32.gif" /></a></td>
-			    <td width="9%">&nbsp;</td>
-			    <td width="9%"><a href="view.php?id=<?php echo $data['form_id']; ?>" target="_blank"><img src="images/icons/view_form_32.gif" /></a></td>
-			    <td width="21%">&nbsp;</td>
+			    <!--<td width="9%"><a href="send_form.php?id=<?php echo $data['form_id']; ?>"><img src="images/icons/mail_forward_32.gif" /></a></td>-->
+			    <td width="12%"><a href="view.php?id=<?php echo base64_encode($data['form_id']); ?>" target="_blank"><img src="images/icons/view_form_32.gif" /></a></td>
+			    <td width="18%">&nbsp;</td>
 			    <td width="9%"><a href="<?php echo "manage_form.php?duplicate={$data['form_id']}"; ?>"><img src="images/icons/copy_32.gif" /></a></td>
 			    <td width="6%"><a href="manage_form.php?pageno=<?php echo $pageno; ?>&delete=<?php echo $data['form_id']; ?>" onclick="javascript: return confirm('¿Desea eliminar este formulario y todas las respuestas asociadas?');"><img src="images/icons/cross.gif" /></a></td>
 			  </tr>
@@ -478,7 +478,7 @@ EOT;
 			    <td nowrap><a href="<?php echo "edit_css.php?id={$data['form_id']}"; ?>">Editar estilo</a></td>
 			    <td nowrap><a href="<?php echo "email_settings.php?id={$data['form_id']}"; ?>">Notificaciones</a></td>
 				<td nowrap><a href="<?php echo "embed_code.php?id={$data['form_id']}"; ?>">Código</a></td>
-			    <td>&nbsp;</td>
+			    <!--<td nowrap><a href="<?php echo "send_form.php?id={$data['form_id']}"; ?>">Enviar el formulario</a></td>-->
 			    <td><a href="view.php?id=<?php echo base64_encode($data['form_id']); ?>" target="_blank">Ver formulario</a></td>
 			    <td>&nbsp;</td>
 			    <td><a href="<?php echo "manage_form.php?duplicate={$data['form_id']}"; ?>">Duplicar</a></td>
diff --git a/view.css b/view.css
index a04fa20..bc44487 100644
--- a/view.css
+++ b/view.css
@@ -64,13 +64,13 @@ form.appnitro
 	padding:0;
 	text-decoration:none;
 	text-indent:-8000px;
-	background-image: url('../../../images/machform.gif'); 
-	background-repeat: no-repeat; 
+	/*background-image: url('../../../images/machform.gif');
+	background-repeat: no-repeat;*/
 }
 
 #main_body h1 a
 {
-	
+
 	display:block;
 	height:100%;
 	min-height:40px;
@@ -581,7 +581,7 @@ form.appnitro
 }
 
 /*** Success Message ****/
-.form_success 
+.form_success
 {
 	clear: both;
 	margin: 0;
@@ -668,13 +668,13 @@ form.appnitro
 .embed form.appnitro
 {
 	margin:0px 0px 0;
-	
+
 }
 
 /** Integrated Form **/
 .integrated *{
 	font-family:"Lucida Grande", Tahoma, Arial, Verdana, sans-serif;
-	color: #000; 
+	color: #000;
 }
 
 .integrated #top, .integrated #bottom, .integrated h1{
@@ -700,7 +700,7 @@ form.appnitro
 .integrated form.appnitro
 {
 	margin:0px 0px 0;
-	
+
 }
 
 .integrated form .section_break h3
@@ -711,7 +711,7 @@ form.appnitro
 .integrated #error_message h3
 {
 	border: none !important;
-	
+
 }
 
 
@@ -738,60 +738,60 @@ font-size: 11px;
 font-family:"Lucida Grande", Tahoma, Arial, Verdana, sans-serif;
 }
 
-.calendar .button { 
-text-align: center;    
-padding: 2px;          
+.calendar .button {
+text-align: center;
+padding: 2px;
 }
 
 .calendar .nav {
 background:#f5f5f5;
 }
 
-.calendar thead .title { 
-font-weight: bold;      
+.calendar thead .title {
+font-weight: bold;
 text-align: center;
 background: #dedede;
 color: #000;
 padding: 2px 0 3px 0;
 }
 
-.calendar thead .headrow { 
+.calendar thead .headrow {
 background: #f5f5f5;
 color: #444;
 font-weight:bold;
 }
 
-.calendar thead .daynames { 
+.calendar thead .daynames {
 background: #fff;
 color:#333;
 font-weight:bold;
 }
 
-.calendar thead .name { 
+.calendar thead .name {
 border-bottom: 1px dotted #ccc;
 padding: 2px;
 text-align: center;
 color: #000;
 }
 
-.calendar thead .weekend { 
+.calendar thead .weekend {
 color: #666;
 }
 
-.calendar thead .hilite { 
+.calendar thead .hilite {
 background-color: #444;
 color: #fff;
 padding: 1px;
 }
 
-.calendar thead .active { 
+.calendar thead .active {
 background-color: #d12f19;
 color:#fff;
 padding: 2px 0px 0px 2px;
 }
 
 
-.calendar tbody .day { 
+.calendar tbody .day {
 width:1.8em;
 color: #222;
 text-align: right;
@@ -819,19 +819,19 @@ background: #FFF1AF;
 background: #FFF1AF;
 }
 
-.calendar tbody td.hilite { 
+.calendar tbody td.hilite {
 padding: 1px 1px 1px 1px;
 background:#444 !important;
 color:#fff !important;
 }
 
-.calendar tbody td.active { 
+.calendar tbody td.active {
 color:#fff;
 background: #529214 !important;
 padding: 2px 2px 0px 2px;
 }
 
-.calendar tbody td.selected { 
+.calendar tbody td.selected {
 font-weight: bold;
 border: 1px solid #888;
 padding: 1px 1px 1px 1px;
@@ -839,11 +839,11 @@ background: #f5f5f5 !important;
 color: #222 !important;
 }
 
-.calendar tbody td.weekend { 
+.calendar tbody td.weekend {
 color: #666;
 }
 
-.calendar tbody td.today { 
+.calendar tbody td.today {
 font-weight: bold;
 color: #529214;
 background:#D9EFC2;
@@ -851,21 +851,21 @@ background:#D9EFC2;
 
 .calendar tbody .disabled { color: #999; }
 
-.calendar tbody .emptycell { 
+.calendar tbody .emptycell {
 visibility: hidden;
 }
 
-.calendar tbody .emptyrow { 
+.calendar tbody .emptyrow {
 display: none;
 }
 
-.calendar tfoot .footrow { 
+.calendar tfoot .footrow {
 text-align: center;
 background: #556;
 color: #fff;
 }
 
-.calendar tfoot .ttip { 
+.calendar tfoot .ttip {
 background: #222;
 color: #fff;
 font-size:10px;
@@ -873,14 +873,14 @@ border-top: 1px solid #dedede;
 padding: 3px;
 }
 
-.calendar tfoot .hilite { 
+.calendar tfoot .hilite {
 background: #aaf;
 border: 1px solid #04f;
 color: #000;
 padding: 1px;
 }
 
-.calendar tfoot .active { 
+.calendar tfoot .active {
 background: #77c;
 padding: 2px 0px 0px 2px;
 }