diff --git a/templates/index.html b/templates/index.html
index 3f7a40f..4fd9d19 100644
--- a/templates/index.html
+++ b/templates/index.html
@@ -399,11 +399,11 @@
       <h3 class="lt-modal-title" id="suppress-modal-title">Suppress Alert</h3>
       <button type="button" class="lt-modal-close" data-modal-close aria-label="Close">✕</button>
     </div>
-    <form id="suppress-form" onsubmit="submitSuppress(event)">
+    <form id="suppress-form">
       <div class="lt-modal-body">
         <div class="lt-form-group" style="margin-bottom:12px">
           <label class="lt-label" for="sup-type">Target Type</label>
-          <select class="lt-select" id="sup-type" name="target_type" onchange="updateSuppressForm()">
+          <select class="lt-select" id="sup-type" name="target_type">
             <option value="host">Host (all interfaces)</option>
             <option value="interface">Specific Interface</option>
             <option value="unifi_device">UniFi Device</option>
@@ -449,6 +449,8 @@
 {% block scripts %}
 <script>
   lt.autoRefresh.start(refreshAll, 30000);
+  document.getElementById('suppress-form')?.addEventListener('submit', submitSuppress);
+  document.getElementById('sup-type')?.addEventListener('change', updateSuppressForm);
 
   function updateEventAges() {
     document.querySelectorAll('.event-age[data-ts]').forEach(el => {
diff --git a/templates/inspector.html b/templates/inspector.html
index 8450aa0..0c4cf22 100644
--- a/templates/inspector.html
+++ b/templates/inspector.html
@@ -115,7 +115,7 @@ function portBlockHtml(idx, port, swName, sfpBlock) {
   return `<div class="switch-port-block ${state}${sfpCls}"
     data-switch="${escHtml(swName)}" data-port-idx="${idx}"
     title="${title}"
-    onclick="selectPort(this)"><span class="port-num">${numLabel}</span>${speedHtml}${lldpHtml}</div>`;
+    data-action="select-port"><span class="port-num">${numLabel}</span>${speedHtml}${lldpHtml}</div>`;
 }
 
 // ── Chassis legend HTML ──────────────────────────────────────────────────
@@ -169,8 +169,8 @@ function renderChassis(swName, sw) {
         const lldpHtml  = lldpName ? `<span class="port-lldp">${lldpName}</span>` : '';
         chassisHtml += `<div class="switch-port-block ${state}${sfpCls}"
           data-switch="${escHtml(swName)}" data-port-idx="${idx}"
-          title="${title}"
-          onclick="selectPort(this)"><span class="port-num">${idx}</span>${speedHtml}${lldpHtml}</div>`;
+          title="${title}" aria-label="${title}"
+          data-action="select-port"><span class="port-num">${idx}</span>${speedHtml}${lldpHtml}</div>`;
       }
       chassisHtml += '</div>';
     }
@@ -318,7 +318,7 @@ function renderPanel(swName, idx) {
     _apiData.hosts && _apiData.hosts[d.lldp.system_name]);
   const diagHtml = hasDiagTarget ? `
     <div class="diag-bar">
-      <button class="btn-diag" onclick="runDiagnostic('${escHtml(swName)}', ${idx})">Run Link Diagnostics</button>
+      <button class="btn-diag" data-action="run-diagnostic" data-sw="${escHtml(swName)}" data-idx="${idx}">Run Link Diagnostics</button>
       <span class="diag-status" id="diag-status"></span>
     </div>
     <div class="diag-results" id="diag-results"></div>` : '';
@@ -330,7 +330,7 @@ function renderPanel(swName, idx) {
         <span class="panel-port-name">${escHtml(d.name)}</span>${isUplinkBadge}
         <div class="panel-meta">${escHtml(swName)} · port #${idx}</div>
       </div>
-      <button class="panel-close" onclick="closePanel()">✕</button>
+      <button class="panel-close" data-action="close-panel" aria-label="Close panel">✕</button>
     </div>
 
     <div class="panel-section-title">Link</div>
@@ -468,6 +468,20 @@ lt.keys.on('Escape', () => {
   if (document.getElementById('inspector-panel').classList.contains('open')) closePanel();
 });
 
+document.addEventListener('click', e => {
+  const portBlock = e.target.closest('[data-action="select-port"]');
+  if (portBlock) { selectPort(portBlock); return; }
+
+  const closeBtn = e.target.closest('[data-action="close-panel"]');
+  if (closeBtn) { closePanel(); return; }
+
+  const diagBtn = e.target.closest('[data-action="run-diagnostic"]');
+  if (diagBtn) { runDiagnostic(diagBtn.dataset.sw, parseInt(diagBtn.dataset.idx, 10)); return; }
+
+  const toggleDiag = e.target.closest('[data-action="toggle-diag"]');
+  if (toggleDiag) { toggleDiag.parentElement.classList.toggle('diag-open'); return; }
+});
+
 // ── Link Diagnostics ─────────────────────────────────────────────────
 let _diagPollTimer = null;
 
@@ -635,7 +649,7 @@ function renderDiagnosticResults(d, container) {
     }).join('');
     nicStatHtml = `
       <div class="diag-section diag-collapsible">
-        <div class="diag-section-header diag-toggle" onclick="this.parentElement.classList.toggle('diag-open')">
+        <div class="diag-section-header diag-toggle" data-action="toggle-diag">
           ethtool -S (NIC stats) <span class="diag-toggle-hint">[expand]</span>
         </div>
         <div class="diag-section-body">
@@ -711,7 +725,7 @@ function renderDiagnosticResults(d, container) {
     }).join('');
     dmesgHtml = `
       <div class="diag-section diag-collapsible">
-        <div class="diag-section-header diag-toggle" onclick="this.parentElement.classList.toggle('diag-open')">
+        <div class="diag-section-header diag-toggle" data-action="toggle-diag">
           Kernel Events (dmesg) <span class="diag-toggle-hint">[expand]</span>
         </div>
         <div class="diag-section-body">
diff --git a/templates/links.html b/templates/links.html
index f57cf06..afe6afb 100644
--- a/templates/links.html
+++ b/templates/links.html
@@ -327,7 +327,7 @@ function renderUnifiSwitches(unifiSwitches, dataUpdated) {
 
     return `
       <div class="link-host-panel" id="panel-${CSS.escape(swName)}">
-        <div class="link-host-title" onclick="togglePanel(this.closest('.link-host-panel'))">
+        <div class="link-host-title" data-action="toggle-panel">
           <span class="link-host-name">${escHtml(swName)}</span>
           <span class="link-host-ip">${escHtml(sw.ip || '')}</span>
           <span class="link-host-upd">${escHtml(sw.model || '')}${updStr ? ' · ' + updStr : ''}${poeLoad}</span>
@@ -415,8 +415,8 @@ function renderLinks(data) {
 
   parts.push(buildLinkSummary(hosts, unifiSwitches));
   parts.push(`<div class="link-collapse-bar">
-    <button class="lt-btn lt-btn-ghost lt-btn-sm" onclick="collapseAll()">Collapse All</button>
-    <button class="lt-btn lt-btn-ghost lt-btn-sm" onclick="expandAll()">Expand All</button>
+    <button class="lt-btn lt-btn-ghost lt-btn-sm" data-action="collapse-all">Collapse All</button>
+    <button class="lt-btn lt-btn-ghost lt-btn-sm" data-action="expand-all">Expand All</button>
   </div>`);
   parts.push('<div class="link-host-list">');
 
@@ -432,7 +432,7 @@ function renderLinks(data) {
 
     parts.push(`
       <div class="link-host-panel" id="panel-${CSS.escape(hostname)}">
-        <div class="link-host-title" onclick="togglePanel(this.closest('.link-host-panel'))">
+        <div class="link-host-title" data-action="toggle-panel">
           <span class="link-host-name">${escHtml(hostname)}</span>
           <span class="link-host-ip">${escHtml(ip)}</span>
           <span class="link-host-upd">${updStr}</span>
@@ -511,5 +511,13 @@ async function loadLinks() {
 
 loadLinks();
 lt.autoRefresh.start(loadLinks, 60000);
+
+document.addEventListener('click', e => {
+  const toggleTitle = e.target.closest('[data-action="toggle-panel"]');
+  if (toggleTitle) { togglePanel(toggleTitle.closest('.link-host-panel')); return; }
+
+  if (e.target.closest('[data-action="collapse-all"]')) { collapseAll(); return; }
+  if (e.target.closest('[data-action="expand-all"]'))   { expandAll();   return; }
+});
 </script>
 {% endblock %}
diff --git a/templates/suppressions.html b/templates/suppressions.html
index 59a7af7..a77df40 100644
--- a/templates/suppressions.html
+++ b/templates/suppressions.html
@@ -15,11 +15,11 @@
   </div>
   <div class="lt-card">
     <div class="lt-card-body">
-      <form id="create-suppression-form" onsubmit="createSuppression(event)">
+      <form id="create-suppression-form">
         <div class="form-row">
           <div class="lt-form-group">
             <label class="lt-label" for="s-type">Target Type <span class="required">*</span></label>
-            <select class="lt-select" id="s-type" name="target_type" onchange="onTypeChange()">
+            <select class="lt-select" id="s-type" name="target_type">
               <option value="host">Host (all interfaces)</option>
               <option value="interface">Specific Interface</option>
               <option value="unifi_device">UniFi Device</option>
@@ -294,6 +294,9 @@
     }
   }
 
+  document.getElementById('s-type')?.addEventListener('change', onTypeChange);
+  document.getElementById('create-suppression-form')?.addEventListener('submit', createSuppression);
+
   document.addEventListener('click', e => {
     const pill = e.target.closest('#create-suppression-form .pill[data-duration]');
     if (pill) {