diff --git a/src/views/Chores/SortAndGrouping.jsx b/src/views/Chores/SortAndGrouping.jsx
index 608fa05..09b86a0 100644
--- a/src/views/Chores/SortAndGrouping.jsx
+++ b/src/views/Chores/SortAndGrouping.jsx
@@ -83,6 +83,8 @@ const SortAndGrouping = ({
         { name: 'Due Date', value: 'due_date' },
         { name: 'Priority', value: 'priority' },
         { name: 'Labels', value: 'labels' },
+        { name: 'Created Date', value: 'created_date' },
+        { name: 'Updated Date', value: 'updated_date' },
       ]
 
       const filterItems = [
@@ -332,6 +334,8 @@ const SortAndGrouping = ({
           { name: 'Due Date', value: 'due_date' },
           { name: 'Priority', value: 'priority' },
           { name: 'Labels', value: 'labels' },
+          { name: 'Created Date', value: 'created_date' },
+          { name: 'Updated Date', value: 'updated_date' },
         ].map((item, index) => (
           <MenuItem
             key={`${k}-${item?.value}`}
diff --git a/src/views/Modals/Inputs/WriteNFCModal.jsx b/src/views/Modals/Inputs/WriteNFCModal.jsx
index 447e883..ca5a598 100644
--- a/src/views/Modals/Inputs/WriteNFCModal.jsx
+++ b/src/views/Modals/Inputs/WriteNFCModal.jsx
@@ -1,23 +1,125 @@
-import { CopyAll } from '@mui/icons-material'
+import { Capacitor } from '@capacitor/core'
+import {
+  CheckCircle,
+  ContentCopy,
+  ErrorOutline,
+  Nfc,
+} from '@mui/icons-material'
 import {
   Box,
   Button,
-  Checkbox,
   CircularProgress,
+  IconButton,
   Input,
-  ListItem,
+  Switch,
   Typography,
 } from '@mui/joy'
 import { useRef, useState } from 'react'
-import { Capacitor } from '@capacitor/core'
 import { useResponsiveModal } from '../../../hooks/useResponsiveModal'
 import { startNativeNFCWrite } from '../../../service/NFCWriter'
 
+const pulseKeyframes = `
+  @keyframes nfc-pulse {
+    0% { transform: scale(1); opacity: 0.6; }
+    70% { transform: scale(1.6); opacity: 0; }
+    100% { transform: scale(1.6); opacity: 0; }
+  }
+  @keyframes nfc-pulse-2 {
+    0% { transform: scale(1); opacity: 0.4; }
+    70% { transform: scale(2.1); opacity: 0; }
+    100% { transform: scale(2.1); opacity: 0; }
+  }
+  @media (prefers-reduced-motion: reduce) {
+    .nfc-pulse-ring { animation: none !important; }
+  }
+`
+
+function NFCIcon({ status }) {
+  const isWaiting = status === 'waiting_for_tag'
+  const isSuccess = status === 'success'
+  const isError = status === 'error'
+
+  return (
+    <Box
+      sx={{
+        position: 'relative',
+        display: 'flex',
+        alignItems: 'center',
+        justifyContent: 'center',
+        width: 96,
+        height: 96,
+        mx: 'auto',
+        mb: 3,
+      }}
+    >
+      {isWaiting && (
+        <>
+          <Box
+            className='nfc-pulse-ring'
+            sx={{
+              position: 'absolute',
+              inset: 0,
+              borderRadius: '50%',
+              border: '2px solid',
+              borderColor: 'primary.400',
+              animation: 'nfc-pulse 1.8s ease-out infinite',
+            }}
+          />
+          <Box
+            className='nfc-pulse-ring'
+            sx={{
+              position: 'absolute',
+              inset: 0,
+              borderRadius: '50%',
+              border: '2px solid',
+              borderColor: 'primary.300',
+              animation: 'nfc-pulse-2 1.8s ease-out infinite 0.4s',
+            }}
+          />
+        </>
+      )}
+      <Box
+        sx={{
+          width: 80,
+          height: 80,
+          borderRadius: '50%',
+          display: 'flex',
+          alignItems: 'center',
+          justifyContent: 'center',
+          bgcolor: isSuccess
+            ? 'success.softBg'
+            : isError
+              ? 'danger.softBg'
+              : isWaiting
+                ? 'primary.softBg'
+                : 'neutral.100',
+          transition: 'background-color 0.25s ease',
+        }}
+      >
+        {isSuccess ? (
+          <CheckCircle sx={{ fontSize: 40, color: 'success.500' }} />
+        ) : isError ? (
+          <ErrorOutline sx={{ fontSize: 40, color: 'danger.500' }} />
+        ) : (
+          <Nfc
+            sx={{
+              fontSize: 40,
+              color: isWaiting ? 'primary.500' : 'neutral.500',
+              transition: 'color 0.25s ease',
+            }}
+          />
+        )}
+      </Box>
+    </Box>
+  )
+}
+
 function WriteNFCModal({ config }) {
   const { ResponsiveModal } = useResponsiveModal()
-  const [nfcStatus, setNfcStatus] = useState('idle') // 'idle' | 'writing' | 'waiting_for_tag' | 'success' | 'error'
+  const [nfcStatus, setNfcStatus] = useState('idle')
   const [errorMessage, setErrorMessage] = useState('')
   const [isAutoCompleteWhenScan, setIsAutoCompleteWhenScan] = useState(false)
+  const [copied, setCopied] = useState(false)
   const cancelScanRef = useRef(null)
   const isNative = Capacitor.isNativePlatform()
 
@@ -45,6 +147,12 @@ function WriteNFCModal({ config }) {
     setNfcStatus('idle')
   }
 
+  const handleCopy = () => {
+    navigator.clipboard.writeText(getURL())
+    setCopied(true)
+    setTimeout(() => setCopied(false), 2000)
+  }
+
   const writeToNFC = async () => {
     const url = getURL()
 
@@ -78,99 +186,182 @@ function WriteNFCModal({ config }) {
       } else {
         setNfcStatus('error')
         setErrorMessage(
-          'NFC is not supported by this browser. You can still copy the URL and write it to an NFC tag using a compatible device.',
+          'NFC is not supported by this browser. Copy the URL and write it to an NFC tag using a compatible device.',
         )
       }
     }
   }
 
-  const renderBody = () => {
-    if (nfcStatus === 'success') {
-      return (
-        <Typography level='body-md' gutterBottom>
-          URL written to NFC tag successfully!
-        </Typography>
-      )
-    }
+  const isWaiting = nfcStatus === 'waiting_for_tag' || nfcStatus === 'writing'
+  const isSuccess = nfcStatus === 'success'
+  const isError = nfcStatus === 'error'
 
-    if (nfcStatus === 'waiting_for_tag') {
-      return (
-        <>
-          <Box
-            display='flex'
-            flexDirection='column'
-            alignItems='center'
-            gap={2}
-            py={3}
-          >
-            <CircularProgress size='lg' />
-            <Typography level='body-md' textAlign='center'>
-              Hold your device near the NFC tag
-            </Typography>
-          </Box>
-          <Button
-            variant='outlined'
-            color='neutral'
-            fullWidth
-            onClick={handleCancel}
-          >
-            Cancel
-          </Button>
-        </>
-      )
-    }
+  const title = isSuccess
+    ? 'Tag written!'
+    : isError
+      ? 'Something went wrong'
+      : isWaiting
+        ? 'Hold near NFC tag'
+        : 'Write to NFC'
 
-    return (
-      <>
-        <Typography level='body-md' gutterBottom>
-          {nfcStatus === 'error'
-            ? errorMessage
-            : 'Press the button below to write to NFC.'}
-        </Typography>
-        <Input
-          value={getURL()}
-          fullWidth
-          readOnly
-          label='URL'
-          sx={{ mt: 1 }}
-          endDecorator={
-            <CopyAll
-              sx={{ cursor: 'pointer' }}
-              onClick={() => {
-                navigator.clipboard.writeText(getURL())
-                alert('URL copied to clipboard!')
-              }}
-            />
-          }
-        />
-        <ListItem>
-          <Checkbox
-            checked={isAutoCompleteWhenScan}
-            onChange={e => setIsAutoCompleteWhenScan(e.target.checked)}
-            label='Auto-complete when scanned'
-          />
-        </ListItem>
-        <Box display='flex' justifyContent='space-around' mt={1}>
-          <Button
-            size='lg'
-            onClick={writeToNFC}
-            fullWidth
-            disabled={nfcStatus === 'writing'}
-          >
-            Write NFC
-          </Button>
-        </Box>
-      </>
-    )
-  }
+  const subtitle = isSuccess
+    ? 'Your NFC tag is ready to use.'
+    : isError
+      ? errorMessage
+      : isWaiting
+        ? 'Keep your device near the tag until complete.'
+        : 'Encode this task link onto any NFC tag.'
 
   return (
-    <ResponsiveModal open={config?.isOpen} onClose={handleClose}>
-      <Typography level='h4' mb={1}>
-        {nfcStatus === 'success' ? 'Success!' : 'Write to NFC'}
-      </Typography>
-      {renderBody()}
-    </ResponsiveModal>
+    <>
+      <style>{pulseKeyframes}</style>
+      <ResponsiveModal open={config?.isOpen} onClose={handleClose}>
+        <Box sx={{ px: 0.5, pb: 1 }}>
+          {/* Icon */}
+          <NFCIcon status={nfcStatus} />
+
+          {/* Heading */}
+          <Typography
+            level='title-lg'
+            textAlign='center'
+            sx={{ mb: 0.75, fontWeight: 600 }}
+          >
+            {title}
+          </Typography>
+          <Typography
+            level='body-sm'
+            textAlign='center'
+            sx={{ color: 'text.secondary', mb: 3, px: 2 }}
+          >
+            {subtitle}
+          </Typography>
+
+          {/* Idle / Error: URL + toggle + CTA */}
+          {!isWaiting && !isSuccess && (
+            <>
+              <Box sx={{ mb: 2 }}>
+                <Typography
+                  level='body-xs'
+                  sx={{
+                    mb: 0.75,
+                    fontWeight: 600,
+                    textTransform: 'uppercase',
+                    letterSpacing: '0.06em',
+                    color: 'text.tertiary',
+                  }}
+                >
+                  Tag URL
+                </Typography>
+                <Input
+                  value={getURL()}
+                  readOnly
+                  size='sm'
+                  sx={{
+                    fontFamily: 'monospace',
+                    fontSize: '0.75rem',
+                    '--Input-focusedHighlight': 'transparent',
+                    bgcolor: 'neutral.50',
+                  }}
+                  endDecorator={
+                    <IconButton
+                      size='sm'
+                      variant='plain'
+                      color={copied ? 'success' : 'neutral'}
+                      onClick={handleCopy}
+                      title='Copy URL'
+                    >
+                      <ContentCopy sx={{ fontSize: 16 }} />
+                    </IconButton>
+                  }
+                />
+                {copied && (
+                  <Typography
+                    level='body-xs'
+                    sx={{ color: 'success.500', mt: 0.5, textAlign: 'right' }}
+                  >
+                    Copied!
+                  </Typography>
+                )}
+              </Box>
+
+              <Box
+                sx={{
+                  display: 'flex',
+                  alignItems: 'center',
+                  justifyContent: 'space-between',
+                  py: 1.5,
+                  px: 2,
+                  borderRadius: 'md',
+                  bgcolor: 'neutral.50',
+                  mb: 3,
+                }}
+              >
+                <Box>
+                  <Typography level='body-sm' fontWeight={500}>
+                    Auto-complete on scan
+                  </Typography>
+                  <Typography level='body-xs' sx={{ color: 'text.tertiary' }}>
+                    Mark task done when tag is tapped
+                  </Typography>
+                </Box>
+                <Switch
+                  checked={isAutoCompleteWhenScan}
+                  onChange={e => setIsAutoCompleteWhenScan(e.target.checked)}
+                  size='sm'
+                />
+              </Box>
+
+              <Box sx={{ display: 'flex', gap: 1.5 }}>
+                <Button
+                  size='lg'
+                  variant='outlined'
+                  color='neutral'
+                  sx={{ flex: 1 }}
+                  onClick={isError ? handleClose : handleClose}
+                >
+                  Cancel
+                </Button>
+                <Button
+                  size='lg'
+                  sx={{ flex: 1 }}
+                  onClick={writeToNFC}
+                  disabled={nfcStatus === 'writing'}
+                  startDecorator={
+                    nfcStatus === 'writing' ? (
+                      <CircularProgress size='sm' />
+                    ) : (
+                      <Nfc />
+                    )
+                  }
+                >
+                  {nfcStatus === 'writing' ? 'Starting…' : 'Write tag'}
+                </Button>
+              </Box>
+            </>
+          )}
+
+          {/* Waiting state */}
+          {isWaiting && (
+            <Button
+              size='lg'
+              variant='outlined'
+              color='neutral'
+              fullWidth
+              onClick={handleCancel}
+            >
+              Cancel
+            </Button>
+          )}
+
+          {/* Success state */}
+          {isSuccess && (
+            <Button size='lg' fullWidth onClick={handleClose}>
+              Done
+            </Button>
+          )}
+        </Box>
+      </ResponsiveModal>
+    </>
   )
 }