diff --git a/apps/connect/models.py b/apps/connect/models.py
index 831d4a53..0b33a85e 100644
--- a/apps/connect/models.py
+++ b/apps/connect/models.py
@@ -13,6 +13,9 @@ SUPPORTED_EVENTS = {
     "m3u_refresh": "M3U Refreshed",
     "client_connect": "Client Connected",
     "client_disconnect": "Client Disconnected",
+    "login_failed": "Login Failed",
+    "epg_blocked": "EPG Blocked",
+    "m3u_blocked": "M3U Blocked",
 }
 
 class Integration(models.Model):
diff --git a/frontend/src/components/forms/Connection.jsx b/frontend/src/components/forms/Connection.jsx
index e92caf13..d55ee522 100644
--- a/frontend/src/components/forms/Connection.jsx
+++ b/frontend/src/components/forms/Connection.jsx
@@ -8,9 +8,9 @@ import {
   Flex,
   TextInput,
   Box,
-  Title,
   Checkbox,
   Text,
+  SimpleGrid,
 } from '@mantine/core';
 import { isNotEmpty, useForm } from '@mantine/form';
 import { SUBSCRIPTION_EVENTS } from '../../constants';
@@ -72,6 +72,7 @@ const ConnectionForm = ({ connection = null, isOpen, onClose }) => {
       );
     } else {
       form.reset();
+      setSelectedEvents([]);
     }
   }, [connection]);
 
@@ -128,7 +129,7 @@ const ConnectionForm = ({ connection = null, isOpen, onClose }) => {
   if (!isOpen) return null;
 
   return (
-    <Modal opened={isOpen} onClose={handleClose} title="Connection">
+    <Modal opened={isOpen} size="lg" onClose={handleClose} title="Connection">
       <form onSubmit={form.onSubmit(onSubmit)}>
         <Stack gap="md">
           <TextInput
@@ -161,17 +162,19 @@ const ConnectionForm = ({ connection = null, isOpen, onClose }) => {
 
           <Box>
             <Text size="sm" weight={500} mb={5}>
-              Triggers
+              Event Triggers
             </Text>
             <Stack gap="xs">
-              {EVENT_OPTIONS.map((opt) => (
-                <Checkbox
-                  key={opt.value}
-                  label={opt.label}
-                  checked={selectedEvents.includes(opt.value)}
-                  onChange={() => toggleEvent(opt.value)}
-                />
-              ))}
+              <SimpleGrid cols={3}>
+                {EVENT_OPTIONS.map((opt) => (
+                  <Checkbox
+                    key={opt.value}
+                    label={opt.label}
+                    checked={selectedEvents.includes(opt.value)}
+                    onChange={() => toggleEvent(opt.value)}
+                  />
+                ))}
+              </SimpleGrid>
             </Stack>
           </Box>
 
diff --git a/frontend/src/constants.js b/frontend/src/constants.js
index 11ba0f3b..d2caa45b 100644
--- a/frontend/src/constants.js
+++ b/frontend/src/constants.js
@@ -368,4 +368,7 @@ export const SUBSCRIPTION_EVENTS = {
   m3u_refresh: 'M3U Refreshed',
   client_connect: 'Client Connected',
   client_disconnect: 'Client Disconnected',
+  login_failed: 'Login Failed',
+  epg_blocked: 'EPG Blocked',
+  m3u_blocked: 'M3U Blocked',
 };