diff --git a/pandora_console/extensions/quick_shell.php b/pandora_console/extensions/quick_shell.php
index 13924f56e2..a286ce4b95 100644
--- a/pandora_console/extensions/quick_shell.php
+++ b/pandora_console/extensions/quick_shell.php
@@ -442,25 +442,31 @@ function quickShellSettings()
                     ],
                 ],
                 [
-                    'label'     => __('Gotty user').ui_print_help_tip(
-                        __('Optional, set a user to access gotty service'),
-                        true
-                    ),
-                    'arguments' => [
-                        'type'  => 'text',
-                        'name'  => 'gotty_user',
-                        'value' => $config['gotty_user'],
-                    ],
-                ],
-                [
-                    'label'     => __('Gotty password').ui_print_help_tip(
-                        __('Optional, set a password to access gotty service'),
-                        true
-                    ),
-                    'arguments' => [
-                        'type'  => 'password',
-                        'name'  => 'gotty_pass',
-                        'value' => io_output_password($config['gotty_pass']),
+                    'toggle'        => true,
+                    'toggle_name'   => 'Advanced',
+                    'block_content' => [
+                        [
+                            'label'     => __('Gotty user').ui_print_help_tip(
+                                __('Optional, set a user to access gotty service'),
+                                true
+                            ),
+                            'arguments' => [
+                                'type'  => 'text',
+                                'name'  => 'gotty_user',
+                                'value' => $config['gotty_user'],
+                            ],
+                        ],
+                        [
+                            'label'     => __('Gotty password').ui_print_help_tip(
+                                __('Optional, set a password to access gotty service'),
+                                true
+                            ),
+                            'arguments' => [
+                                'type'  => 'password',
+                                'name'  => 'gotty_pass',
+                                'value' => io_output_password($config['gotty_pass']),
+                            ],
+                        ],
                     ],
                 ],
                 [
diff --git a/pandora_console/godmode/wizards/Wizard.main.php b/pandora_console/godmode/wizards/Wizard.main.php
index 6f1d59d56b..30b0706342 100644
--- a/pandora_console/godmode/wizards/Wizard.main.php
+++ b/pandora_console/godmode/wizards/Wizard.main.php
@@ -458,6 +458,7 @@ class Wizard
 
         if (is_array($input['block_content']) === true) {
             $direct = (bool) $input['direct'];
+            $toggle = (bool) $input['toggle'];
 
             // Print independent block of inputs.
             $output .= '<li id="li-'.$input['block_id'].'" class="'.$class.'">';
@@ -471,14 +472,37 @@ class Wizard
                 $output .= '<ul class="wizard '.$input['block_class'].'">';
             }
 
-            foreach ($input['block_content'] as $input) {
-                $output .= $this->printBlock(
-                    $input,
+            $html = '';
+
+            foreach ($input['block_content'] as $in) {
+                $html .= $this->printBlock(
+                    $in,
                     $return,
                     (bool) $direct
                 );
             }
 
+            if ($toggle === true) {
+                $output .= ui_print_toggle(
+                    [
+                        'name'            => (isset($input['toggle_name']) ? $input['toggle_name'] : 'toggle_'.uniqid()),
+                        'content'         => $html,
+                        'title'           => $input['toggle_title'],
+                        'id'              => $input['toggle_id'],
+                        'hidden_default'  => $input['toggle_hidden_default'],
+                        'return'          => (isset($input['toggle_return']) ? $input['toggle_return'] : true),
+                        'toggle_class'    => $input['toggle_toggle_class'],
+                        'main_class'      => $input['toggle_main_class'],
+                        'container_class' => $input['toggle_container_class'],
+                        'img_a'           => $input['toggle_img_a'],
+                        'img_b'           => $input['toggle_img_b'],
+                        'clean'           => (isset($input['toggle_clean']) ? $input['toggle_clean'] : true),
+                    ]
+                );
+            } else {
+                $output .= $html;
+            }
+
             // Close block.
             if (!$direct) {
                 $output .= '</ul>';
diff --git a/pandora_console/include/functions_ui.php b/pandora_console/include/functions_ui.php
index 0ad31cf931..0e1c9e09c0 100755
--- a/pandora_console/include/functions_ui.php
+++ b/pandora_console/include/functions_ui.php
@@ -3667,6 +3667,7 @@ function ui_print_event_priority(
  * @param string  $main_class      Main object class.
  * @param string  $img_a           Image (closed).
  * @param string  $img_b           Image (opened).
+ * @param string  $clean           Do not encapsulate with class boxes, clean print.
  *
  * @return string HTML.
  */
@@ -3681,7 +3682,8 @@ function ui_toggle(
     $container_class='white-box-content',
     $main_class='box-shadow white_table_graph',
     $img_a='images/arrow_down_green.png',
-    $img_b='images/arrow_right_green.png'
+    $img_b='images/arrow_right_green.png',
+    $clean=false
 ) {
     // Generate unique Id.
     $uniqid = uniqid('');
@@ -3697,9 +3699,17 @@ function ui_toggle(
         $original = $img_a;
     }
 
+    $header_class = '';
+    if ($clean === false) {
+        $header_class = 'white_table_graph_header';
+    } else {
+        $main_class = '';
+        $container_class = 'white-box-content-clean';
+    }
+
     // Link to toggle.
     $output = '<div class="'.$main_class.'" id="'.$id.'">';
-    $output .= '<div class="white_table_graph_header" style="cursor: pointer;" id="tgl_ctrl_'.$uniqid.'">'.html_print_image(
+    $output .= '<div class="'.$header_class.'" style="cursor: pointer;" id="tgl_ctrl_'.$uniqid.'">'.html_print_image(
         $original,
         true,
         [
@@ -3767,7 +3777,8 @@ function ui_print_toggle($data)
         (isset($data['container_class']) === true) ? $data['container_class'] : 'white-box-content',
         (isset($data['main_class']) === true) ? $data['main_class'] : 'box-shadow white_table_graph',
         (isset($data['img_a']) === true) ? $data['img_a'] : 'images/arrow_down_green.png',
-        (isset($data['img_b']) === true) ? $data['img_b'] : 'images/arrow_right_green.png'
+        (isset($data['img_b']) === true) ? $data['img_b'] : 'images/arrow_right_green.png',
+        (isset($data['clean']) === true) ? $data['clean'] : false
     );
 }
 
diff --git a/pandora_console/include/styles/pandora.css b/pandora_console/include/styles/pandora.css
index aba0f03a81..acdfd7a981 100644
--- a/pandora_console/include/styles/pandora.css
+++ b/pandora_console/include/styles/pandora.css
@@ -5700,6 +5700,10 @@ div#status_pie {
   padding: 1em;
   min-width: 100%;
 }
+.white-box-content-clean {
+  padding-left: 2em;
+  padding-top: 1em;
+}
 
 .white_table_graph_content {
   border: 1px solid #e2e2e2;