diff --git a/config.json b/config.json
index 6bbed36..01d59cb 100644
--- a/config.json
+++ b/config.json
@@ -1,7 +1,8 @@
 {
-    "version": "1.3.1",
+    "version": "2.0.0",
     "name": "WebhooksPlugin.name",
     "description": "WebhooksPlugin.description",
+    "icon": "bi bi-plug-fill",
     "authors": [
         {
             "name": "Phillips Data, Inc.",
diff --git a/views/default/admin_main.pdt b/views/default/admin_main.pdt
index 5b2fa3c..416045b 100644
--- a/views/default/admin_main.pdt
+++ b/views/default/admin_main.pdt
@@ -1,106 +1,118 @@
-        <?php
-        echo ($message ?? null);
+<?php /** @var View $this */ ?>
+
+<?php
+echo ($message ?? null);
 
-        $links = [
-            ['name' => $this->_('AdminMain.index.category_outgoing', true) . ' <span>(' . (isset($type_count['outgoing']) ? $this->Html->safe($type_count['outgoing']) : null) . ')</span>', 'current' => ((isset($type) ? $type : null) == 'outgoing' ? true : false), 'attributes' => ['href' => $this->base_uri . 'plugin/webhooks/admin_main/index/outgoing/', 'class' => 'ajax']],
-            ['name' => $this->_('AdminMain.index.category_incoming', true) . ' <span>(' . (isset($type_count['incoming']) ? $this->Html->safe($type_count['incoming']) : null) . ')</span>', 'current' => ((isset($type) ? $type : null) == 'incoming' ? true : false), 'attributes' => ['href' => $this->base_uri . 'plugin/webhooks/admin_main/index/incoming/', 'class' => 'ajax']]
-        ];
-        $link_buttons = [
-            [
-                'icon' => 'fas fa-plus',
-                'name' => '',
-                'attributes' => [
-                    'title' => $this->_('AdminMain.index.categorylink_addwebhook', true),
-                    'href' => $this->Html->safe($this->base_uri . 'plugin/webhooks/admin_main/add/')
-                ]
-            ],
-            [
-                'icon' => 'fas fa-list',
-                'name' => $this->_('AdminMain.index.categorylink_viewlogs', true),
-                'attributes' => [
-                    'title' => $this->_('AdminMain.index.categorylink_viewlogs', true),
-                    'href' => $this->Html->safe($this->base_uri . 'plugin/webhooks/admin_main/logs/')
-                ]
-            ]
-        ];
+$links = [
+    [
+        'name' => $this->_('AdminMain.index.category_outgoing', true) . '<span class="badge bg-secondary ms-2">' . ($type_count['outgoing'] ?? 0) . '</span>',
+        'current' => ($type ?? null) == 'outgoing',
+        'attributes' => ['href' => $this->base_uri . 'plugin/webhooks/admin_main/index/outgoing/', 'class' => 'ajax']
+    ],
+    [
+        'name' => $this->_('AdminMain.index.category_incoming', true) . '<span class="badge bg-secondary ms-2">' . ($type_count['incoming'] ?? 0) . '</span>',
+        'current' => ($type ?? null) == 'incoming',
+        'attributes' => ['href' => $this->base_uri . 'plugin/webhooks/admin_main/index/incoming/', 'class' => 'ajax']
+    ]
+];
+$link_buttons = [
+    [
+        'icon' => 'bi bi-plus-lg me-1',
+        'name' => $this->_('AdminMain.index.categorylink_addwebhook', true),
+        'attributes' => [
+            'title' => $this->_('AdminMain.index.categorylink_addwebhook', true),
+            'href' => $this->Html->safe($this->base_uri . 'plugin/webhooks/admin_main/add/')
+        ]
+    ],
+    [
+        'icon' => 'bi bi-list me-1',
+        'name' => $this->_('AdminMain.index.categorylink_viewlogs', true),
+        'attributes' => [
+            'title' => $this->_('AdminMain.index.categorylink_viewlogs', true),
+            'href' => $this->Html->safe($this->base_uri . 'plugin/webhooks/admin_main/logs/')
+        ]
+    ]
+];
 
-        $this->Widget->clear();
-        $this->Widget->setLinks($links);
-        $this->Widget->setLinkButtons($link_buttons);
-        $this->Widget->create($this->_('AdminMain.index.boxtitle_webhooks', true), ['id' => 'admin_main'], ($render_section ?? null));
+$this->Widget->clear();
+$this->Widget->setLinks($links);
+$this->Widget->setLinkButtons($link_buttons);
+$this->Widget->setBodyWrapper(false);
+$this->Widget->create($this->_('AdminMain.index.boxtitle_webhooks', true), ['id' => 'admin_main'], ($render_section ?? null));
 
-        if (($webhooks ?? false) && ($num_tickets = count($webhooks)) > 0) {
+if (($webhooks ?? false) && ($num_tickets = count($webhooks)) > 0) {
+?>
+<table class="table table-hover" id="webhook_list">
+    <thead>
+        <tr>
+            <th><?php $this->_('AdminMain.index.heading_callback');?></th>
+            <th><a href="<?php echo $this->Html->safe($this->base_uri . 'plugin/webhooks/admin_main/index/' . (isset($type) ? $type : null) . '/?sort=event&order=' . ($sort == 'event' ? $negate_order : $order));?>" class="ajax<?php echo $this->Html->safe($sort == 'event' ? ' ' . $order : '');?>"><?php $this->_('AdminMain.index.heading_event');?></a></th>
+            <th><a href="<?php echo $this->Html->safe($this->base_uri . 'plugin/webhooks/admin_main/index/' . (isset($type) ? $type : null) . '/?sort=method&order=' . ($sort == 'method' ? $negate_order : $order));?>" class="ajax<?php echo $this->Html->safe($sort == 'method' ? ' ' . $order : '');?>"><?php $this->_('AdminMain.index.heading_method');?></a></th>
+            <th><?php $this->_('AdminMain.index.heading_options');?></th>
+        </tr>
+    </thead>
+    <tbody>
+        <?php
+        foreach ($webhooks as $webhook) {
         ?>
-        <p class="p-2 rounded bg-light text-dark"><?php $this->_('AdminMain.index.text_description_' . ($type ?? 'outgoing'));?></p>
-        <table class="table" id="webhook_list">
-            <tr class="heading_row">
-                <td><?php $this->_('AdminMain.index.heading_callback');?></td>
-                <td><span><a href="<?php echo $this->Html->safe($this->base_uri . 'plugin/webhooks/admin_main/index/' . (isset($type) ? $type : null) . '/?sort=event&order=' . ($sort == 'event' ? $negate_order : $order));?>" class="ajax<?php echo $this->Html->safe($sort == 'event' ? ' ' . $order : '');?>"><?php $this->_('AdminMain.index.heading_event');?></a></span></td>
-                <td><span><a href="<?php echo $this->Html->safe($this->base_uri . 'plugin/webhooks/admin_main/index/' . (isset($type) ? $type : null) . '/?sort=method&order=' . ($sort == 'method' ? $negate_order : $order));?>" class="ajax<?php echo $this->Html->safe($sort == 'method' ? ' ' . $order : '');?>"><?php $this->_('AdminMain.index.heading_method');?></a></span></td>
-                <td class="last"><?php $this->_('AdminMain.index.heading_options');?></td>
-            </tr>
-            <?php
-            // Display all webhooks
-            $i = 0;
-            foreach ($webhooks as $webhook) {
-            ?>
-            <tr<?php echo (($i++%2 == 1) ? ' class="odd_row"' : '');?>>
-                <td>
-                    <?php
-                    if ($type == 'incoming') {
-                        echo $this->Html->safe('http://' . Configure::get('Blesta.company')->hostname . $this->base_uri . 'plugin/webhooks/trigger/index/' . ($webhook->callback ?? ''));
-                    } else {
-                        echo $this->Html->safe($webhook->callback ?? '');
-                    }
-                    ?>
-                </td>
-                <td>
-                    <?php
-                    foreach ($webhook->events ?? [] as $event) {
-                    ?>
-                        <div class="badge badge-light"><?php echo $this->Html->safe($event);?></div>
-                    <?php
-                    }
-                    ?>
-                </td>
-                <td><?php echo $this->Html->safe(strtoupper($webhook->method ?? ''));?></td>
-                <td class="last">
-                    <a href="<?php echo $this->Html->safe($this->base_uri . 'plugin/webhooks/admin_main/logs/?filters[webhook_id]=' . $webhook->id);?>"><?php $this->_('AdminMain.index.option_logs');?></a>,
-                    <a href="<?php echo $this->Html->safe($this->base_uri . 'plugin/webhooks/admin_main/edit/' . $webhook->id);?>"><?php $this->_('AdminMain.index.option_edit');?></a>,
+        <tr>
+            <td>
+                <?php
+                if ($type == 'incoming') {
+                    echo $this->Html->safe('http://' . Configure::get('Blesta.company')->hostname . $this->base_uri . 'plugin/webhooks/trigger/index/' . ($webhook->callback ?? ''));
+                } else {
+                    echo $this->Html->safe($webhook->callback ?? '');
+                }
+                ?>
+            </td>
+            <td>
+                <?php
+                foreach ($webhook->events ?? [] as $event) {
+                ?>
+                    <span class="badge bg-secondary"><?php echo $this->Html->safe($event);?></span>
+                <?php
+                }
+                ?>
+            </td>
+            <td><?php echo $this->Html->safe(strtoupper($webhook->method ?? ''));?></td>
+            <td>
+                <div class="d-flex gap-1">
+                    <a href="<?php echo $this->Html->safe($this->base_uri . 'plugin/webhooks/admin_main/logs/?filters[webhook_id]=' . $webhook->id);?>" class="btn btn-sm btn-outline-secondary"><?php $this->_('AdminMain.index.option_logs');?></a>
+                    <a href="<?php echo $this->Html->safe($this->base_uri . 'plugin/webhooks/admin_main/edit/' . $webhook->id);?>" class="btn btn-sm btn-outline-secondary"><?php $this->_('AdminMain.index.option_edit');?></a>
                     <?php
-                    $this->Form->create($this->base_uri . 'plugin/webhooks/admin_main/delete/');
+                    $this->Form->create($this->base_uri . 'plugin/webhooks/admin_main/delete/', ['class' => 'd-inline']);
                     $this->Form->fieldHidden('id', ($webhook->id ?? null));
                     ?>
-                    <a href="<?php echo $this->Html->safe($this->base_uri . 'plugin/webhooks/admin_main/delete/');?>" class="manage" rel="<?php $this->_('AdminMain.modal.delete_text');?>"><?php $this->_('AdminMain.index.option_delete');?></a>
+                    <button type="button" class="btn btn-sm btn-outline-danger modal-confirm-delete" data-confirm-message="<?php $this->_('AdminMain.modal.delete_text');?>"><?php $this->_('AdminMain.index.option_delete');?></button>
                     <?php
                     $this->Form->end();
                     ?>
-                </td>
-            </tr>
-            <?php
-            }
-            unset($i);
-            ?>
-        </table>
-        <?php
-            // Set pagination
-            $this->Pagination->build();
-        } else {
-        ?>
-        <div class="empty_section">
-            <div class="empty_box">
-                <?php $this->_('AdminMain.index.no_results');?>
-            </div>
-        </div>
+                </div>
+            </td>
+        </tr>
         <?php
         }
-
-        $this->Widget->end();
         ?>
+    </tbody>
+</table>
+<?php
+if (isset($this->Pagination) && $this->Pagination->hasPages()) {
+    ?>
+    <div class="card-footer">
+        <?php $this->Pagination->build();?>
+    </div>
+    <?php
+}
+?>
+<?php
+} else {
+?>
+<div class="card-body text-center text-muted py-5">
+    <i class="bi bi-plug-fill" style="font-size: 3rem; opacity: 0.3;"></i>
+    <p class="mt-3 mb-0"><?php $this->_('AdminMain.index.no_results');?></p>
+</div>
+<?php
+}
 
-<script type="text/javascript">
-    $(document).ready(function() {
-        // Handle confirmation
-        $('#admin_main a.manage[rel]').blestaModalConfirm({base_url: '<?php echo (isset($this->base_uri) ? $this->Html->safe($this->base_uri) : null);?>', close: '<?php $this->_('AppController.modal.text_close');?>', submit: true});
-    });
-</script>
+$this->Widget->end();
+?>
diff --git a/views/default/admin_main_add.pdt b/views/default/admin_main_add.pdt
index f2b2b4c..c91bb8f 100644
--- a/views/default/admin_main_add.pdt
+++ b/views/default/admin_main_add.pdt
@@ -1,180 +1,173 @@
+<?php /** @var View $this */ ?>
+
 <?php
 echo ($message ?? null);
 
 $this->Widget->clear();
+$this->Widget->setBodyWrapper(false);
 $this->Widget->create($this->_('AdminMain.add.boxtitle_addwebhook', true));
 ?>
-    <div class="inner">
-        <?php $this->Form->create(null, ['id' => 'webhook', 'class' => 'disable-on-submit']);?>
-        <div class="title_row first">
-            <h3><?php $this->_('AdminMain.add.heading_event');?></h3>
+<?php $this->Form->create(null, ['id' => 'webhook', 'class' => 'disable-on-submit']);?>
+<div class="card-body">
+    <h6 class="form-section-header"><?php $this->_('AdminMain.add.heading_event');?></h6>
+
+    <div class="mb-3">
+        <?php
+        $this->Form->label($this->_('AdminMain.add.field_callback', true), 'callback', ['class' => 'form-label']);
+        ?>
+        <div class="d-flex align-items-center">
+            <label class="mb-0 me-1 callback_url"><?php echo $this->Html->safe('http://' . Configure::get('Blesta.company')->hostname . $this->base_uri . 'plugin/webhooks/trigger/index/');?></label>
+            <?php
+            $this->Form->fieldText('callback', ($vars->callback ?? null), ['id' => 'callback', 'class' => 'form-control']);
+            ?>
+            <span class="ms-2" data-bs-toggle="tooltip" data-bs-title="<?php $this->_('AdminMain.!tooltip.callback');?>"><i class="bi bi-info-circle"></i></span>
         </div>
-        <div class="pad">
-            <ul>
-                <li>
-                    <?php
-                    $this->Form->label($this->_('AdminMain.add.field_callback', true), 'callback');
-                    ?>
-                    <div>
+    </div>
+
+    <div class="mb-3">
+        <?php
+        $this->Form->label($this->_('AdminMain.add.field_event', true), 'event', ['class' => 'form-label']);
+        ?>
+        <div class="row">
+            <?php
+            foreach ($events ?? [] as $event => $name) {
+            ?>
+                <div class="col-md-3">
+                    <div class="form-check">
                         <?php
-                        $this->Form->label($this->Html->safe('http://' . Configure::get('Blesta.company')->hostname . $this->base_uri . 'plugin/webhooks/trigger/index/'), null, ['class' => 'inline callback_url']);
-                        $this->Form->fieldText('callback', ($vars->callback ?? null), ['id' => 'callback', 'class' => 'inline']);
+                        $this->Form->fieldCheckbox('events[]', $event, in_array($event, $vars->events ?? []), ['id' => 'events_' . $event, 'class' => 'form-check-input']);
+                        $this->Form->label($name, 'events_' . $event, ['class' => 'form-check-label']);
                         ?>
-                        <span class="tooltip"><?php $this->_('AppController.tooltip.text');?><div><?php $this->_('AdminMain.!tooltip.callback');?></div></span>
                     </div>
-                </li>
-                <li>
-                    <?php
-                    $this->Form->label($this->_('AdminMain.add.field_event', true), 'event');
-                    ?>
+                </div>
+            <?php
+            }
+            ?>
+        </div>
+    </div>
 
-                    <div class="row">
+    <div class="mb-3">
+        <?php
+        $this->Form->label($this->_('AdminMain.add.field_type', true), 'type', ['class' => 'form-label']);
+        $this->Form->fieldSelect('type', ($types ?? null), ($vars->type ?? null), ['id' => 'type', 'class' => 'form-select']);
+        ?>
+    </div>
+
+    <div class="mb-3">
+        <?php
+        $this->Form->label($this->_('AdminMain.add.field_method', true), 'method', ['class' => 'form-label']);
+        $this->Form->fieldSelect('method', ($methods ?? null), ($vars->method ?? null), ['id' => 'method', 'class' => 'form-select']);
+        ?>
+    </div>
+
+    <h6 class="form-section-header"><?php $this->_('AdminMain.add.heading_fields_map');?></h6>
+    <p><?php $this->_('AdminMain.add.text_fields_map');?></p>
+
+    <div class="mb-3">
+        <a class="btn btn-outline-secondary btn-sm field_row_add" href="#"><i class="bi bi-plus-lg"></i> <?php $this->_('AdminMain.add.field_add_field');?></a>
+    </div>
+
+    <table class="table table-hover fields_table">
+        <thead>
+            <tr>
+                <th><?php $this->_('AdminMain.add.heading_field');?></th>
+                <th><?php $this->_('AdminMain.add.heading_parameter');?></th>
+                <th><?php $this->_('AdminMain.add.heading_options');?></th>
+            </tr>
+        </thead>
+        <tbody>
+            <?php
+            $i = 0;
+            if (empty($vars->fields)) {
+                $vars->fields = [['field' => null, 'parameter' => null]];
+            }
+
+            foreach ($vars->fields ?? [] as $field) {
+                $field = (array) $field;
+            ?>
+                <tr class="field_row">
+                    <td>
                         <?php
-                        foreach ($events ?? [] as $event => $name) {
+                        $this->Form->fieldText('fields[' . $i . '][field]', ($field['field'] ?? null), ['class' => 'form-control']);
                         ?>
-                            <div class="col-md-3">
-                                <div class="p-1">
-                                    <?php
-                                    $this->Form->fieldCheckbox('events[]', $event, in_array($event, $vars->events ?? []), ['id' => 'events_' . $event]);
-                                    $this->Form->label($name, 'events_' . $event, ['class' => 'inline']);
-                                    ?>
-                                </div>
-                            </div>
+                    </td>
+                    <td>
                         <?php
-                        }
+                        $this->Form->fieldText('fields[' . $i . '][parameter]', ($field['parameter'] ?? null), ['class' => 'form-control']);
                         ?>
-                    </div>
-                </li>
-                <li>
-                    <?php
-                    $this->Form->label($this->_('AdminMain.add.field_type', true), 'type');
-                    $this->Form->fieldSelect('type', ($types ?? null), ($vars->type ?? null), ['id' => 'type']);
-                    ?>
-                </li>
-                <li>
-                    <?php
-                    $this->Form->label($this->_('AdminMain.add.field_method', true), 'method');
-                    $this->Form->fieldSelect('method', ($methods ?? null), ($vars->method ?? null), ['id' => 'method']);
-                    ?>
-                </li>
-            </ul>
-        </div>
-
-        <div class="title_row">
-            <h3><?php $this->_('AdminMain.add.heading_fields_map');?></h3>
-        </div>
-        <div class="pad">
-            <p><?php $this->_('AdminMain.add.text_fields_map');?></p>
-
-            <div class="links_row">
-                <a class="btn btn-default pull-right btn-sm field_row_add" href="#"><span><?php $this->_('AdminMain.add.field_add_field');?></span></a>
-            </div>
-
-            <table class="table fields_table">
-                <tr class="heading_row">
-                    <td><?php $this->_('AdminMain.add.heading_field');?></td>
-                    <td class="last"><?php $this->_('AdminMain.add.heading_parameter');?></td>
-                    <td class="last"><?php $this->_('AdminMain.add.heading_options');?></td>
+                    </td>
+                    <td>
+                        <a class="btn btn-outline-danger btn-sm field_row_delete" href="#"><?php $this->_('AdminMain.add.option_delete');?></a>
+                    </td>
                 </tr>
-                <?php
-                $i = 0;
-                if (empty($vars->fields)) {
-                    $vars->fields = [['field' => null, 'parameter' => null]];
-                }
-
-                foreach ($vars->fields ?? [] as $field) {
-                    $field = (array) $field;
-                ?>
-                    <tr class="field_row<?php echo (($i++%2 == 1) ? ' odd_row' : '');?>">
-                        <td>
-                            <?php
-                            $this->Form->fieldText('fields[' . $i . '][field]', ($field['field'] ?? null), ['class' => 'stretch']);
-                            ?>
-                        </td>
-                        <td>
-                            <?php
-                            $this->Form->fieldText('fields[' . $i . '][parameter]', ($field['parameter'] ?? null), ['class' => 'stretch']);
-                            ?>
-                        </td>
-                        <td>
-                            <a class="manage field_row_delete" href="#"><span><?php $this->_('AdminMain.add.option_delete');?></span></a>
-                        </td>
-                    </tr>
-                <?php
-                }
-                unset($i);
-                ?>
-            </table>
-        </div>
-
-        <div class="button_row">
             <?php
-            $this->Form->fieldSubmit('save', $this->_('AdminMain.add.field_addsubmit', true), ['class' => 'btn btn-primary float-right']);
+                $i++;
+            }
+            unset($i);
             ?>
-            <a class="btn btn-default float-right" href="<?php echo $this->Html->safe($this->base_uri . 'plugin/webhooks/admin_main/');?>"><?php $this->_('AdminMain.add.field_cancel');?></a>
-        </div>
-        <?php $this->Form->end();?>
-    </div>
+        </tbody>
+    </table>
+</div>
+<div class="card-footer d-flex justify-content-end gap-2">
+    <a class="btn btn-secondary" href="<?php echo $this->Html->safe($this->base_uri . 'plugin/webhooks/admin_main/');?>"><?php $this->_('AdminMain.add.field_cancel');?></a>
+    <?php
+    $this->Form->fieldSubmit('save', $this->_('AdminMain.add.field_addsubmit', true), ['class' => 'btn btn-primary float-end']);
+    ?>
+</div>
+<?php $this->Form->end();?>
 <?php $this->Widget->end();?>
 
 <script type="text/javascript">
-    $(document).ready(function() {
-        $('.field_row_add').click(function() {
-            addFieldRow();
-            updateZebraStriping('.field_row');
-        });
+    document.addEventListener('DOMContentLoaded', function() {
+        var add_btn = document.querySelector('.field_row_add');
+        var type_select = document.getElementById('type');
+        var callback_url = document.querySelector('.callback_url');
+
+        // Add field row
+        add_btn.addEventListener('click', function(e) {
+            e.preventDefault();
+            var table = document.querySelector('table.fields_table tbody');
+            var rows = table.querySelectorAll('tr.field_row');
+            var last_row = rows[rows.length - 1];
+            var new_row = last_row.cloneNode(true);
+
+            // Clear input values
+            new_row.querySelectorAll('input[type="text"]').forEach(function(input) {
+                input.value = '';
+            });
 
-        $(document).on('click', '.field_row_delete', function() {
-            deleteFieldRow($(this));
-            updateZebraStriping('.field_row');
-        });
+            // Update indices
+            var new_index = rows.length;
+            new_row.querySelectorAll('input').forEach(function(input) {
+                input.name = input.name.replace(/\[\d+\]/, '[' + new_index + ']');
+            });
 
-        if ($('#type').val() == 'incoming') {
-            $('.callback_url').show();
-        } else {
-            $('.callback_url').hide();
-        }
+            table.appendChild(new_row);
+        });
 
-        $('#type').change(function() {
-            if ($(this).val() == 'incoming') {
-                $('.callback_url').show();
-            } else {
-                $('.callback_url').hide();
+        // Delete field row (delegated)
+        document.querySelector('table.fields_table').addEventListener('click', function(e) {
+            if (e.target.closest('.field_row_delete')) {
+                e.preventDefault();
+                var rows = document.querySelectorAll('tr.field_row');
+                if (rows.length > 1) {
+                    e.target.closest('tr').remove();
+                }
             }
         });
-    });
 
-    function addFieldRow() {
-        var field_row = $('table.fields_table tr.field_row').last().clone();
-        field_row.find('input[type=\"text\"]').val('');
-        $('table.fields_table').append(field_row);
-
-        // Set proper indices
-        var row = 0;
-        $('table.fields_table tr.field_row').each(function() {
-            $(this).find('input').each(function() {
-                $(this).prop('name', $(this).prop('name').replace(/(\[\d+\])/, '[' + row + ']'));
-                $(this).prop('name', $(this).prop('name').replace('[]', '[' + row + ']'));
-            });
+        // Type toggle
+        function toggleCallback() {
+            callback_url.style.display = type_select.value === 'incoming' ? '' : 'none';
+        }
 
-            row++;
-        });
-    }
+        toggleCallback();
+        type_select.addEventListener('change', toggleCallback);
 
-    function deleteFieldRow(row)
-    {
-        if ($('.field_row').length > 1) {
-            row.parent().parent().remove();
-        }
-    }
-
-    function updateZebraStriping(row) {
-        var i = 0;
-        $(row).each(function() {
-            if (i++%2 == 1)
-                $(this).addClass('odd_row');
-            else
-                $(this).removeClass('odd_row');
+        // Initialize Bootstrap tooltips
+        var tooltips = document.querySelectorAll('[data-bs-toggle="tooltip"]');
+        tooltips.forEach(function(el) {
+            new bootstrap.Tooltip(el);
         });
-    }
-</script>
\ No newline at end of file
+    });
+</script>
diff --git a/views/default/admin_main_edit.pdt b/views/default/admin_main_edit.pdt
index cc41b48..27cee40 100644
--- a/views/default/admin_main_edit.pdt
+++ b/views/default/admin_main_edit.pdt
@@ -1,180 +1,173 @@
+<?php /** @var View $this */ ?>
+
 <?php
 echo ($message ?? null);
 
 $this->Widget->clear();
+$this->Widget->setBodyWrapper(false);
 $this->Widget->create($this->_('AdminMain.edit.boxtitle_editwebhook', true));
 ?>
-    <div class="inner">
-        <?php $this->Form->create(null, ['id' => 'webhook', 'class' => 'disable-on-submit']);?>
-        <div class="title_row first">
-            <h3><?php $this->_('AdminMain.edit.heading_event');?></h3>
+<?php $this->Form->create(null, ['id' => 'webhook', 'class' => 'disable-on-submit']);?>
+<div class="card-body">
+    <h6 class="form-section-header"><?php $this->_('AdminMain.edit.heading_event');?></h6>
+
+    <div class="mb-3">
+        <?php
+        $this->Form->label($this->_('AdminMain.edit.field_callback', true), 'callback');
+        ?>
+        <div class="d-flex align-items-center">
+            <label class="mb-0 me-1 callback_url"><?php echo $this->Html->safe('http://' . Configure::get('Blesta.company')->hostname . $this->base_uri . 'plugin/webhooks/trigger/index/');?></label>
+            <?php
+            $this->Form->fieldText('callback', ($vars->callback ?? null), ['id' => 'callback', 'class' => 'form-control']);
+            ?>
+            <span class="ms-2" data-bs-toggle="tooltip" data-bs-title="<?php $this->_('AdminMain.!tooltip.callback');?>"><i class="bi bi-info-circle"></i></span>
         </div>
-        <div class="pad">
-            <ul>
-                <li>
-                    <?php
-                    $this->Form->label($this->_('AdminMain.edit.field_callback', true), 'callback');
-                    ?>
-                    <div>
+    </div>
+
+    <div class="mb-3">
+        <?php
+        $this->Form->label($this->_('AdminMain.edit.field_event', true), 'event');
+        ?>
+        <div class="row">
+            <?php
+            foreach ($events ?? [] as $event => $name) {
+            ?>
+                <div class="col-md-3">
+                    <div class="form-check">
                         <?php
-                        $this->Form->label($this->Html->safe('http://' . Configure::get('Blesta.company')->hostname . $this->base_uri . 'plugin/webhooks/trigger/index/'), null, ['class' => 'inline callback_url']);
-                        $this->Form->fieldText('callback', ($vars->callback ?? null), ['id' => 'callback', 'class' => 'inline']);
+                        $this->Form->fieldCheckbox('events[]', $event, in_array($event, $vars->events ?? []), ['id' => 'events_' . $event, 'class' => 'form-check-input']);
+                        $this->Form->label($name, 'events_' . $event, ['class' => 'form-check-label']);
                         ?>
-                        <span class="tooltip"><?php $this->_('AppController.tooltip.text');?><div><?php $this->_('AdminMain.!tooltip.callback');?></div></span>
                     </div>
-                </li>
-                <li>
-                    <?php
-                    $this->Form->label($this->_('AdminMain.edit.field_event', true), 'event');
-                    ?>
+                </div>
+            <?php
+            }
+            ?>
+        </div>
+    </div>
 
-                    <div class="row">
+    <div class="mb-3">
+        <?php
+        $this->Form->label($this->_('AdminMain.edit.field_type', true), 'type');
+        $this->Form->fieldSelect('type', ($types ?? null), ($vars->type ?? null), ['id' => 'type', 'class' => 'form-select']);
+        ?>
+    </div>
+
+    <div class="mb-3">
+        <?php
+        $this->Form->label($this->_('AdminMain.edit.field_method', true), 'method');
+        $this->Form->fieldSelect('method', ($methods ?? null), ($vars->method ?? null), ['id' => 'method', 'class' => 'form-select']);
+        ?>
+    </div>
+
+    <h6 class="form-section-header"><?php $this->_('AdminMain.edit.heading_fields_map');?></h6>
+    <p><?php $this->_('AdminMain.edit.text_fields_map');?></p>
+
+    <div class="mb-3">
+        <a class="btn btn-outline-secondary btn-sm field_row_add" href="#"><i class="bi bi-plus-lg"></i> <?php $this->_('AdminMain.edit.field_add_field');?></a>
+    </div>
+
+    <table class="table table-hover fields_table">
+        <thead>
+            <tr>
+                <th><?php $this->_('AdminMain.edit.heading_field');?></th>
+                <th><?php $this->_('AdminMain.edit.heading_parameter');?></th>
+                <th><?php $this->_('AdminMain.edit.heading_options');?></th>
+            </tr>
+        </thead>
+        <tbody>
+            <?php
+            $i = 0;
+            if (empty($vars->fields)) {
+                $vars->fields = [['field' => null, 'parameter' => null]];
+            }
+
+            foreach ($vars->fields ?? [] as $field) {
+                $field = (array) $field;
+            ?>
+                <tr class="field_row">
+                    <td>
                         <?php
-                        foreach ($events ?? [] as $event => $name) {
+                        $this->Form->fieldText('fields[' . $i . '][field]', ($field['field'] ?? null), ['class' => 'form-control']);
                         ?>
-                            <div class="col-md-3">
-                                <div class="p-1">
-                                    <?php
-                                    $this->Form->fieldCheckbox('events[]', $event, in_array($event, $vars->events ?? []), ['id' => 'events_' . $event]);
-                                    $this->Form->label($name, 'events_' . $event, ['class' => 'inline']);
-                                    ?>
-                                </div>
-                            </div>
+                    </td>
+                    <td>
                         <?php
-                        }
+                        $this->Form->fieldText('fields[' . $i . '][parameter]', ($field['parameter'] ?? null), ['class' => 'form-control']);
                         ?>
-                    </div>
-                </li>
-                <li>
-                    <?php
-                    $this->Form->label($this->_('AdminMain.edit.field_type', true), 'type');
-                    $this->Form->fieldSelect('type', ($types ?? null), ($vars->type ?? null), ['id' => 'type']);
-                    ?>
-                </li>
-                <li>
-                    <?php
-                    $this->Form->label($this->_('AdminMain.edit.field_method', true), 'method');
-                    $this->Form->fieldSelect('method', ($methods ?? null), ($vars->method ?? null), ['id' => 'method']);
-                    ?>
-                </li>
-            </ul>
-        </div>
-
-        <div class="title_row">
-            <h3><?php $this->_('AdminMain.edit.heading_fields_map');?></h3>
-        </div>
-        <div class="pad">
-            <p><?php $this->_('AdminMain.edit.text_fields_map');?></p>
-
-            <div class="links_row">
-                <a class="btn btn-default pull-right btn-sm field_row_add" href="#"><span><?php $this->_('AdminMain.edit.field_add_field');?></span></a>
-            </div>
-
-            <table class="table fields_table">
-                <tr class="heading_row">
-                    <td><?php $this->_('AdminMain.edit.heading_field');?></td>
-                    <td class="last"><?php $this->_('AdminMain.edit.heading_parameter');?></td>
-                    <td class="last"><?php $this->_('AdminMain.edit.heading_options');?></td>
+                    </td>
+                    <td>
+                        <a class="btn btn-link btn-sm p-0 text-danger field_row_delete" href="#"><?php $this->_('AdminMain.edit.option_delete');?></a>
+                    </td>
                 </tr>
-                <?php
-                $i = 0;
-                if (empty($vars->fields)) {
-                    $vars->fields = [['field' => null, 'parameter' => null]];
-                }
-
-                foreach ($vars->fields ?? [] as $field) {
-                    $field = (array) $field;
-                ?>
-                    <tr class="field_row<?php echo (($i++%2 == 1) ? ' odd_row' : '');?>">
-                        <td>
-                            <?php
-                            $this->Form->fieldText('fields[' . $i . '][field]', ($field['field'] ?? null), ['class' => 'stretch']);
-                            ?>
-                        </td>
-                        <td>
-                            <?php
-                            $this->Form->fieldText('fields[' . $i . '][parameter]', ($field['parameter'] ?? null), ['class' => 'stretch']);
-                            ?>
-                        </td>
-                        <td>
-                            <a class="manage field_row_delete" href="#"><span><?php $this->_('AdminMain.edit.option_delete');?></span></a>
-                        </td>
-                    </tr>
-                <?php
-                }
-                unset($i);
-                ?>
-            </table>
-        </div>
-
-        <div class="button_row">
             <?php
-            $this->Form->fieldSubmit('save', $this->_('AdminMain.edit.field_editsubmit', true), ['class' => 'btn btn-primary float-right']);
+                $i++;
+            }
+            unset($i);
             ?>
-            <a class="btn btn-default float-right" href="<?php echo $this->Html->safe($this->base_uri . 'plugin/webhooks/admin_main/');?>"><?php $this->_('AdminMain.edit.field_cancel');?></a>
-        </div>
-        <?php $this->Form->end();?>
-    </div>
+        </tbody>
+    </table>
+</div>
+<div class="card-footer">
+    <a class="btn btn-secondary" href="<?php echo $this->Html->safe($this->base_uri . 'plugin/webhooks/admin_main/');?>"><?php $this->_('AdminMain.edit.field_cancel');?></a>
+    <?php
+    $this->Form->fieldSubmit('save', $this->_('AdminMain.edit.field_editsubmit', true), ['class' => 'btn btn-primary float-end']);
+    ?>
+</div>
+<?php $this->Form->end();?>
 <?php $this->Widget->end();?>
 
 <script type="text/javascript">
-    $(document).ready(function() {
-        $('.field_row_add').click(function() {
-            addFieldRow();
-            updateZebraStriping('.field_row');
-        });
+    document.addEventListener('DOMContentLoaded', function() {
+        var add_btn = document.querySelector('.field_row_add');
+        var type_select = document.getElementById('type');
+        var callback_url = document.querySelector('.callback_url');
+
+        // Add field row
+        add_btn.addEventListener('click', function(e) {
+            e.preventDefault();
+            var table = document.querySelector('table.fields_table tbody');
+            var rows = table.querySelectorAll('tr.field_row');
+            var last_row = rows[rows.length - 1];
+            var new_row = last_row.cloneNode(true);
+
+            // Clear input values
+            new_row.querySelectorAll('input[type="text"]').forEach(function(input) {
+                input.value = '';
+            });
 
-        $(document).on('click', '.field_row_delete', function() {
-            deleteFieldRow($(this));
-            updateZebraStriping('.field_row');
-        });
+            // Update indices
+            var new_index = rows.length;
+            new_row.querySelectorAll('input').forEach(function(input) {
+                input.name = input.name.replace(/\[\d+\]/, '[' + new_index + ']');
+            });
 
-        if ($('#type').val() == 'incoming') {
-            $('.callback_url').show();
-        } else {
-            $('.callback_url').hide();
-        }
+            table.appendChild(new_row);
+        });
 
-        $('#type').change(function() {
-            if ($(this).val() == 'incoming') {
-                $('.callback_url').show();
-            } else {
-                $('.callback_url').hide();
+        // Delete field row (delegated)
+        document.querySelector('table.fields_table').addEventListener('click', function(e) {
+            if (e.target.closest('.field_row_delete')) {
+                e.preventDefault();
+                var rows = document.querySelectorAll('tr.field_row');
+                if (rows.length > 1) {
+                    e.target.closest('tr').remove();
+                }
             }
         });
-    });
 
-    function addFieldRow() {
-        var field_row = $('table.fields_table tr.field_row').last().clone();
-        field_row.find('input[type=\"text\"]').val('');
-        $('table.fields_table').append(field_row);
-
-        // Set proper indices
-        var row = 0;
-        $('table.fields_table tr.field_row').each(function() {
-            $(this).find('input').each(function() {
-                $(this).prop('name', $(this).prop('name').replace(/(\[\d+\])/, '[' + row + ']'));
-                $(this).prop('name', $(this).prop('name').replace('[]', '[' + row + ']'));
-            });
+        // Type toggle
+        function toggleCallback() {
+            callback_url.style.display = type_select.value === 'incoming' ? '' : 'none';
+        }
 
-            row++;
-        });
-    }
+        toggleCallback();
+        type_select.addEventListener('change', toggleCallback);
 
-    function deleteFieldRow(row)
-    {
-        if ($('.field_row').length > 1) {
-            row.parent().parent().remove();
-        }
-    }
-
-    function updateZebraStriping(row) {
-        var i = 0;
-        $(row).each(function() {
-            if (i++%2 == 1)
-                $(this).addClass('odd_row');
-            else
-                $(this).removeClass('odd_row');
+        // Initialize Bootstrap tooltips
+        var tooltips = document.querySelectorAll('[data-bs-toggle="tooltip"]');
+        tooltips.forEach(function(el) {
+            new bootstrap.Tooltip(el);
         });
-    }
-</script>
\ No newline at end of file
+    });
+</script>
diff --git a/views/default/admin_main_logs.pdt b/views/default/admin_main_logs.pdt
index 9d4f9c5..9f98278 100644
--- a/views/default/admin_main_logs.pdt
+++ b/views/default/admin_main_logs.pdt
@@ -1,99 +1,93 @@
-        <?php
-        echo ($message ?? null);
+<?php /** @var View $this */ ?>
 
-        $link_buttons = [
-            [
-                'icon' => 'fas fa-arrow-left',
-                'name' => $this->_('AdminMain.logs.categorylink_viewwebhooks', true),
-                'attributes' => [
-                    'title' => $this->_('AdminMain.logs.categorylink_viewwebhooks', true),
-                    'href' => $this->Html->safe($this->base_uri . 'plugin/webhooks/admin_main/')
-                ]
-            ]
-        ];
+<?php
+echo ($message ?? null);
 
-        $this->Widget->clear();
-        $this->Widget->setLinkButtons($link_buttons);
-        $this->Widget->setFilters($filters, $this->Html->safe($this->base_uri . 'plugin/webhooks/admin_main/logs/'), !empty($filter_vars));
-        $this->Widget->setAjaxFiltering();
-        $this->Widget->create($this->_('AdminMain.logs.boxtitle_logs', true), ['id' => 'admin_main_logs'], ($render_section ?? null));
-        ?>
+$link_buttons = [
+    [
+        'icon' => 'bi bi-arrow-left',
+        'attributes' => [
+            'title' => $this->_('AdminMain.logs.categorylink_viewwebhooks', true),
+            'href' => $this->Html->safe($this->base_uri . 'plugin/webhooks/admin_main/')
+        ]
+    ]
+];
 
-        <div class="inner">
+$this->Widget->clear();
+$this->Widget->setLinkButtons($link_buttons);
+$this->Widget->setFilters($filters, $this->Html->safe($this->base_uri . 'plugin/webhooks/admin_main/logs/'), !empty($filter_vars));
+$this->Widget->setAjaxFiltering();
+$this->Widget->setBodyWrapper(false);
+$this->Widget->create($this->_('AdminMain.logs.boxtitle_logs', true), ['id' => 'admin_main_logs'], ($render_section ?? null));
 
-            <?php
-            if (($logs ?? false) && count($logs) > 0) {
-            ?>
-            <table class="table" id="logs_list">
-                <tr class="heading_row">
-                    <td><?php $this->_('AdminMain.logs.heading_webhook');?></td>
-                    <td><span><a href="<?php echo $this->Html->safe($this->base_uri . 'plugin/webhooks/admin_main/logs/?sort=event&order=' . ($sort == 'event' ? $negate_order : $order) . '&' . http_build_query($filters ?? []));?>" class="ajax<?php echo $this->Html->safe($sort == 'event' ? ' ' . $order : '');?>"><?php $this->_('AdminMain.logs.heading_event');?></a></span></td>
-                    <td><?php $this->_('AdminMain.logs.heading_response');?></td>
-                    <td><?php $this->_('AdminMain.logs.heading_method');?></td>
-                    <td><span><a href="<?php echo $this->Html->safe($this->base_uri . 'plugin/webhooks/admin_main/logs/?sort=http_response&order=' . ($sort == 'http_response' ? $negate_order : $order) . '&' . http_build_query($filters ?? []));?>" class="ajax<?php echo $this->Html->safe($sort == 'http_response' ? ' ' . $order : '');?>"><?php $this->_('AdminMain.logs.heading_http_response');?></a></span></td>
-                    <td><span><a href="<?php echo $this->Html->safe($this->base_uri . 'plugin/webhooks/admin_main/logs/?sort=date_triggered&order=' . ($sort == 'date_triggered' ? $negate_order : $order) . '&' . http_build_query($filters ?? []));?>" class="ajax<?php echo $this->Html->safe($sort == 'date_triggered' ? ' ' . $order : '');?>"><?php $this->_('AdminMain.logs.heading_date_triggered');?></a></span></td>
-                    <td><?php $this->_('AdminMain.logs.heading_date_last_retry');?></td>
-                    <td class="last"><?php $this->_('AdminMain.logs.heading_options');?></td>
-                </tr>
+if (($logs ?? false) && count($logs) > 0) {
+?>
+<table class="table table-hover" id="logs_list">
+    <thead>
+        <tr>
+            <th><?php $this->_('AdminMain.logs.heading_webhook');?></th>
+            <th><a href="<?php echo $this->Html->safe($this->base_uri . 'plugin/webhooks/admin_main/logs/?sort=event&order=' . ($sort == 'event' ? $negate_order : $order) . '&' . http_build_query($filters ?? []));?>" class="ajax<?php echo $this->Html->safe($sort == 'event' ? ' ' . $order : '');?>"><?php $this->_('AdminMain.logs.heading_event');?></a></th>
+            <th><?php $this->_('AdminMain.logs.heading_response');?></th>
+            <th><?php $this->_('AdminMain.logs.heading_method');?></th>
+            <th><a href="<?php echo $this->Html->safe($this->base_uri . 'plugin/webhooks/admin_main/logs/?sort=http_response&order=' . ($sort == 'http_response' ? $negate_order : $order) . '&' . http_build_query($filters ?? []));?>" class="ajax<?php echo $this->Html->safe($sort == 'http_response' ? ' ' . $order : '');?>"><?php $this->_('AdminMain.logs.heading_http_response');?></a></th>
+            <th><a href="<?php echo $this->Html->safe($this->base_uri . 'plugin/webhooks/admin_main/logs/?sort=date_triggered&order=' . ($sort == 'date_triggered' ? $negate_order : $order) . '&' . http_build_query($filters ?? []));?>" class="ajax<?php echo $this->Html->safe($sort == 'date_triggered' ? ' ' . $order : '');?>"><?php $this->_('AdminMain.logs.heading_date_triggered');?></a></th>
+            <th><?php $this->_('AdminMain.logs.heading_date_last_retry');?></th>
+            <th><?php $this->_('AdminMain.logs.heading_options');?></th>
+        </tr>
+    </thead>
+    <tbody>
+        <?php
+        foreach ($logs as $log) {
+        ?>
+        <tr>
+            <td>
+                <a href="<?php echo $this->Html->safe($this->base_uri . 'plugin/webhooks/admin_main/edit/' . $log->webhook_id);?>"><?php echo $this->Html->safe($log->callback ?? '');?></a>
+            </td>
+            <td><?php echo $this->Html->safe($log->event ?? '');?></td>
+            <td>
                 <?php
-                $i = 0;
-                foreach ($logs as $log) {
+                $this->Form->fieldTextarea('response', ($log->response ?? ''), ['class' => 'form-control', 'rows' => 4]);
                 ?>
-                <tr<?php echo (($i++%2 == 1) ? ' class="odd_row"' : '');?>>
-                    <td>
-                        <a href="<?php echo $this->Html->safe($this->base_uri . 'plugin/webhooks/admin_main/edit/' . $log->webhook_id);?>"><?php echo $this->Html->safe($log->callback ?? '');?></a>
-                    </td>
-                    <td><?php echo $this->Html->safe($log->event ?? '');?></td>
-                    <td>
-                        <?php
-                        $this->Form->fieldTextarea('response', ($log->response ?? ''), ['class' => 'w-100', 'rows' => 4]);
-                        ?>
-                    </td>
-                    <td><?php echo $this->Html->safe(strtoupper($log->method ?? ''));?></td>
-                    <td><?php echo $this->Html->safe($log->http_response ?? '');?></td>
-                    <td><?php echo $this->Date->cast($log->date_triggered, 'date_time');?></td>
-                    <td><?php echo !empty($log->date_last_retry) ? $this->Date->cast($log->date_last_retry, 'date_time') : '';?></td>
-                    <td class="last">
-                        <?php
-                        $this->Form->create($this->base_uri . 'plugin/webhooks/admin_main/retry/');
-                        $this->Form->fieldHidden('id', ($log->id ?? null));
-                        ?>
-                        <a href="<?php echo $this->base_uri . 'plugin/webhooks/admin_main/retry/' . $this->Html->safe($log->id) . '/';?>" class="manage" rel="<?php echo $this->Html->safe($this->_('AdminMain.logs.confirm_resend', true));?>"><?php $this->_('AdminMain.logs.option_resend');?></a>
-                        <?php
-                        $this->Form->end();
-                        ?>
-                    </td>
-                </tr>
+            </td>
+            <td><?php echo $this->Html->safe(strtoupper($log->method ?? ''));?></td>
+            <td><?php echo $this->Html->safe($log->http_response ?? '');?></td>
+            <td><?php echo $this->Date->cast($log->date_triggered, 'date_time');?></td>
+            <td><?php echo !empty($log->date_last_retry) ? $this->Date->cast($log->date_last_retry, 'date_time') : '';?></td>
+            <td>
                 <?php
-                }
-                unset($i);
+                $this->Form->create($this->base_uri . 'plugin/webhooks/admin_main/retry/', ['class' => 'd-inline']);
+                $this->Form->fieldHidden('id', ($log->id ?? null));
                 ?>
-            </table>
-            <?php
-                // Set pagination
-                $this->Pagination->build();
-            } else {
-            ?>
-            <div class="empty_section">
-                <div class="empty_box">
-                    <?php $this->_('AdminMain.logs.no_results');?>
-                </div>
-            </div>
-            <?php
-            }
-            ?>
-        </div>
+                <button type="button" class="btn btn-link btn-sm p-0 modal-confirm-delete" data-confirm-message="<?php echo $this->Html->safe($this->_('AdminMain.logs.confirm_resend', true));?>"><?php $this->_('AdminMain.logs.option_resend');?></button>
+                <?php
+                $this->Form->end();
+                ?>
+            </td>
+        </tr>
+        <?php
+        }
+        ?>
+    </tbody>
+</table>
+<?php
+    $this->Pagination->build();
+} else {
+?>
+<div class="card-body text-center text-muted py-5">
+    <i class="bi bi-journal-text" style="font-size: 3rem; opacity: 0.3;"></i>
+    <p class="mt-3 mb-0"><?php $this->_('AdminMain.logs.no_results');?></p>
+</div>
+<?php
+}
 
-        <?php $this->Widget->end();?>
+$this->Widget->end();
+?>
 
 <script type="text/javascript">
-    $(document).ready(function() {
-        $('#date_start, #date_end').datePicker({startDate:'1996-01-01'});
-
-        $('#admin_main_logs a.manage[rel]').blestaModalConfirm({
-            base_url: '<?php echo $this->base_uri;?>',
-            close: '<?php echo addslashes($this->_('AppController.modal.text_close', true));?>',
-            submit: true
-        });
+    document.addEventListener('DOMContentLoaded', function() {
+        // Date picker initialization (Blesta core widget)
+        if (typeof jQuery !== 'undefined') {
+            jQuery('#date_start, #date_end').datePicker({startDate:'1996-01-01'});
+        }
     });
 </script>
diff --git a/views/default/admin_main_view.pdt b/views/default/admin_main_view.pdt
index f9e5319..1be9604 100644
--- a/views/default/admin_main_view.pdt
+++ b/views/default/admin_main_view.pdt
@@ -1,165 +1,130 @@
+<?php /** @var View $this */ ?>
+
 <?php
 echo ($message ?? null);
 
 $this->Widget->clear();
+$this->Widget->setBodyWrapper(false);
 $this->Widget->create($this->_('AdminMain.view.boxtitle_viewwebhook', true), ['id' => 'admin_main_view'], (isset($render_section) ? $render_section : null));
 ?>
-    <div class="inner">
-        <div class="row">
-            <div class="col-lg-6 pl-lg-2 pr-lg-0">
-                <div class="title_row first">
-                    <h3><?php $this->_('AdminMain.view.heading_webhook');?></h3>
-                </div>
-                <div class="pad pb-3">
-                    <table class="table fields_table">
-                        <tr class="heading_row">
-                            <td><?php $this->_('AdminMain.view.heading_callback');?></td>
-                            <td><?php $this->_('AdminMain.view.heading_type');?></td>
-                            <td class="last"><?php $this->_('AdminMain.view.heading_method');?></td>
-                        </tr>
-                            <tr class="field_row">
-                                <td>
-                                    <?php echo $this->Html->safe($webhook->callback ?? null);?>
-                                </td>
-                                <td>
-                                    <?php echo $this->Html->safe($types[$webhook->type] ?? null);?>
-                                </td>
-                                <td>
-                                    <?php echo $this->Html->safe($methods[$webhook->method] ?? null);?>
-                                </td>
-                            </tr>
-                    </table>
-                </div>
-            </div>
-
-            <div class="col-lg-6">
-                <div class="title_row first">
-                    <h3><?php $this->_('AdminMain.view.heading_events');?></h3>
-                </div>
-                <div class="pad">
-                    <table class="table fields_table">
-                        <tr class="heading_row">
-                            <td class="last"><?php $this->_('AdminMain.view.heading_event');?></td>
-                        </tr>
-                        <?php
-                        $i = 0;
-                        foreach ($webhook->events ?? [] as $event) {
-                        ?>
-                            <tr class="field_row">
-                                <td>
-                                    <?php echo $this->Html->safe($event ?? null);?>
-                                </td>
-                            </tr>
-                        <?php
-                        }
-                        unset($i);
-                        ?>
-                    </table>
-                </div>
-            </div>
+<div class="card-body">
+    <div class="row">
+        <div class="col-lg-6 ps-lg-2 pe-lg-0">
+            <h6 class="form-section-header"><?php $this->_('AdminMain.view.heading_webhook');?></h6>
+            <table class="table table-hover">
+                <thead>
+                    <tr>
+                        <th><?php $this->_('AdminMain.view.heading_callback');?></th>
+                        <th><?php $this->_('AdminMain.view.heading_type');?></th>
+                        <th><?php $this->_('AdminMain.view.heading_method');?></th>
+                    </tr>
+                </thead>
+                <tbody>
+                    <tr>
+                        <td><?php echo $this->Html->safe($webhook->callback ?? null);?></td>
+                        <td><?php echo $this->Html->safe($types[$webhook->type] ?? null);?></td>
+                        <td><?php echo $this->Html->safe($methods[$webhook->method] ?? null);?></td>
+                    </tr>
+                </tbody>
+            </table>
         </div>
 
-        <?php
-        if (!empty($webhook->fields ?? [])) {
-        ?>
-            <div class="title_row">
-                <h3><?php $this->_('AdminMain.view.heading_fields_map');?></h3>
-            </div>
-            <div class="pad">
-                <table class="table fields_table">
-                    <tr class="heading_row">
-                        <td><?php $this->_('AdminMain.view.heading_field');?></td>
-                        <td class="last"><?php $this->_('AdminMain.view.heading_parameter');?></td>
+        <div class="col-lg-6">
+            <h6 class="form-section-header"><?php $this->_('AdminMain.view.heading_events');?></h6>
+            <table class="table table-hover">
+                <thead>
+                    <tr>
+                        <th><?php $this->_('AdminMain.view.heading_event');?></th>
                     </tr>
+                </thead>
+                <tbody>
                     <?php
-                    $i = 0;
-                    foreach ($webhook->fields ?? [] as $field) {
-                        $field = (array) $field;
+                    foreach ($webhook->events ?? [] as $event) {
                     ?>
-                        <tr class="field_row<?php echo (($i++%2 == 1) ? ' odd_row' : '');?>">
-                            <td>
-                                <?php echo $this->Html->safe($field['field'] ?? '');?>
-                            </td>
-                            <td>
-                                <?php echo $this->Html->safe($field['parameter'] ?? '');?>
-                            </td>
+                        <tr>
+                            <td><?php echo $this->Html->safe($event ?? null);?></td>
                         </tr>
                     <?php
                     }
-                    unset($i);
                     ?>
-                </table>
-            </div>
-        <?php
-        }
-        ?>
-
-        <div class="title_row">
-            <h3><?php $this->_('AdminMain.view.heading_logs');?></h3>
+                </tbody>
+            </table>
         </div>
-        <div class="pad">
-            <table class="table fields_table">
-                <tr class="heading_row">
-                    <td><?php $this->_('AdminMain.view.heading_event');?></td>
-                    <td><?php $this->_('AdminMain.view.heading_response');?></td>
-                    <td><?php $this->_('AdminMain.view.heading_http_response');?></td>
-                    <td><?php $this->_('AdminMain.view.heading_date_triggered');?></td>
-                    <td><?php $this->_('AdminMain.view.heading_date_last_retry');?></td>
-                    <td class="last"><?php $this->_('AdminMain.view.heading_options');?></td>
+    </div>
+
+    <?php
+    if (!empty($webhook->fields ?? [])) {
+    ?>
+        <h6 class="form-section-header"><?php $this->_('AdminMain.view.heading_fields_map');?></h6>
+        <table class="table table-hover">
+            <thead>
+                <tr>
+                    <th><?php $this->_('AdminMain.view.heading_field');?></th>
+                    <th><?php $this->_('AdminMain.view.heading_parameter');?></th>
                 </tr>
+            </thead>
+            <tbody>
                 <?php
-                $i = 0;
-                foreach ($logs ?? [] as $log) {
+                foreach ($webhook->fields ?? [] as $field) {
+                    $field = (array) $field;
                 ?>
-                    <tr class="field_row<?php echo (($i++%2 == 1) ? ' odd_row' : '');?>">
-                        <td>
-                            <?php echo $this->Html->safe($log->event ?? '');?>
-                        </td>
-                        <td>
-                            <?php
-                            $this->Form->fieldTextarea('response', ($log->response ?? ''), ['class' => 'w-100', 'rows' => 4]);
-                            ?>
-                        </td>
-                        <td>
-                            <?php echo $this->Html->safe($log->http_response ?? '');?>
-                        </td>
-                        <td>
-                            <?php echo $this->Date->cast($log->date_triggered, 'date_time');?>
-                        </td>
-                        <td>
-                            <?php echo !empty($log->date_last_retry) ? $this->Date->cast($log->date_last_retry, 'date_time') : '';?>
-                        </td>
-                        <td>
-                            <?php
-                            $this->Form->create($this->base_uri . 'plugin/webhooks/admin_main/retry/');
-                            $this->Form->fieldHidden('id', ($log->id ?? null));
-                            ?>
-                            <a href="<?php echo $this->base_uri . 'plugin/webhooks/admin_main/retry/' . $this->Html->safe($log->id) . '/';?>" class="manage" rel="<?php echo $this->Html->safe($this->_('AdminMain.view.confirm_retry', true));?>"><?php $this->_('AdminMain.view.option_retry');?></a>
-                            <?php
-                            $this->Form->end();
-                            ?>
-                        </td>
+                    <tr>
+                        <td><?php echo $this->Html->safe($field['field'] ?? '');?></td>
+                        <td><?php echo $this->Html->safe($field['parameter'] ?? '');?></td>
                     </tr>
                 <?php
                 }
-                unset($i);
                 ?>
-            </table>
+            </tbody>
+        </table>
+    <?php
+    }
+    ?>
+
+    <h6 class="form-section-header"><?php $this->_('AdminMain.view.heading_logs');?></h6>
+    <table class="table table-hover">
+        <thead>
+            <tr>
+                <th><?php $this->_('AdminMain.view.heading_event');?></th>
+                <th><?php $this->_('AdminMain.view.heading_response');?></th>
+                <th><?php $this->_('AdminMain.view.heading_http_response');?></th>
+                <th><?php $this->_('AdminMain.view.heading_date_triggered');?></th>
+                <th><?php $this->_('AdminMain.view.heading_date_last_retry');?></th>
+                <th><?php $this->_('AdminMain.view.heading_options');?></th>
+            </tr>
+        </thead>
+        <tbody>
             <?php
-            // Set pagination
-            $this->Pagination->build();
+            foreach ($logs ?? [] as $log) {
             ?>
-        </div>
-    </div>
+                <tr>
+                    <td><?php echo $this->Html->safe($log->event ?? '');?></td>
+                    <td>
+                        <?php
+                        $this->Form->fieldTextarea('response', ($log->response ?? ''), ['class' => 'form-control', 'rows' => 4]);
+                        ?>
+                    </td>
+                    <td><?php echo $this->Html->safe($log->http_response ?? '');?></td>
+                    <td><?php echo $this->Date->cast($log->date_triggered, 'date_time');?></td>
+                    <td><?php echo !empty($log->date_last_retry) ? $this->Date->cast($log->date_last_retry, 'date_time') : '';?></td>
+                    <td>
+                        <?php
+                        $this->Form->create($this->base_uri . 'plugin/webhooks/admin_main/retry/', ['class' => 'd-inline']);
+                        $this->Form->fieldHidden('id', ($log->id ?? null));
+                        ?>
+                        <button type="button" class="btn btn-link btn-sm p-0 modal-confirm-delete" data-confirm-message="<?php echo $this->Html->safe($this->_('AdminMain.view.confirm_retry', true));?>"><?php $this->_('AdminMain.view.option_retry');?></button>
+                        <?php
+                        $this->Form->end();
+                        ?>
+                    </td>
+                </tr>
+            <?php
+            }
+            ?>
+        </tbody>
+    </table>
+    <?php
+    $this->Pagination->build();
+    ?>
+</div>
 <?php $this->Widget->end();?>
-
-<script type="text/javascript">
-    $(document).ready(function() {
-        // Handle confirmation
-        $('#admin_main_view .table a.manage[rel]').blestaModalConfirm({
-            base_url: '<?php echo $this->base_uri;?>',
-            close: '<?php echo addslashes($this->_('AppController.modal.text_close', true));?>',
-            submit: true
-        });
-    });
-</script>