diff --git a/pandora_console/godmode/modules/manage_network_components.php b/pandora_console/godmode/modules/manage_network_components.php
index a3050f02e9..7ef20ca385 100644
--- a/pandora_console/godmode/modules/manage_network_components.php
+++ b/pandora_console/godmode/modules/manage_network_components.php
@@ -949,30 +949,20 @@ html_print_action_buttons(
 ?>
 <script type="text/javascript">
     $( document ).ready(function() {
-        $('[id^=checkbox-delete_multiple]').change(function(){
-            if($(this).parent().parent().hasClass('checkselected')){
-                $(this).parent().parent().removeClass('checkselected');
-            }
-            else{
-                $(this).parent().parent().addClass('checkselected');
+        $('[id^=checkbox-delete_multiple]').click(function(){
+            if($(this).prop("checked") === false ){
+                $(this).prop("checked", false);
+            } else {
+                $(this).prop("checked", true);
             }
         });
 
-        $('[id^=checkbox-all_delete]').change(function(){
-            if ($("#checkbox-all_delete").prop("checked")) {
-                $('[id^=checkbox-delete_multiple]')
-                    .parent()
-                    .parent()
-                    .addClass('checkselected');
-                $(".check_delete")
-                    .prop("checked", true);
+        $('#checkbox-all_delete').click(function(){
+            if ($("#checkbox-all_delete").prop("checked") === true) {
+                $("[id^=checkbox-delete_multiple]").prop("checked", true);
             }
             else{
-                $('[id^=checkbox-delete_multiple]')
-                    .parent()
-                    .parent()
-                    .removeClass('checkselected');
-                $(".check_delete").prop("checked", false);
+                $("[id^=checkbox-delete_multiple]").prop("checked", false);
             }
         });
     });
diff --git a/pandora_console/godmode/modules/manage_network_components_form.php b/pandora_console/godmode/modules/manage_network_components_form.php
index f4c7d3776a..427d8295f7 100644
--- a/pandora_console/godmode/modules/manage_network_components_form.php
+++ b/pandora_console/godmode/modules/manage_network_components_form.php
@@ -366,43 +366,43 @@ if (is_metaconsole() === true) {
 
 html_print_table($table);
 
-html_print_input_hidden('id_component_type', $id_component_type);
+$buttons = html_print_input_hidden('id_component_type', $id_component_type);
 if ($id) {
-    html_print_input_hidden('update_component', 1);
-    html_print_input_hidden('id', $id);
+    $buttons .= html_print_input_hidden('update_component', 1, true);
+    $buttons .= html_print_input_hidden('id', $id, true);
     $buttonCaption = __('Update');
     $buttonIcon = 'update';
     $buttonName = 'upd';
-    html_print_submit_button(__('Update'), 'upd', false, 'class="sub upd"');
 } else {
-    html_print_input_hidden('create_component', 1);
-    html_print_input_hidden('create_network_from_module', 0);
+    $buttons .= html_print_input_hidden('create_component', 1, true);
+    $buttons .= html_print_input_hidden('create_network_from_module', 0, true);
     $buttonCaption = __('Create');
     $buttonIcon = 'wand';
     $buttonName = 'crt';
 }
 
-html_print_div(
+$buttons .= html_print_submit_button(
+    $buttonCaption,
+    $buttonName,
+    false,
+    ['icon' => $buttonIcon],
+    true
+);
+
+$buttons .= html_print_button(
+    __('Go back'),
+    'go_back',
+    false,
+    '',
     [
-        'class'   => 'action-buttons',
-        'content' => html_print_button(
-            __('Go back'),
-            'go_back',
-            false,
-            '',
-            [
-                'icon' => 'back',
-                'mode' => 'secondary',
-            ],
-            true
-        ).html_print_submit_button(
-            $buttonCaption,
-            $buttonName,
-            false,
-            ['icon' => $buttonIcon],
-            true
-        ),
-    ]
+        'icon' => 'back',
+        'mode' => 'secondary',
+    ],
+    true
+);
+
+html_print_action_buttons(
+    $buttons
 );
 
 echo '</form>';