diff --git a/pandora_console/ChangeLog b/pandora_console/ChangeLog
index fe658f273a..382792cacb 100644
--- a/pandora_console/ChangeLog
+++ b/pandora_console/ChangeLog
@@ -1,3 +1,9 @@
+2010-04-14 Sergio Martin <sergio.martin@artica.es>
+
+	* godmode/alerts/alert_list.php,
+	godmode/alerts/alert_list.list.php: Changed a button between the files 
+	  to clean source code 
+
 2010-04-14 Sergio Martin <sergio.martin@artica.es>
 
 	* godmode/reporting/map_builder.php: Added Delete visual console
diff --git a/pandora_console/godmode/alerts/alert_list.list.php b/pandora_console/godmode/alerts/alert_list.list.php
index b3fa9cd07e..38360e0284 100644
--- a/pandora_console/godmode/alerts/alert_list.list.php
+++ b/pandora_console/godmode/alerts/alert_list.list.php
@@ -90,6 +90,7 @@ echo "<div id='alert_control' style='display:none'>\n";
 	echo "</table>\n";
 	echo "</form>\n";
 echo "</div>\n";
+
 //END DIV OF FORM FILTER
 
 $simple_alerts = array();
@@ -336,6 +337,13 @@ print_submit_button (__('Add'), 'add_action', false, 'class="sub next"');
 echo '</div>';
 echo '</form>';
 
+// Create alert button
+echo '<div class="action-buttons" style="width: '.$table->width.'">';
+echo '<form method="post" action="index.php?sec=galertas&sec2=godmode/alerts/alert_list&tab=builder">';
+print_submit_button (__('Create'), 'crtbtn', false, 'class="sub next"');
+echo '</form>';
+echo '</div>';
+
 require_css_file ('cluetip');
 require_jquery_file ('cluetip');
 require_jquery_file ('pandora.controls');
@@ -446,4 +454,4 @@ $(document).ready (function () {
 	});
 });
 /* ]]> */
-</script>
\ No newline at end of file
+</script>
diff --git a/pandora_console/godmode/alerts/alert_list.php b/pandora_console/godmode/alerts/alert_list.php
index 65d99be1ac..cddedbb47b 100644
--- a/pandora_console/godmode/alerts/alert_list.php
+++ b/pandora_console/godmode/alerts/alert_list.php
@@ -192,12 +192,6 @@ else {
 			$agents = get_group_agents (array_keys ($groups), false, "none");
 			
 			require_once('godmode/alerts/alert_list.list.php');
-			
-			echo '<div class="action-buttons" style="width: '.$table->width.'">';
-			echo '<form method="post" action="index.php?sec=galertas&sec2=godmode/alerts/alert_list&tab=builder">';
-			print_submit_button (__('Create'), 'crtbtn', false, 'class="sub next"');
-			echo '</form>';
-			echo '</div>';
 
 			return;
 			break;