diff --git a/src/views/Settings/NotificationSetting.jsx b/src/views/Settings/NotificationSetting.jsx
index 3bf3adb..ae8633b 100644
--- a/src/views/Settings/NotificationSetting.jsx
+++ b/src/views/Settings/NotificationSetting.jsx
@@ -150,18 +150,7 @@ const NotificationSetting = () => {
       <Divider />
       <Typography level='body-md'>Manage your Device Notificaiton</Typography>
 
-      <FormControl
-        orientation='horizontal'
-        sx={{ width: 400, justifyContent: 'space-between' }}
-      >
-        <div>
-          <FormLabel>Device Notification</FormLabel>
-          <FormHelperText sx={{ mt: 0 }}>
-            {Capacitor.isNativePlatform()
-              ? 'Receive notification on your device when a task is due'
-              : 'This feature is only available on mobile devices'}{' '}
-          </FormHelperText>
-        </div>
+      <FormControl orientation='horizontal'>
         <Switch
           disabled={!Capacitor.isNativePlatform()}
           checked={deviceNotification}
@@ -184,15 +173,16 @@ const NotificationSetting = () => {
           }}
           color={deviceNotification ? 'success' : 'neutral'}
           variant={deviceNotification ? 'solid' : 'outlined'}
-          endDecorator={deviceNotification ? 'On' : 'Off'}
-          slotProps={{
-            endDecorator: {
-              sx: {
-                minWidth: 24,
-              },
-            },
-          }}
+          sx={{ mr: 1 }}
         />
+        <div>
+          <FormLabel>Device Notification</FormLabel>
+          <FormHelperText sx={{ mt: 0 }}>
+            {Capacitor.isNativePlatform()
+              ? 'Receive notification on your device when a task is due'
+              : 'This feature is only available on mobile devices'}{' '}
+          </FormHelperText>
+        </div>
       </FormControl>
       {deviceNotification && (
         <Card>
@@ -329,17 +319,9 @@ const NotificationSetting = () => {
         Notificaiton through other platform like Telegram or Pushover
       </Typography>
 
-      <FormControl
-        orientation='horizontal'
-        sx={{ width: 400, justifyContent: 'space-between' }}
-      >
-        <div>
-          <FormLabel>Custom Notification</FormLabel>
-          <FormHelperText sx={{ mt: 0 }}>
-            Receive notification on other platform
-          </FormHelperText>
-        </div>
+      <FormControl orientation='horizontal'>
         <Switch
+          sx={{ mr: 1 }}
           checked={chatID !== 0}
           onClick={event => {
             event.preventDefault()
@@ -360,15 +342,19 @@ const NotificationSetting = () => {
           }}
           color={chatID !== 0 ? 'success' : 'neutral'}
           variant={chatID !== 0 ? 'solid' : 'outlined'}
-          endDecorator={chatID !== 0 ? 'On' : 'Off'}
+          // endDecorator={chatID !== 0 ? 'On' : 'Off'}
           slotProps={{
             endDecorator: {
-              sx: {
-                minWidth: 24,
-              },
+              sx: {},
             },
           }}
         />
+        <div>
+          <FormLabel>Custom Notification</FormLabel>
+          <FormHelperText sx={{ mt: 0 }}>
+            Receive notification on other platform
+          </FormHelperText>
+        </div>
       </FormControl>
       {chatID !== 0 && (
         <Box
@@ -386,6 +372,7 @@ const NotificationSetting = () => {
             <Option value='0'>None</Option>
             <Option value='1'>Telegram</Option>
             <Option value='2'>Pushover</Option>
+            <Option value='3'>Webhook</Option>
           </Select>
           {notificationTarget === '1' && (
             <>
diff --git a/src/views/Settings/Settings.jsx b/src/views/Settings/Settings.jsx
index 40afc01..1cc14e3 100644
--- a/src/views/Settings/Settings.jsx
+++ b/src/views/Settings/Settings.jsx
@@ -357,22 +357,23 @@ const Settings = () => {
                   </Chip>
                 )}
               </FormHelperText>
-              <>
-                {webhookURL !== null && (
-                  <Typography level='title-sm'>
-                    Webhook URL
-                    <Input
-                      value={webhookURL ? webhookURL : ''}
-                      onChange={e => setWebhookURL(e.target.value)}
-                      size='lg'
-                      sx={{
-                        width: '220px',
-                        mb: 1,
-                      }}
-                    />
-                    <Typography level='body-sm' color='danger'>
-                      {webhookError}
-                    </Typography>
+            </FormControl>
+
+            {webhookURL !== null && (
+              <Box>
+                <Typography level='title-sm'>Webhook URL</Typography>
+                <Input
+                  value={webhookURL ? webhookURL : ''}
+                  onChange={e => setWebhookURL(e.target.value)}
+                  size='lg'
+                  sx={{
+                    width: '220px',
+                    mb: 1,
+                  }}
+                />
+                {webhookError && (
+                  <Typography level='body-sm' color='danger'>
+                    {webhookError}
                   </Typography>
                 )}
                 <Button
@@ -391,8 +392,8 @@ const Settings = () => {
                 >
                   Save
                 </Button>
-              </>
-            </FormControl>
+              </Box>
+            )}
           </>
         )}
       </div>