diff --git a/pandora_console/include/class/HTML.class.php b/pandora_console/include/class/HTML.class.php
index e122e71fad..d3bf4f4f3d 100644
--- a/pandora_console/include/class/HTML.class.php
+++ b/pandora_console/include/class/HTML.class.php
@@ -803,6 +803,7 @@ class HTML
                 $output_head .= 'id="'.$form['id'].'" ';
             }
 
+            $output_head .= 'class="max_floating_element_size " ';
             if (isset($form['class']) === true) {
                 $output_head .= 'class="discovery '.$form['class'].'" ';
             }
@@ -870,7 +871,7 @@ class HTML
             $output .= '</div>';
         } else {
             if ($print_white_box === true) {
-                $output .= '<div class="white_box">';
+                $output .= '<div class="white_box pdd_15px">';
             }
 
             $output .= '<ul class="wizard">';
@@ -1077,7 +1078,7 @@ class HTML
         $cb_function = $data['cb_function'];
         $cb_args = $data['cb_args'];
 
-        $output_head = '<form class="discovery" onsubmit="'.$form['onsubmit'].'" enctype="'.$form['enctype'].'" action="'.$form['action'].'" method="'.$form['method'];
+        $output_head = '<form class="discovery max_floating_element_size" onsubmit="'.$form['onsubmit'].'" enctype="'.$form['enctype'].'" action="'.$form['action'].'" method="'.$form['method'];
         $output_head .= '" '.$form['extra'].'>';
 
         if ($return === false) {
@@ -1095,7 +1096,7 @@ class HTML
             error_log('Error executing wizard callback: ', $e->getMessage());
         }
 
-        $output = '<div class="white_box">';
+        $output = '<div class="white_box pdd_15px">';
         $output .= '<ul class="wizard">';
 
         foreach ($inputs as $input) {
diff --git a/pandora_console/include/styles/tables.css b/pandora_console/include/styles/tables.css
index d7cab7390a..fa48186a7e 100644
--- a/pandora_console/include/styles/tables.css
+++ b/pandora_console/include/styles/tables.css
@@ -658,10 +658,12 @@ td#save_filter_form-3-0 > span {
   width: 300px !important;
 }
 
+div.white_box > ul > li,
 div.filter-datatable-submain > form > ul > li {
   display: grid;
 }
 
+div.white_box > ul > li > label,
 div.filter-datatable-submain > form > ul > li > label {
   margin-bottom: 10px;
   font-weight: bold;
diff --git a/pandora_console/include/styles/wizard.css b/pandora_console/include/styles/wizard.css
index 7d0004c05a..ab5d011f70 100644
--- a/pandora_console/include/styles/wizard.css
+++ b/pandora_console/include/styles/wizard.css
@@ -37,9 +37,9 @@ ul.wizard li > label:not(.p-switch):first-of-type {
   display: inline-block;
 }
 
-ul.wizard li > label:not(.p-switch):not(:first-of-type) {
+/* ul.wizard li > label:not(.p-switch):not(:first-of-type) {
   margin-left: 1em;
-}
+} */
 
 .select2.select2-container {
   min-width: 200px;