diff --git a/frontend/src/components/forms/EPG.jsx b/frontend/src/components/forms/EPG.jsx
index b886dccf..0c7f78c0 100644
--- a/frontend/src/components/forms/EPG.jsx
+++ b/frontend/src/components/forms/EPG.jsx
@@ -12,19 +12,22 @@ import {
   NativeSelect,
   NumberInput,
   Space,
+  Grid,
+  Group,
+  FileInput,
+  Title,
+  Text,
+  Divider,
+  Stack,
+  Box,
 } from '@mantine/core';
 import { isNotEmpty, useForm } from '@mantine/form';
+import { IconUpload } from '@tabler/icons-react';
 
 const EPG = ({ epg = null, isOpen, onClose }) => {
   const epgs = useEPGsStore((state) => state.epgs);
-  const [file, setFile] = useState(null);
-
-  const handleFileChange = (e) => {
-    const file = e.target.files[0];
-    if (file) {
-      setFile(file);
-    }
-  };
+  // Remove the file state and handler since we're not supporting file uploads
+  const [sourceType, setSourceType] = useState('xmltv');
 
   const form = useForm({
     mode: 'uncontrolled',
@@ -47,114 +50,151 @@ const EPG = ({ epg = null, isOpen, onClose }) => {
     const values = form.getValues();
 
     if (epg?.id) {
-      await API.updateEPG({ id: epg.id, ...values, file });
+      // Remove file from API call
+      await API.updateEPG({ id: epg.id, ...values });
     } else {
+      // Remove file from API call
       await API.addEPG({
         ...values,
-        file,
       });
     }
 
     form.reset();
-    setFile(null);
     onClose();
   };
 
   useEffect(() => {
     if (epg) {
-      form.setValues({
+      const values = {
         name: epg.name,
         source_type: epg.source_type,
         url: epg.url,
         api_key: epg.api_key,
         is_active: epg.is_active,
         refresh_interval: epg.refresh_interval,
-      });
+      };
+      form.setValues(values);
+      setSourceType(epg.source_type); // Update source type state
     } else {
       form.reset();
+      setSourceType('xmltv'); // Reset to xmltv
     }
   }, [epg]);
 
+  // Function to handle source type changes
+  const handleSourceTypeChange = (value) => {
+    form.setFieldValue('source_type', value);
+    setSourceType(value);
+  };
+
   if (!isOpen) {
     return <></>;
   }
 
   return (
-    <Modal opened={isOpen} onClose={onClose} title="EPG Source">
+    <Modal opened={isOpen} onClose={onClose} title="EPG Source" size={700}>
       <form onSubmit={form.onSubmit(onSubmit)}>
-        <TextInput
-          id="name"
-          name="name"
-          label="Name"
-          description="Unique identifier for this EPG source"
-          {...form.getInputProps('name')}
-          key={form.key('name')}
-        />
+        <Group justify="space-between" align="top">
+          {/* Left Column */}
+          <Stack gap="md" style={{ flex: 1 }}>
+            <TextInput
+              id="name"
+              name="name"
+              label="Name"
+              description="Unique identifier for this EPG source"
+              {...form.getInputProps('name')}
+              key={form.key('name')}
+            />
 
-        <TextInput
-          id="url"
-          name="url"
-          label="URL"
-          description="Direct URL to the XMLTV file or API endpoint"
-          {...form.getInputProps('url')}
-          key={form.key('url')}
-        />
+            <NativeSelect
+              id="source_type"
+              name="source_type"
+              label="Source Type"
+              description="Format of the EPG data source"
+              {...form.getInputProps('source_type')}
+              key={form.key('source_type')}
+              data={[
+                {
+                  label: 'XMLTV',
+                  value: 'xmltv',
+                },
+                {
+                  label: 'Schedules Direct',
+                  value: 'schedules_direct',
+                },
+              ]}
+              onChange={(event) => handleSourceTypeChange(event.currentTarget.value)}
+            />
 
-        <TextInput
-          id="api_key"
-          name="api_key"
-          label="API Key"
-          description="API key for services that require authentication (like Schedules Direct)"
-          {...form.getInputProps('api_key')}
-          key={form.key('api_key')}
-        />
+            <NumberInput
+              label="Refresh Interval (hours)"
+              description="How often to refresh EPG data (0 to disable)"
+              {...form.getInputProps('refresh_interval')}
+              key={form.key('refresh_interval')}
+              min={0}
+            />
+          </Stack>
 
-        <NativeSelect
-          id="source_type"
-          name="source_type"
-          label="Source Type"
-          description="Format of the EPG data source"
-          {...form.getInputProps('source_type')}
-          key={form.key('source_type')}
-          data={[
-            {
-              label: 'XMLTV',
-              value: 'xmltv',
-            },
-            {
-              label: 'Schedules Direct',
-              value: 'schedules_direct',
-            },
-          ]}
-        />
+          <Divider size="sm" orientation="vertical" />
 
-        <NumberInput
-          label="Refresh Interval (hours)"
-          description={<>How often to automatically refresh EPG data<br />
-            (0 to disable automatic refreshes)</>}
-          {...form.getInputProps('refresh_interval')}
-          key={form.key('refresh_interval')}
-        />
+          {/* Right Column */}
+          <Stack gap="md" style={{ flex: 1 }}>
+            <TextInput
+              id="url"
+              name="url"
+              label="URL"
+              description="Direct URL to the XMLTV file or API endpoint"
+              {...form.getInputProps('url')}
+              key={form.key('url')}
+            />
 
-        <Checkbox
-          id="is_active"
-          name="is_active"
-          label="Is Active"
-          description="Enable or disable this EPG source"
-          {...form.getInputProps('is_active', { type: 'checkbox' })}
-          key={form.key('is_active')}
-        />
+            <TextInput
+              id="api_key"
+              name="api_key"
+              label="API Key"
+              description="API key for services that require authentication"
+              {...form.getInputProps('api_key')}
+              key={form.key('api_key')}
+              disabled={sourceType !== 'schedules_direct'} // Use the state variable
+            />
 
-        <Flex mih={50} gap="xs" justify="flex-end" align="flex-end">
-          <Button
-            type="submit"
-            variant="contained"
-            disabled={form.submitting}
-            size="small"
-          >
-            Submit
-          </Button>
-        </Flex>
+            {/* Put checkbox at the same level as Refresh Interval */}
+            <Box style={{ marginTop: 0 }}>
+              <Text size="sm" fw={500} mb={3}>Status</Text>
+              <Text size="xs" c="dimmed" mb={12}>When enabled, this EPG source will auto update.</Text>
+              <Box style={{
+                display: 'flex',
+                alignItems: 'center',
+                height: '30px',  // Reduced height
+                marginTop: '-4px' // Slight negative margin to move it up
+              }}>
+                <Checkbox
+                  id="is_active"
+                  name="is_active"
+                  label="Enable this EPG source"
+                  {...form.getInputProps('is_active', { type: 'checkbox' })}
+                  key={form.key('is_active')}
+                />
+              </Box>
+            </Box>
+          </Stack>
+        </Group>
+
+        {/* Full Width Section */}
+        <Box mt="md">
+          <Divider my="sm" />
+
+          <Group justify="end" mt="xl">
+            <Button variant="outline" onClick={onClose}>Cancel</Button>
+            <Button
+              type="submit"
+              variant="filled"
+              disabled={form.submitting}
+            >
+              {epg?.id ? 'Update' : 'Create'} EPG Source
+            </Button>
+          </Group>
+        </Box>
       </form>
     </Modal>
   );