diff --git a/pandora_console/godmode/agentes/module_manager_editor_common.php b/pandora_console/godmode/agentes/module_manager_editor_common.php
index 15620240cd..47c843f2d9 100644
--- a/pandora_console/godmode/agentes/module_manager_editor_common.php
+++ b/pandora_console/godmode/agentes/module_manager_editor_common.php
@@ -1131,13 +1131,13 @@ if (isset($id_agente) === true && (int) $moduletype === MODULE_DATA) {
     $tableCron->data['cron_to_select'][0] = html_print_extended_select_for_cron($hour_to, $minute_to, $mday_to, $month_to, $wday_to, true, $disabledBecauseInPolicy, true);
 }
 
-$table_advanced->rowclass['cron_section'] = 'table_section full_section';
+$table_advanced->rowclass['cron_section'] = 'table_section full_section mrgn_top_mod_0px';
 $table_advanced->data['cron_section'] = html_print_table($tableCron, true);
 
 $table_advanced->data['title_3'] = html_print_subtitle_table(__('Thresholds and state changes'));
 
 $table_advanced->rowclass['caption_min_max_values'] = 'w50p pdd_t_10px';
-$table_advanced->rowclass['min_max_values'] = 'w50p';
+$table_advanced->rowclass['min_max_values'] = 'w50p pdd_b_10px';
 $table_advanced->data['caption_min_max_values'][0] = __('Min. Value');
 $table_advanced->data['caption_min_max_values'][1] = __('Max. Value');
 
@@ -1214,7 +1214,7 @@ $tableDynamicThreshold->data['adv_dynamic_threshold_twotailed'][0] = html_print_
     $disabledBecauseInPolicy
 );
 
-$table_advanced->rowclass['dynamic_threshold_table'] = 'table_section full_section';
+$table_advanced->rowclass['dynamic_threshold_table'] = 'table_section full_section mrgn_top_mod_0px';
 $table_advanced->data['dynamic_threshold_table'] = html_print_table($tableDynamicThreshold, true);
 
 $tableFFThreshold = new stdClass();
@@ -1304,10 +1304,15 @@ $tableFFThreshold->data['ff_thresholds_each'][2] = html_print_input_text(
     $classdisabledBecauseInPolicy
 );
 
+$table_advanced->rowclass['gap_flipflop'] = 'mrgn_top_btn_10px_imp';
+$table_advanced->data['gap_flipflop'] = html_print_input_hidden('gap_flipflop', 0);
 
-$table_advanced->rowclass['flipflop_thresholds_table'] = 'table_section full_section';
+$table_advanced->rowclass['flipflop_thresholds_table'] = 'table_section full_section mrgn_top_mod_0px';
 $table_advanced->data['flipflop_thresholds_table'] = html_print_table($tableFFThreshold, true);
 
+$table_advanced->rowclass['gap_ff'] = 'mrgn_top_btn_10px_imp';
+$table_advanced->data['gap_ff'] = html_print_input_hidden('gap_ff', 0);
+
 $table_advanced->rowclass['caption_ff_interval_timeout'] = 'w50p';
 $table_advanced->rowclass['ff_interval_timeout'] = 'w50p';
 $table_advanced->cellclass['caption_ff_interval_timeout'][0] = 'w50p';
diff --git a/pandora_console/include/styles/pandora.css b/pandora_console/include/styles/pandora.css
index 5180f12f19..9d69a426a1 100644
--- a/pandora_console/include/styles/pandora.css
+++ b/pandora_console/include/styles/pandora.css
@@ -7065,6 +7065,10 @@ div.graph div.legend table {
   margin: 0 1em 0 2em;
 }
 
+.mrgn_top_btn_10px_imp {
+  margin: 10px 0 10px 0 !important;
+}
+
 /*
 * MARGIN LEFT
 */
@@ -7226,6 +7230,10 @@ div.graph div.legend table {
   margin-top: 0px;
 }
 
+.mrgn_top_mod_0px {
+  margin-top: 0px !important;
+}
+
 .mrgn_top_5px {
   margin-top: 5px;
 }