diff --git a/pandora_console/godmode/setup/setup_visuals.php b/pandora_console/godmode/setup/setup_visuals.php
index 8419d7cc33..831417c13b 100644
--- a/pandora_console/godmode/setup/setup_visuals.php
+++ b/pandora_console/godmode/setup/setup_visuals.php
@@ -400,12 +400,33 @@ $table->data[$row][1] = html_print_input_text ('networkmap_max_width', $config["
 $row++;
 
 $table->data[$row][0] = __('Fixed header');
-$table->data[$row][1] = html_print_checkbox('fixed_header', 1, $config['fixed_header'], true);
+$table->data[$row][1] = __('Yes') . ' ' .
+	html_print_radio_button ('fixed_header', 1, '', $config["fixed_header"], true) .
+	'  ';
+$table->data[$row][1] .= __('No') . ' ' .
+	html_print_radio_button ('fixed_header', 0, '', $config["fixed_header"], true);
 
 $row++;
 
 $table->data[$row][0] = __('Fixed menu');
-$table->data[$row][1] = html_print_checkbox('fixed_menu', 1, $config['fixed_menu'], true);
+$table->data[$row][1] = __('Yes') . ' ' .
+	html_print_radio_button ('fixed_menu', 1, '', $config["fixed_menu"], true) .
+	'  ';
+$table->data[$row][1] .= __('No') . ' ' .
+	html_print_radio_button ('fixed_menu', 0, '', $config["fixed_menu"], true);
+
+$row++;
+
+if (!isset($config["short_module_graph_data"]))
+	$config["short_module_graph_data"] = true;
+
+$table->data[$row][0] = __('Shortened module graph data');
+$table->data[$row][0] .= ui_print_help_tip(__('The data number of the module graphs will be rounded and shortened'), true);
+$table->data[$row][1] = __('Yes') . ' ' .
+	html_print_radio_button ('short_module_graph_data', 1, '', $config["short_module_graph_data"], true) .
+	'  ';
+$table->data[$row][1] .= __('No') . ' ' .
+	html_print_radio_button ('short_module_graph_data', 0, '', $config["short_module_graph_data"], true);
 
 $row++;
 
diff --git a/pandora_console/include/functions_config.php b/pandora_console/include/functions_config.php
index eceb41f5ea..8cc9d1864b 100644
--- a/pandora_console/include/functions_config.php
+++ b/pandora_console/include/functions_config.php
@@ -447,6 +447,8 @@ function config_update_config () {
 						$error_update[] = __('Custom graphviz directory');
 					if (!config_update_value ('networkmap_max_width', get_parameter('networkmap_max_width')))
 						$error_update[] = __('Networkmap max width');
+					if (!config_update_value ('short_module_graph_data', get_parameter('short_module_graph_data')))
+						$error_update[] = __('Shortened module graph data');
 					
 					$interval_values = get_parameter ('interval_values');
 					
diff --git a/pandora_console/include/functions_custom_graphs.php b/pandora_console/include/functions_custom_graphs.php
index f4bc30d104..f0e03d935a 100644
--- a/pandora_console/include/functions_custom_graphs.php
+++ b/pandora_console/include/functions_custom_graphs.php
@@ -162,8 +162,8 @@ function custom_graphs_get_user ($id_user = 0, $only_names = false, $returnAllGr
 function custom_graphs_print($id_graph, $height, $width, $period,
 	$stacked = null, $return = false, $date = 0, $only_image = false,
 	$background_color = 'white', $modules_param = array(), $homeurl = '',
-	$name_list = array(), $show_last = true, $show_max = true,
-	$show_min = true, $show_avg = true) {
+	$name_list = array(), $unit_list = array(), $show_last = true,
+	$show_max = true, $show_min = true, $show_avg = true) {
 	
 	global $config;
 	
@@ -227,6 +227,7 @@ function custom_graphs_print($id_graph, $height, $width, $period,
 		false,
 		$background_color,
 		$name_list,
+		$unit_list,
 		$show_last,
 		$show_max,
 		$show_min,
diff --git a/pandora_console/include/functions_graph.php b/pandora_console/include/functions_graph.php
index f66640f036..7d54e946cf 100755
--- a/pandora_console/include/functions_graph.php
+++ b/pandora_console/include/functions_graph.php
@@ -855,6 +855,7 @@ function graph_get_formatted_date($timestamp, $format1, $format2) {
  * @param mixed If is a projection graph this parameter will be module data with prediction data (the projection) 
  * or false in other case.
  * @param array List of names for the items. Should have the same size as the module list.
+ * @param array List of units for the items. Should have the same size as the module list.
  * @param bool Show the last value of the item on the list.
  * @param bool Show the max value of the item on the list.
  * @param bool Show the min value of the item on the list.
@@ -867,7 +868,7 @@ function graphic_combined_module ($module_list, $weight_list, $period,
 	$show_alerts = 0, $pure = 0, $stacked = 0, $date = 0,
 	$only_image = false, $homeurl = '', $ttl = 1, $projection = false,
 	$prediction_period = false, $background_color = 'white',
-	$name_list = array(), $show_last = true, $show_max = true,
+	$name_list = array(), $unit_list = array(), $show_last = true, $show_max = true,
 	$show_min = true, $show_avg = true) {
 	
 	global $config;
@@ -935,6 +936,9 @@ function graphic_combined_module ($module_list, $weight_list, $period,
 	else {
 		$module_number = count ($module_list);
 	}
+
+	$names_number = count($name_list);
+	$units_number = count($unit_list);
 	
 	// interval - This is the number of "rows" we are divided the time to fill data.
 	//    more interval, more resolution, and slower.
@@ -978,7 +982,7 @@ function graphic_combined_module ($module_list, $weight_list, $period,
 		if ($projection != false && $i != 0) {
 			$agent_module_id = $module_list[0];
 			
-			if (!empty($name_list) && isset($name_list[$i])) {
+			if (!empty($name_list) && $names_number == $module_number && isset($name_list[$i])) {
 				$module_name_list[$i] = $name_list[$i];
 			}
 			else {
@@ -1007,7 +1011,7 @@ function graphic_combined_module ($module_list, $weight_list, $period,
 		else {
 			$agent_module_id = $module_list[$i];
 			
-			if (!empty($name_list) && isset($name_list[$i])) {
+			if (!empty($name_list) && $names_number == $module_number && isset($name_list[$i])) {
 				$module_name_list[$i] = $name_list[$i];
 			}
 			else {
@@ -1216,23 +1220,61 @@ function graphic_combined_module ($module_list, $weight_list, $period,
 		$avg = round($avg / $countAvg, 1);
 		
 		$graph_stats = get_graph_statistics($graph_values[$i]);
+
+		if (!isset($config["short_module_graph_data"]))
+			$config["short_module_graph_data"] = true;
 		
-		$min = number_format($graph_stats['min'], 2);
-		$max = number_format($graph_stats['max'], 2);
-		$avg = number_format($graph_stats['avg'], 2);
-		$last = number_format($graph_stats['last'], 2);
-		$units = modules_get_unit($agent_module_id);
+		if ($config["short_module_graph_data"]) {
+			$min = $graph_stats['min'];
+			$max = $graph_stats['max'];
+			$avg = $graph_stats['avg'];
+			$last = $graph_stats['last'];
+			
+			if ($min > 1000000)
+				$min = sprintf("%sM", number_format($min / 1000000, 2));
+			else if ($min > 1000)
+				$min = sprintf("%sK", number_format($min / 1000, 2));
+
+			if ($max > 1000000)
+				$max = sprintf("%sM", number_format($max / 1000000, 2));
+			else if ($max > 1000)
+				$max = sprintf("%sK", number_format($max / 1000, 2));
+
+			if ($avg > 1000000)
+				$avg = sprintf("%sM", number_format($avg / 1000000, 2));
+			else if ($avg > 1000)
+				$avg = sprintf("%sK", number_format($avg / 1000, 2));
+
+			if ($last > 1000000)
+				$last = sprintf("%sM", number_format($last / 1000000, 2));
+			else if ($last > 1000)
+				$last = sprintf("%sK", number_format($last / 1000, 2));
+		}
+		else {
+			$min = number_format($graph_stats['min'], 2);
+			$max = number_format($graph_stats['max'], 2);
+			$avg = number_format($graph_stats['avg'], 2);
+			$last = number_format($graph_stats['last'], 2);
+		}
+		
+
+		if (!empty($unit_list) && $units_number == $module_number && isset($unit_list[$i])) {
+			$unit = $unit_list[$i];
+		}
+		else {
+			$unit = modules_get_unit($agent_module_id);
+		}
 		
 		if ($projection == false or ($projection != false and $i == 0)) {
 			$module_name_list[$i] .= ": ";
 			if ($show_last)
-				$module_name_list[$i] .= __('Last') . ": $last $units; ";
+				$module_name_list[$i] .= __('Last') . ": $last $unit; ";
 			if ($show_max)
-				$module_name_list[$i] .= __("Max") . ": $max $units; ";
+				$module_name_list[$i] .= __("Max") . ": $max $unit; ";
 			if ($show_min)
-				$module_name_list[$i] .= __("Min") . ": $min $units; ";
+				$module_name_list[$i] .= __("Min") . ": $min $unit; ";
 			if ($show_avg)
-				$module_name_list[$i] .= __("Avg") . ": $avg $units";
+				$module_name_list[$i] .= __("Avg") . ": $avg $unit";
 		}
 		
 		if ($weight_list[$i] != 1) {
diff --git a/pandora_console/operation/agentes/interface_traffic_graph_win.php b/pandora_console/operation/agentes/interface_traffic_graph_win.php
index 5daf30f11b..b7826ccd14 100644
--- a/pandora_console/operation/agentes/interface_traffic_graph_win.php
+++ b/pandora_console/operation/agentes/interface_traffic_graph_win.php
@@ -147,6 +147,7 @@ $interface_traffic_modules = array(
 			array_values($interface_traffic_modules),
 			$config['homeurl'],
 			array_keys($interface_traffic_modules),
+			array_fill(0, count($interface_traffic_modules),"bytes/s"),
 			false);
 		
 		echo '</div>';