diff --git a/pandora_console/godmode/servers/discovery.php b/pandora_console/godmode/servers/discovery.php
index 8e50b24e8f..235ae01e78 100755
--- a/pandora_console/godmode/servers/discovery.php
+++ b/pandora_console/godmode/servers/discovery.php
@@ -79,24 +79,12 @@ if ($classname_selected !== null) {
 
 if ($classname_selected === null) {
     // Load classes and print selector.
-    echo '<ul>';
+    $wiz_data = [];
     foreach ($classes as $classpath) {
         $classname = basename($classpath, '.class.php');
         $obj = new $classname();
-        $wiz_data = $obj->load();
-        ?>
-
-    <li class="discovery">
-        <a href="<?php echo $wiz_data['url']; ?>">
-            <div class="data_container">
-                <?php html_print_image($wiz_data['icon']); ?>
-                <br><label id="text_wizard"><?php echo io_safe_output($wiz_data['label']); ?></label>
-            </div>
-        </a>
-    </li>
-
-        <?php
+        $wiz_data[] = $obj->load();
     }
 
-    echo '</ul>';
+    Wizard::printBigButtonsList($wiz_data);
 }
diff --git a/pandora_console/godmode/wizards/Wizard.main.php b/pandora_console/godmode/wizards/Wizard.main.php
index ecc253ad04..709e601fa5 100644
--- a/pandora_console/godmode/wizards/Wizard.main.php
+++ b/pandora_console/godmode/wizards/Wizard.main.php
@@ -467,4 +467,44 @@ class Wizard
     }
 
 
+    /**
+     * Print a big button element (huge image, big text and link).
+     *
+     * @param array $data Element data (link, image...).
+     *
+     * @return void Only prints the element.
+     */
+    public static function printBigButtonElement($data)
+    {
+        if (isset($data['url']) === false) {
+            $data['url'] = '#';
+        }
+
+        ?>
+        <li class="discovery">
+            <a href="<?php echo $data['url']; ?>">
+                <div class="data_container">
+                    <?php html_print_image($data['icon']); ?>
+                    <br><label id="text_wizard">
+                        <?php echo io_safe_output($data['label']); ?>
+                    </label>
+                </div>
+            </a>
+        </li>
+        <?php
+    }
+
+
+    /**
+     * Print a list of big buttons elements.
+     *
+     * @param array $list_data Array of data for printBigButtonElement.
+     *
+     * @return void Print the full list.
+     */
+    public static function printBigButtonsList($list_data) {
+        echo '<ul>';
+        array_map('self::printBigButtonElement', $list_data);
+        echo '</ul>';
+    }
 }