diff --git a/resources/views/module_update.phtml b/resources/views/module_update.phtml
index 17daf87..c8795e5 100644
--- a/resources/views/module_update.phtml
+++ b/resources/views/module_update.phtml
@@ -100,7 +100,7 @@ $data_colums[] = ['type' => 'html', 'searchable' => false];
 $data_colums[] = ['type' => 'html', 'searchable' => false];
 
 
-// Initial sorting of table by install column 
+// Initial sorting of table by install column
 // This value is only reset in the browser after browser data is deleted in browser settings
 $order = [[$sort_column, 'desc']];
 
@@ -142,286 +142,288 @@ $order = [[$sort_column, 'desc']];
 </a>
 
 <form method="post" action="<?= e(route(CustomModuleActivateAction::class)) ?>">
-    <table
-        id="wt-datatables-custom-module-manager-updates"
-        class="table table-bordered table-hover table-sm table-module-administration datatables"
-        <?= view('lists/datatables-attributes') ?>
-        data-info="false"
-        data-paging="false"
-        data-filter="true"
-        data-layout='{"topEnd":"search"}'
-        data-columns="<?= e(json_encode($data_colums, JSON_THROW_ON_ERROR)) ?>"
-        data-order="<?= e(json_encode($order, JSON_THROW_ON_ERROR)) ?>"
-    >
-        <caption class="visually-hidden">
-            <?= $caption ?? I18N::translate('Module Updates') ?>
-        </caption>
-
-        <thead>
-            <tr>
-                <th><?= MoreI18N::xlate('Title') ?></th>
-                <?php if ($show_column_description) : ?>
-                    <th><?= MoreI18N::xlate('Description') ?></th>
-                <?php endif ?>                    
-                <th><?= I18N::translate('Folder (within modules_v4)') ?></th>
-                <?php if ($show_column_category) : ?>
-                    <th><?= MoreI18N::xlate('Category') ?></th>
-                <?php endif ?>                    
-                <?php if ($show_column_date_added) : ?>
-                    <th><?= I18N::translate('Date Added') ?></th>
-                <?php endif ?>                    
-                <th><?= I18N::translate('Current Version') ?></th>
-                <th><?= I18N::translate('Latest Version') ?></th>
-                <?php if ($show_column_update_service) : ?>
-                    <th><?= I18N::translate('Update Service') ?></th>
-                <?php endif ?>                    
-                <?php if ($show_column_downloads) : ?>
-                    <th><?= I18N::translate('Down-loads') ?></th>
-                <?php endif ?>                    
-                <?php if ($show_column_enabled) : ?>
-                    <th><?= MoreI18N::xlate('Enabled') ?></th>
-                <?php endif ?>                    
-                <th><?= I18N::translate('Install') ?></th>
-                <th><?= MoreI18N::xlate('Delete') ?></th>
-            </tr>
-        </thead>
-
-        <tbody>
-            <?php foreach ($module_names as $module_name => $standard_module_name) : ?>
-                <?php $module = $module_service->findByName($module_name, true) ?>
-                <?php if ($module === null) : ?>
-                    <?php if ($modules_to_show === CustomModuleManager::PREF_SHOW_INSTALLED) : ?><?php continue ?><?php endif ?>	
-                    <?php $module_status = I18N::translate('Not installed') ?>
-                <?php else : ?>
-                    <?php if ($modules_to_show === CustomModuleManager::PREF_SHOW_NOT_INSTALLED) : ?><?php continue ?><?php endif ?>						
-                    <?php if ($module->isEnabled()) : ?>
-                        <?php $module_status = '1' ?>
+    <div class="table-responsive">
+        <table
+            id="wt-datatables-custom-module-manager-updates"
+            class="table table-bordered table-hover table-sm table-module-administration datatables"
+            <?= view('lists/datatables-attributes') ?>
+            data-info="false"
+            data-paging="false"
+            data-filter="true"
+            data-layout='{"topEnd":"search"}'
+            data-columns="<?= e(json_encode($data_colums, JSON_THROW_ON_ERROR)) ?>"
+            data-order="<?= e(json_encode($order, JSON_THROW_ON_ERROR)) ?>"
+        >
+            <caption class="visually-hidden">
+                <?= $caption ?? I18N::translate('Module Updates') ?>
+            </caption>
+
+            <thead>
+                <tr>
+                    <th><?= MoreI18N::xlate('Title') ?></th>
+                    <?php if ($show_column_description) : ?>
+                        <th><?= MoreI18N::xlate('Description') ?></th>
+                    <?php endif ?>
+                    <th><?= I18N::translate('Folder (within modules_v4)') ?></th>
+                    <?php if ($show_column_category) : ?>
+                        <th><?= MoreI18N::xlate('Category') ?></th>
+                    <?php endif ?>
+                    <?php if ($show_column_date_added) : ?>
+                        <th><?= I18N::translate('Date Added') ?></th>
+                    <?php endif ?>
+                    <th><?= I18N::translate('Current Version') ?></th>
+                    <th><?= I18N::translate('Latest Version') ?></th>
+                    <?php if ($show_column_update_service) : ?>
+                        <th><?= I18N::translate('Update Service') ?></th>
+                    <?php endif ?>
+                    <?php if ($show_column_downloads) : ?>
+                        <th><?= I18N::translate('Down-loads') ?></th>
+                    <?php endif ?>
+                    <?php if ($show_column_enabled) : ?>
+                        <th><?= MoreI18N::xlate('Enabled') ?></th>
+                    <?php endif ?>
+                    <th><?= I18N::translate('Install') ?></th>
+                    <th><?= MoreI18N::xlate('Delete') ?></th>
+                </tr>
+            </thead>
+
+            <tbody>
+                <?php foreach ($module_names as $module_name => $standard_module_name) : ?>
+                    <?php $module = $module_service->findByName($module_name, true) ?>
+                    <?php if ($module === null) : ?>
+                        <?php if ($modules_to_show === CustomModuleManager::PREF_SHOW_INSTALLED) : ?><?php continue ?><?php endif ?>
+                        <?php $module_status = I18N::translate('Not installed') ?>
+                    <?php else : ?>
+                        <?php if ($modules_to_show === CustomModuleManager::PREF_SHOW_NOT_INSTALLED) : ?><?php continue ?><?php endif ?>
+                        <?php if ($module->isEnabled()) : ?>
+                            <?php $module_status = '1' ?>
+                        <?php else : ?>
+                            <?php $module_status = '0' ?>
+                        <?php endif ?>
+                    <?php endif ?>
+                    <?php $current_language = Session::get('language', '') ?>
+                    <?php $update_service_available = ModuleUpdateServiceConfiguration::getUpdateServiceName($module_name) !== '' ?>
+                    <?php $module_update_service = CustomModuleUpdateFactory::make($module_name) ?>
+                    <?php if ($update_service_available) : ?>
+                        <?php $module_update_service_name = $module_update_service->name() ?>
+                        <?php $module_title = $module_update_service->title($current_language) ?>
+                        <?php /** @var GithubModuleUpdate $module_update_service To avoid IDE warnings */ ?>
+                        <?php $default_module_title = $module_update_service->title() ?>
+                        <?php $module_description = $module_update_service->description($current_language) ?>
+                        <?php $default_module_description = $module_update_service->description() ?>
+                        <?php $is_theme = $module_update_service->moduleIsTheme() ?>
+                        <?php $category = $module_update_service->getCategory() ?>
+                        <?php $date_added = $module_update_service->getDateAdded() ?>
+                        <?php $current_version = $module_update_service->customModuleVersion() ?>
+                        <?php if ($module !== null) : ?>
+                            <?php $latest_version = $module_update_service->customModuleLatestVersion($fetch_latest) ?>
+                        <?php else : ?>
+                            <?php $latest_version = $fetch_latest ? $module_update_service->customModuleLatestVersion($fetch_latest) : '' ?>
+                            <?php $later_version_available = false ?>
+                        <?php endif ?>
+                        <?php $documentation_url = $module_update_service->documentationUrl() ?>
                     <?php else : ?>
-                        <?php $module_status = '0' ?>
-                    <?php endif ?>						
-                <?php endif ?>						
-                <?php $current_language = Session::get('language', '') ?>
-                <?php $update_service_available = ModuleUpdateServiceConfiguration::getUpdateServiceName($module_name) !== '' ?>
-                <?php $module_update_service = CustomModuleUpdateFactory::make($module_name) ?>
-                <?php if ($update_service_available) : ?>
-                    <?php $module_update_service_name = $module_update_service->name() ?>
-                    <?php $module_title = $module_update_service->title($current_language) ?>
-                    <?php /** @var GithubModuleUpdate $module_update_service To avoid IDE warnings */ ?>
-                    <?php $default_module_title = $module_update_service->title() ?>
-                    <?php $module_description = $module_update_service->description($current_language) ?>
-                    <?php $default_module_description = $module_update_service->description() ?>
-                    <?php $is_theme = $module_update_service->moduleIsTheme() ?>
-                    <?php $category = $module_update_service->getCategory() ?>
-                    <?php $date_added = $module_update_service->getDateAdded() ?>
-                    <?php $current_version = $module_update_service->customModuleVersion() ?>
+                        <?php $module_update_service_name = I18N::translate('not available') ?>
+                        <?php $module_title = $module->title() ?>
+                        <?php $module_description = $module->description() ?>
+                        <?php $default_module_title = $module_title ?>
+                        <?php $default_module_description = $module_description ?>
+                        <?php $is_theme = $themes->contains($module) ?>
+                        <?php $category = $is_theme ? ModuleUpdateServiceConfiguration::CATEGORY_THEME : '' ?>
+                        <?php $date_added = '' ?>
+                        <?php /** @var CustomModuleManager $module To avoid IDE warnings */ ?>
+                        <?php $current_version = $module->customModuleVersion() ?>
+                        <?php $latest_version = $module->customModuleLatestVersion() ?>
+                        <?php $documentation_url = '' ?>
+                    <?php endif ?>
                     <?php if ($module !== null) : ?>
-                        <?php $latest_version = $module_update_service->customModuleLatestVersion($fetch_latest) ?>
+                        <?php $current_version = $current_version !== '' ? $current_version : I18N::translate('not available') ?>
+                        <?php $latest_version = $latest_version !== '' ? $latest_version : I18N::translate('not available') ?>
+                    <?php endif ?>
+                    <?php if (CustomModuleManager::versionCompare($module_name, $latest_version, $current_version) > 0) : ?>
+                        <?php $later_version_available = true ?>
                     <?php else : ?>
-                        <?php $latest_version = $fetch_latest ? $module_update_service->customModuleLatestVersion($fetch_latest) : '' ?>
                         <?php $later_version_available = false ?>
                     <?php endif ?>
-                    <?php $documentation_url = $module_update_service->documentationUrl() ?>
-                <?php else : ?>
-                    <?php $module_update_service_name = I18N::translate('not available') ?>
-                    <?php $module_title = $module->title() ?>
-                    <?php $module_description = $module->description() ?>
-                    <?php $default_module_title = $module_title ?>
-                    <?php $default_module_description = $module_description ?>
-                    <?php $is_theme = $themes->contains($module) ?>
-                    <?php $category = $is_theme ? ModuleUpdateServiceConfiguration::CATEGORY_THEME : '' ?>
-                    <?php $date_added = '' ?>
-                    <?php /** @var CustomModuleManager $module To avoid IDE warnings */ ?>
-                    <?php $current_version = $module->customModuleVersion() ?>
-                    <?php $latest_version = $module->customModuleLatestVersion() ?>
-                    <?php $documentation_url = '' ?>
-                <?php endif ?>
-                <?php if ($module !== null) : ?>
-                    <?php $current_version = $current_version !== '' ? $current_version : I18N::translate('not available') ?>
-                    <?php $latest_version = $latest_version !== '' ? $latest_version : I18N::translate('not available') ?>
-                <?php endif ?>
-                <?php if (CustomModuleManager::versionCompare($module_name, $latest_version, $current_version) > 0) : ?>
-                    <?php $later_version_available = true ?>
-                <?php else : ?>
-                    <?php $later_version_available = false ?>
-                <?php endif ?>
-                <?php $installation_folder = AbstractModuleUpdate::getInstallationFolderFromModuleName($module_name) ?>
-                <?php $show_default_description = ($module_description === '' OR $module_description === $default_module_description) && strpos($current_language, 'en', 0) === false ?>
-                <?php if ($module_title === '') : ?>
-                    <?php $module_title = $default_module_title ?>
-                <?php endif ?>				
-                <?php if ($show_default_description) : ?>
-                    <?php $module_description = $default_module_description ?>
-                <?php endif ?>
-                <?php $module_title_sort = str_replace(["\u26b6 ", "\u210d ", "\u210d&\u210dwt ", '⚶ ', 'ℍ ', 'ℍ&ℍwt ', ], '', $module_title) ?>
-                <?php $short_module_name = substr($module_name, 0, 25) . '_' ?>
-                <?php $ignore_version = $custom_module_manager->getPreference($short_module_name . CustomModuleManager::PREF_IGNORE_VERSION, '') ?>
-
-                <tr>
-                    <!-- Title -->
-                    <td data-sort="<?= e($module_title_sort) ?>">
-                    <a href="#" data-bs-toggle="modal" data-bs-backdrop="static" data-bs-target="#wt-ajax-modal" data-wt-href="<?= e(route(ModuleInformationModal::class, [
-                            'module_name'                => $module_name,
-                            'module'                     => $module,
-                            'module_update_service'      => $module_update_service,
-                            'module_update_service_name' => $module_update_service_name,
-                            'module_title'               => $module_title,
-                            'module_description'         => $module_description,
-                            'date_added'                 => $date_added,
-                            'show_default_description'   => $show_default_description,
-                            'module_status'              => $module_status,
-                            'is_theme'                   => $is_theme,
-                            'category'                   => $category,
-                            'current_version'            => $current_version,
-                            'latest_version'             => $latest_version,
-                            'installation_folder'        => $installation_folder,
-                            'documentation_url'          => $documentation_url,
-                        ])) ?>">
-                        <?= e($module_title) ?>
-                    </a>
-                    </td>
-
-                    <!-- Description -->
-                    <?php if ($show_column_description) : ?>
-                        <td>
-                            <?php if ($show_default_description) : ?>
-                                <?= CustomModuleManager::DEFAULT_LANGUAGE_PREFIX ?><br>
-                            <?php endif ?>
-                            <?= substr($module_description, 0, 255) ?>
+                    <?php $installation_folder = AbstractModuleUpdate::getInstallationFolderFromModuleName($module_name) ?>
+                    <?php $show_default_description = ($module_description === '' OR $module_description === $default_module_description) && strpos($current_language, 'en', 0) === false ?>
+                    <?php if ($module_title === '') : ?>
+                        <?php $module_title = $default_module_title ?>
+                    <?php endif ?>
+                    <?php if ($show_default_description) : ?>
+                        <?php $module_description = $default_module_description ?>
+                    <?php endif ?>
+                    <?php $module_title_sort = str_replace(["\u26b6 ", "\u210d ", "\u210d&\u210dwt ", '⚶ ', 'ℍ ', 'ℍ&ℍwt ', ], '', $module_title) ?>
+                    <?php $short_module_name = substr($module_name, 0, 25) . '_' ?>
+                    <?php $ignore_version = $custom_module_manager->getPreference($short_module_name . CustomModuleManager::PREF_IGNORE_VERSION, '') ?>
+
+                    <tr>
+                        <!-- Title -->
+                        <td data-sort="<?= e($module_title_sort) ?>">
+                        <a href="#" data-bs-toggle="modal" data-bs-backdrop="static" data-bs-target="#wt-ajax-modal" data-wt-href="<?= e(route(ModuleInformationModal::class, [
+                                'module_name'                => $module_name,
+                                'module'                     => $module,
+                                'module_update_service'      => $module_update_service,
+                                'module_update_service_name' => $module_update_service_name,
+                                'module_title'               => $module_title,
+                                'module_description'         => $module_description,
+                                'date_added'                 => $date_added,
+                                'show_default_description'   => $show_default_description,
+                                'module_status'              => $module_status,
+                                'is_theme'                   => $is_theme,
+                                'category'                   => $category,
+                                'current_version'            => $current_version,
+                                'latest_version'             => $latest_version,
+                                'installation_folder'        => $installation_folder,
+                                'documentation_url'          => $documentation_url,
+                            ])) ?>">
+                            <?= e($module_title) ?>
+                        </a>
                         </td>
-                    <?php endif ?>                          
 
-                    <!-- Folder -->
-                    <td data-sort="<?= e($installation_folder) ?>">
-                        <?= e($installation_folder) ?>
-                    </td>
+                        <!-- Description -->
+                        <?php if ($show_column_description) : ?>
+                            <td>
+                                <?php if ($show_default_description) : ?>
+                                    <?= CustomModuleManager::DEFAULT_LANGUAGE_PREFIX ?><br>
+                                <?php endif ?>
+                                <?= substr($module_description, 0, 255) ?>
+                            </td>
+                        <?php endif ?>
+
+                        <!-- Folder -->
+                        <td data-sort="<?= e($installation_folder) ?>">
+                            <?= e($installation_folder) ?>
+                        </td>
 
-                    <!--Category -->
-                    <?php if ($show_column_category) : ?>
-                        <td data-sort="<?= e($category) ?>">
-                            <?= e($category) ?>
+                        <!--Category -->
+                        <?php if ($show_column_category) : ?>
+                            <td data-sort="<?= e($category) ?>">
+                                <?= e($category) ?>
+                            </td>
+                        <?php endif ?>
+
+                        <!--Date Added -->
+                        <?php if ($show_column_date_added) : ?>
+                            <td data-sort="<?= $date_added ?>">
+                                <?php if ($date_added === '') : ?>
+                                    <?= I18N::translate('N/A') ?>
+                                <?php else : ?>
+                                    <?= Registry::timestampFactory()->fromString($date_added, 'Y-m-d')->isoFormat('LL') ?>
+                                <?php endif ?>
+                            </td>
+                        <?php endif ?>
+
+                        <!-- Current version -->
+                        <td data-sort="<?= e(CustomModuleManager::normalizeVersion($module_name, $current_version)) ?>">
+                            <?= e(CustomModuleManager::normalizeVersion($module_name, $current_version)) ?>
                         </td>
-                    <?php endif ?>                          
 
-                    <!--Date Added -->
-                    <?php if ($show_column_date_added) : ?>
-                        <td data-sort="<?= $date_added ?>">
-                            <?php if ($date_added === '') : ?>
-                                <?= I18N::translate('N/A') ?>
+                        <!-- Latest version -->
+                        <td data-sort="<?= e(CustomModuleManager::normalizeVersion($module_name, $latest_version)) ?>">
+                            <?php if (      $later_version_available && $current_version !== ''
+                                        &&  (       ($module_update_service_name === GithubModuleUpdate::NAME && $module_update_service->providesReleasesInRepository())
+                                                OR  ($module_update_service_name === VestaModuleUpdate::NAME))
+                                    ) : ?>
+                                <a href="#" data-bs-toggle="modal" data-bs-backdrop="static" data-bs-target="#wt-ajax-modal" data-wt-href="<?= e(route(ReleaseNotesModal::class, [
+                                        'module_name'    => $module_name,
+                                        'module_title'   => $module_title,
+                                        'latest_version' => $latest_version,
+                                        'ignore_version' => $ignore_version,
+                                    ])) ?>" type="submit" class="btn btn-<?= $latest_version === $ignore_version ? 'secondary' : 'primary' ?>">
+                                    <?= e(CustomModuleManager::normalizeVersion($module_name, $latest_version)) ?>
+                                </a>
                             <?php else : ?>
-                                <?= Registry::timestampFactory()->fromString($date_added, 'Y-m-d')->isoFormat('LL') ?>
-                            <?php endif ?>
-                        </td>
-                    <?php endif ?>                          
-
-                    <!-- Current version -->
-                    <td data-sort="<?= e(CustomModuleManager::normalizeVersion($module_name, $current_version)) ?>">
-                        <?= e(CustomModuleManager::normalizeVersion($module_name, $current_version)) ?>
-                    </td>
-
-                    <!-- Latest version -->
-                    <td data-sort="<?= e(CustomModuleManager::normalizeVersion($module_name, $latest_version)) ?>">
-                        <?php if (      $later_version_available && $current_version !== '' 
-                                    &&  (       ($module_update_service_name === GithubModuleUpdate::NAME && $module_update_service->providesReleasesInRepository())
-                                            OR  ($module_update_service_name === VestaModuleUpdate::NAME))
-                                ) : ?>
-                            <a href="#" data-bs-toggle="modal" data-bs-backdrop="static" data-bs-target="#wt-ajax-modal" data-wt-href="<?= e(route(ReleaseNotesModal::class, [
-                                    'module_name'    => $module_name,
-                                    'module_title'   => $module_title,
-                                    'latest_version' => $latest_version,
-                                    'ignore_version' => $ignore_version,
-                                ])) ?>" type="submit" class="btn btn-<?= $latest_version === $ignore_version ? 'secondary' : 'primary' ?>">
                                 <?= e(CustomModuleManager::normalizeVersion($module_name, $latest_version)) ?>
-                            </a>
-                        <?php else : ?>
-                            <?= e(CustomModuleManager::normalizeVersion($module_name, $latest_version)) ?>
-                        <?php endif ?>						
-                    </td>
-
-                    <!--Update Service -->
-                    <?php if ($show_column_update_service) : ?>
-                        <td data-sort="<?= $module_update_service_name ?>">
-                            <?= $module_update_service_name ?>
+                            <?php endif ?>
                         </td>
-                    <?php endif ?>                          
 
-                    <!--Downloads -->
-                    <?php if ($show_column_downloads) : ?>
-                        <?php $download_count = ($module_update_service instanceof GithubModuleUpdate) ? $module_update_service->getDownloadCount() : -1 ?>
-                        <td data-sort="<?= $download_count ?>">
-                            <?= $download_count > 0 ? number_format($download_count) : I18N::translate('N/A') ?>
+                        <!--Update Service -->
+                        <?php if ($show_column_update_service) : ?>
+                            <td data-sort="<?= $module_update_service_name ?>">
+                                <?= $module_update_service_name ?>
+                            </td>
+                        <?php endif ?>
+
+                        <!--Downloads -->
+                        <?php if ($show_column_downloads) : ?>
+                            <?php $download_count = ($module_update_service instanceof GithubModuleUpdate) ? $module_update_service->getDownloadCount() : -1 ?>
+                            <td data-sort="<?= $download_count ?>">
+                                <?= $download_count > 0 ? number_format($download_count) : I18N::translate('N/A') ?>
+                            </td>
+                        <?php endif ?>
+
+                        <!-- Enabled -->
+                        <?php if ($show_column_enabled) : ?>
+                            <?php if ($module_status === '1') : ?>
+                                <?php $enabled_sort = '0' ?>
+                            <?php elseif ($module_status === '0') : ?>
+                                <?php $enabled_sort = '2' ?>
+                            <?php else : ?>
+                                <?php $enabled_sort = '1' ?>
+                            <?php endif ?>
+                            <td data-sort="<?= $enabled_sort ?>">
+                                <?php if ($module !== null) : ?>
+                                    <input  type="hidden"
+                                            name="<?= CustomModuleManager::ENABLED_STATUS_INCLUDED . $module->name() ?>"
+                                            id="<?= CustomModuleManager::ENABLED_STATUS_INCLUDED . $module->name() ?>"
+                                            value="1"
+                                    >
+                                    <?= view('components/checkbox', ['label' => '', 'name' => 'status-' . $module->name(), 'checked' => $module->isEnabled()]) ?>
+                                <?php else : ?>
+                                    <?= $module_status ?>
+                                <?php endif ?>
+                            </td>
+                        <?php endif ?>
+
+                        <!--Install -->
+                        <?php $action = '' ?>
+                        <?php $action_sort = '0' ?>
+                        <?php $action_label = '' ?>
+                        <?php if ($module !== null && $later_version_available && !($latest_version === $ignore_version)) : ?>
+                            <?php $action = CustomModuleManager::ACTION_UPDATE ?>
+                            <?php $action_label = I18N::translate('Update module') ?>
+                            <?php $action_sort = '2' ?>
+                        <?php elseif ($module_status === I18N::translate('Not installed')) : ?>
+                            <?php $action = CustomModuleManager::ACTION_INSTALL ?>
+                            <?php $action_label = I18N::translate('Install module') ?>
+                            <?php $action_sort = '1' ?>
+                        <?php endif ?>
+                        <td data-sort="<?= $action_sort ?>">
+                            <?php if ($action_label !== '' && $update_service_available) : ?>
+                                <a href="#" data-bs-toggle="modal" data-bs-backdrop="static" data-bs-target="#wt-ajax-modal" data-wt-href="<?= e(route(ModuleUpgradeWizardPage::class, [
+                                        'module_name'     => $module_name,
+                                        'current_version' => $current_version,
+                                        'latest_version'  => $latest_version,
+                                        'action'          => $action,
+                                    ])) ?>" type="submit" class="btn btn-<?= $action === CustomModuleManager::ACTION_UPDATE ? 'primary' : 'secondary' ?>">
+                                    <?= $action_label ?>
+                                </a>
+                            <?php endif ?>
                         </td>
-                    <?php endif ?>                          
 
-                    <!-- Enabled -->
-                    <?php if ($show_column_enabled) : ?>
-                        <?php if ($module_status === '1') : ?>
-                            <?php $enabled_sort = '0' ?>
-                        <?php elseif ($module_status === '0') : ?>
-                            <?php $enabled_sort = '2' ?>
-                        <?php else : ?>
-                            <?php $enabled_sort = '1' ?>
-                        <?php endif ?>                          
-                        <td data-sort="<?= $enabled_sort ?>">
+                        <!--Delete -->
+                        <?php $label = '' ?>
+                        <?php if ($module !== null) : ?>
+                            <?php $label = I18N::translate('Delete module') ?>
+                        <?php endif ?>
+                        <td data-sort="<?= $label ?>">
                             <?php if ($module !== null) : ?>
-                                <input  type="hidden" 
-                                        name="<?= CustomModuleManager::ENABLED_STATUS_INCLUDED . $module->name() ?>" 
-                                        id="<?= CustomModuleManager::ENABLED_STATUS_INCLUDED . $module->name() ?>"
-                                        value="1"
-                                >
-                                <?= view('components/checkbox', ['label' => '', 'name' => 'status-' . $module->name(), 'checked' => $module->isEnabled()]) ?>
-                            <?php else : ?>
-                                <?= $module_status ?>
+                                <a href="#" data-bs-toggle="modal" data-bs-backdrop="static" data-bs-target="#wt-ajax-modal" data-wt-href="<?= e(route(ModuleUpgradeWizardPage::class, [
+                                        'module_name'     => $module_name,
+                                        'action'          => CustomModuleManager::ACTION_DELETE,
+                                    ])) ?>" type="submit" class="btn btn-secondary">
+                                    <?= $label ?>
+                                </a>
                             <?php endif ?>
                         </td>
-                    <?php endif ?>                          
-
-                    <!--Install -->
-                    <?php $action = '' ?>
-                    <?php $action_sort = '0' ?>
-                    <?php $action_label = '' ?>
-                    <?php if ($module !== null && $later_version_available && !($latest_version === $ignore_version)) : ?>
-                        <?php $action = CustomModuleManager::ACTION_UPDATE ?>
-                        <?php $action_label = I18N::translate('Update module') ?>
-                        <?php $action_sort = '2' ?>
-                    <?php elseif ($module_status === I18N::translate('Not installed')) : ?>
-                        <?php $action = CustomModuleManager::ACTION_INSTALL ?>
-                        <?php $action_label = I18N::translate('Install module') ?>
-                        <?php $action_sort = '1' ?>
-                    <?php endif ?>
-                    <td data-sort="<?= $action_sort ?>">
-                        <?php if ($action_label !== '' && $update_service_available) : ?>
-                            <a href="#" data-bs-toggle="modal" data-bs-backdrop="static" data-bs-target="#wt-ajax-modal" data-wt-href="<?= e(route(ModuleUpgradeWizardPage::class, [
-                                    'module_name'     => $module_name,
-                                    'current_version' => $current_version,
-                                    'latest_version'  => $latest_version,
-                                    'action'          => $action,
-                                ])) ?>" type="submit" class="btn btn-<?= $action === CustomModuleManager::ACTION_UPDATE ? 'primary' : 'secondary' ?>">
-                                <?= $action_label ?>
-                            </a>
-                        <?php endif ?>						
-                    </td>
-
-                    <!--Delete -->
-                    <?php $label = '' ?>
-                    <?php if ($module !== null) : ?>
-                        <?php $label = I18N::translate('Delete module') ?>
-                    <?php endif ?>						
-                    <td data-sort="<?= $label ?>">
-                        <?php if ($module !== null) : ?>
-                            <a href="#" data-bs-toggle="modal" data-bs-backdrop="static" data-bs-target="#wt-ajax-modal" data-wt-href="<?= e(route(ModuleUpgradeWizardPage::class, [
-                                    'module_name'     => $module_name,
-                                    'action'          => CustomModuleManager::ACTION_DELETE,
-                                ])) ?>" type="submit" class="btn btn-secondary">
-                                <?= $label ?>
-                            </a>
-                        <?php endif ?>						
-                    </td>
-                </tr>
-            <?php endforeach ?>
-        </tbody>
-    </table>
+                    </tr>
+                <?php endforeach ?>
+            </tbody>
+        </table>
+    </div>
 
-    <div class="row mb-3"><?= view('icons/spacer') ?></div>  
+    <div class="row mb-3"><?= view('icons/spacer') ?></div>
 
     <button class="btn btn-primary" type="submit">
         <?= view('icons/save') ?>