diff --git a/pandora_console/ChangeLog b/pandora_console/ChangeLog
index efe0049a0f..2eba3ea135 100644
--- a/pandora_console/ChangeLog
+++ b/pandora_console/ChangeLog
@@ -1,3 +1,15 @@
+2014-06-13  Alejandro Gallardo <alejandro.gallardo@artica.es>
+	
+	* godmode/agentes/module_manager_editor_plugin.php,
+	  include/javascript/pandora_modules.js: Fixed an error
+	that created duplicated macro fields when selecting
+	a local component module #927.
+	
+	* include/graphs/flot/pandora.flot.js: Now the spacing
+	of the vertical data description is automatic.
+
+	* include/styles/pandora_black.css: Visual changes.
+
 2014-06-13  Sergio Martin <sergio.martin@artica.es>
 
 	* godmode/reporting/visual_console_builder.editor.js
diff --git a/pandora_console/godmode/agentes/module_manager_editor_plugin.php b/pandora_console/godmode/agentes/module_manager_editor_plugin.php
index 42f4cd39a7..a45554a321 100644
--- a/pandora_console/godmode/agentes/module_manager_editor_plugin.php
+++ b/pandora_console/godmode/agentes/module_manager_editor_plugin.php
@@ -99,17 +99,9 @@ if (!empty($macros)) {
 
 ?>
 <script type="text/javascript">
-	var load_module_component = false;
-	
 	function changePluginSelect() {
-		
 		load_plugin_description($("#id_plugin").val());
 		load_plugin_macros_fields('simple-macro');
 		forced_title_callback();
-		
-		//For to avoid the deletion of macros in the code
-		//$("#network_component").change (function () {
-		//In the file pandora_modules.js
-		load_module_component = true;
 	}
 </script>
diff --git a/pandora_console/include/graphs/flot/pandora.flot.js b/pandora_console/include/graphs/flot/pandora.flot.js
index a281408d0b..43e2b1ac0b 100644
--- a/pandora_console/include/graphs/flot/pandora.flot.js
+++ b/pandora_console/include/graphs/flot/pandora.flot.js
@@ -319,7 +319,6 @@ function pandoraFlotVBars(graph_id, values, labels, labels_long, legend, colors,
 					} ],
 			yaxes: [ { 
 					tickFormatter: yFormatter,
-					tickSize: 20,
 					color: '#000'
 					},
 					{
diff --git a/pandora_console/include/javascript/pandora_modules.js b/pandora_console/include/javascript/pandora_modules.js
index b2f5822133..774470eb34 100644
--- a/pandora_console/include/javascript/pandora_modules.js
+++ b/pandora_console/include/javascript/pandora_modules.js
@@ -328,13 +328,9 @@ function configure_modules_form () {
 					}
 				}
 				
-				if (!load_module_component) {
-					// Delete macro fields
-					$('.macro_field').remove();
-					$('#hidden-macros').val('');
-				}
-				load_module_component = false;
-				
+				// Delete macro fields
+				$('.macro_field').remove();
+				$('#hidden-macros').val('');
 				
 				
 				// If exist macros, load the fields
diff --git a/pandora_console/include/styles/pandora_black.css b/pandora_console/include/styles/pandora_black.css
index 72a3356462..f7d6bb05c4 100644
--- a/pandora_console/include/styles/pandora_black.css
+++ b/pandora_console/include/styles/pandora_black.css
@@ -25,7 +25,7 @@ Description: A theme with a dark style
 
 body, body.pure {
 	color: #EEE;
-	background-color: #4b4949;
+	background-color: #BCBCBC;
 
 }
 h1, h2, h3, h4 {
@@ -37,7 +37,7 @@ a {
 a:hover {
 	color: #CCC;
 }
-}
+
 h1#log {
 	color: #FFF;	
 }
@@ -49,14 +49,17 @@ div#head {
 
 div#container, div#page, div#main {
 	background-image: none;
-	background-color: #000;
+	background-color: #5B5B5B;
+}
+div#main {
+	background-color: #474747;
 }
 div#page {
-	border-bottom: solid 5px #001E40;
-	border-top: solid 5px #202020;
+	/*background-color: #ACACAC;*/
 }
 div#foot {
-	background-color: #503030;	
+	border-top: solid 2px #000;
+	background-color: #000;	
 }
 
 input:hover {
@@ -88,15 +91,15 @@ tr.datos2b:hover, tr.datos2_id:hover, tr.datos2f9:hover {
 	background-color: #363636; 
 }
 
-td.datos2 {
-	line-height: 20px;
-	background-color: #1B1B1B;
-	}
-
 td.datos {
 	line-height: 20px;
 	background-color: #0E0E0E;
 }
+
+td.datos2 {
+	line-height: 20px;
+	background-color: #1B1B1B;
+}
 	
 td.datos3 {
 	line-height: 20px;
@@ -144,7 +147,7 @@ div.title_line {
 	background-color: #62606a;
 }
 #menu_tab_left li a, #menu_tab_left li span {
-	background-color: #400027;
+	/*background-color: #400027;*/
 }
 #menu_tab_left li.view a {
 	background-color: #0B315B;
@@ -153,6 +156,10 @@ div.title_line {
 	border: none;
 }
 
+#menu_tab_left ul.mn li.nomn {
+	background-color: #082C43;
+}
+
 .databox {
 	background-color:#030303;
 	color: #fff;
@@ -224,14 +231,14 @@ input.login {
 
 /* Calendar background */
 table.scw {
-        background-color:  #505050;
+	background-color:  #505050;
 }
 
 
-/* Today selector */                                      
+/* Today selector */
 td.scwFoot {
-        background-color: #505050;
-        color: #000;
+	background-color: #505050;
+	color: #000;
 }
 
 
@@ -276,21 +283,24 @@ fieldset legend {
 
 
 #menu_tab_frame_view {
-	background: #333333 !important;
+	display: block !important;
+	background-color: #5B5B5B;
+	border-bottom: 1px solid #6db431;
+	margin-left:-8px;
+	min-height:25px;
+	/*padding-right:28px;*/
+	width:100%;
 }
 
 
 /* Godmode */
 #menu_tab_frame {
-	background: #082C43 !important;
-}
-
-#menu_tab_frame, #menu_tab_frame_view {
 	display: block !important;
+	background-color: #5B5B5B;
 	border-bottom: 1px solid #082C43;
 	margin-left:-8px;
 	min-height:25px;
-	padding-right:28px;
+	/*padding-right:28px;*/
 	width:100%;
 }
 
@@ -299,7 +309,7 @@ fieldset legend {
 }
 
 .is_submenu2 {
-   background-color: #222222 !important;
+	background-color: #222222 !important;
 }
 
 .menu ul {