diff --git a/src/views/History/ChoreHistory.jsx b/src/views/History/ChoreHistory.jsx
index 458b1f1..b2a213b 100644
--- a/src/views/History/ChoreHistory.jsx
+++ b/src/views/History/ChoreHistory.jsx
@@ -480,6 +480,11 @@ const ChoreHistory = () => {
                     entry: historyEntry,
                     performers,
                     onClose: () => setDetailModalConfig({ isOpen: false }),
+                    onEdit: record => {
+                      setDetailModalConfig({ isOpen: false })
+                      setEditHistory(record)
+                      setIsEditModalOpen(true)
+                    },
                   })
                 }}
                 onViewNote={notes => {
diff --git a/src/views/Modals/HistoryDetailModal.jsx b/src/views/Modals/HistoryDetailModal.jsx
index 2173484..e105549 100644
--- a/src/views/Modals/HistoryDetailModal.jsx
+++ b/src/views/Modals/HistoryDetailModal.jsx
@@ -2,7 +2,9 @@ import {
   AccessTime,
   CalendarMonth,
   Check,
+  Edit,
   HourglassEmpty,
+  OpenInNew,
   Person,
   Redo,
   RunningWithErrors,
@@ -10,8 +12,9 @@ import {
   ThumbDown,
   Update,
 } from '@mui/icons-material'
-import { Avatar, Box, Chip, Divider, Stack, Typography } from '@mui/joy'
+import { Avatar, Box, Button, Chip, Divider, Stack, Typography } from '@mui/joy'
 import moment from 'moment'
+import { useNavigate } from 'react-router-dom'
 import { useLocalization } from '../../contexts/LocalizationContext'
 import { useResponsiveModal } from '../../hooks/useResponsiveModal'
 import { TASK_COLOR } from '../../utils/Colors.jsx'
@@ -64,6 +67,7 @@ const TimingBadge = ({ historyEntry }) => {
 function HistoryDetailModal({ config }) {
   const { ResponsiveModal } = useResponsiveModal()
   const { fmt } = useLocalization()
+  const navigate = useNavigate()
 
   const entry = config?.entry
   const performers = config?.performers ?? []
@@ -190,6 +194,35 @@ function HistoryDetailModal({ config }) {
           </>
         )}
       </Stack>
+
+      {/* Action buttons */}
+      <Box sx={{ display: 'flex', gap: 1, mt: 2, justifyContent: 'flex-end' }}>
+        {entry.choreId && (
+          <Button
+            variant='soft'
+            color='neutral'
+            size='sm'
+            startDecorator={<OpenInNew sx={{ fontSize: 16 }} />}
+            onClick={() => {
+              config?.onClose?.()
+              navigate(`/chores/${entry.choreId}`)
+            }}
+          >
+            Open Task
+          </Button>
+        )}
+        {config?.onEdit && (
+          <Button
+            variant='soft'
+            color='neutral'
+            size='md'
+            startDecorator={<Edit sx={{ fontSize: 16 }} />}
+            onClick={() => config.onEdit(entry)}
+          >
+            Edit Entry
+          </Button>
+        )}
+      </Box>
     </ResponsiveModal>
   )
 }
diff --git a/src/views/User/UserActivities.jsx b/src/views/User/UserActivities.jsx
index c1b2692..663aed8 100644
--- a/src/views/User/UserActivities.jsx
+++ b/src/views/User/UserActivities.jsx
@@ -7,7 +7,6 @@ import {
   Checklist,
   EventBusy,
   EventNote,
-  Group,
   HourglassEmpty,
   Person,
   Redo,
@@ -36,7 +35,13 @@ import FilterBar from '../../components/common/FilterBar'
 import { useFilter } from '../../hooks/useFilter'
 
 import { useLocalization } from '../../contexts/LocalizationContext'
-import { useChores, useChoresHistory } from '../../queries/ChoreQueries'
+import {
+  useChores,
+  useChoresHistory,
+  useDeleteChoreHistory,
+  useUpdateChoreHistory,
+} from '../../queries/ChoreQueries'
+import EditHistoryModal from '../Modals/EditHistoryModal'
 import HistoryDetailModal from '../Modals/HistoryDetailModal'
 import NoteViewerModal from '../Modals/Inputs/NoteViewerModal'
 import { useCircleMembers, useUserProfile } from '../../queries/UserQueries.jsx'
@@ -85,7 +90,7 @@ const ChoreHistoryItem = ({
     <Stack
       direction='row'
       alignItems='center'
-      spacing={2}
+      spacing={1}
       onClick={onViewDetails}
       sx={{
         cursor: onViewDetails ? 'pointer' : 'default',
@@ -166,17 +171,7 @@ const ChoreHistoryTimeline = ({
   const groupedHistory = groupByDate(history)
 
   return (
-    <Container sx={{ p: 2 }}>
-      <Box sx={{ display: 'flex', alignItems: 'center', gap: 2, mb: 2 }}>
-        <Timeline sx={{ fontSize: '1.5rem' }} />
-        <Typography
-          level='title-md'
-          sx={{ fontWeight: 'lg', color: 'text.primary' }}
-        >
-          Activities Timeline
-        </Typography>
-      </Box>
-
+    <Box sx={{ py: 2, width: '100%' }}>
       {Object.entries(groupedHistory).map(([date, items]) => (
         <Box key={date} sx={{ mb: 4 }}>
           <Typography level='title-sm' sx={{ mb: 0.5 }}>
@@ -199,7 +194,7 @@ const ChoreHistoryTimeline = ({
           </Stack>
         </Box>
       ))}
-    </Container>
+    </Box>
   )
 }
 
@@ -414,6 +409,10 @@ const UserActivites = () => {
   const [selectedChart, setSelectedChart] = React.useState('history')
   const [noteViewerConfig, setNoteViewerConfig] = useState({ isOpen: false })
   const [detailModalConfig, setDetailModalConfig] = useState({ isOpen: false })
+  const [editModalConfig, setEditModalConfig] = useState({ isOpen: false })
+  const [editHistoryRecord, setEditHistoryRecord] = useState(null)
+  const updateChoreHistory = useUpdateChoreHistory()
+  const deleteChoreHistory = useDeleteChoreHistory()
 
   const [historyPieChartData, setHistoryPieChartData] = React.useState([])
   const [choreDuePieChartData, setChoreDuePieChartData] = React.useState([])
@@ -973,12 +972,12 @@ const UserActivites = () => {
       }}
     >
       <Box sx={{ display: 'flex', alignItems: 'center', gap: 2, mb: 2 }}>
-        <Group sx={{ fontSize: '1.5rem' }} />
+        <Timeline sx={{ fontSize: '1.5rem' }} />
         <Typography
           level='title-md'
           sx={{ fontWeight: 'lg', color: 'text.primary' }}
         >
-          User Activities
+          Activities
         </Typography>
       </Box>
 
@@ -1071,21 +1070,62 @@ const UserActivites = () => {
                     entry,
                     performers,
                     onClose: () => setDetailModalConfig({ isOpen: false }),
+                    onEdit: record => {
+                      setDetailModalConfig(prev => ({ ...prev, isOpen: false }))
+                      setEditHistoryRecord(record)
+                      setEditModalConfig({
+                        isOpen: true,
+                        onClose: () => {
+                          setEditModalConfig({ isOpen: false })
+                          setEditHistoryRecord(null)
+                        },
+                        onSave: updated => {
+                          updateChoreHistory.mutate(
+                            {
+                              choreId: record.choreId,
+                              historyId: record.id,
+                              historyData: {
+                                performedAt: updated.performedAt,
+                                dueDate: updated.dueDate,
+                                notes: updated.notes,
+                              },
+                            },
+                            {
+                              onSuccess: () => {
+                                setEditModalConfig({ isOpen: false })
+                                setEditHistoryRecord(null)
+                              },
+                            },
+                          )
+                        },
+                        onDelete: () => {
+                          deleteChoreHistory.mutate(
+                            { choreId: record.choreId, historyId: record.id },
+                            {
+                              onSuccess: () => {
+                                setEditModalConfig({ isOpen: false })
+                                setEditHistoryRecord(null)
+                              },
+                            },
+                          )
+                        },
+                      })
+                    },
                   })
                 }}
               />
             </Box>
 
-            {/* Right Sidebar - Charts (Mobile: Full width, Desktop: Fixed width + sticky) */}
+            {/* Right Sidebar - Charts (Desktop only, hidden on mobile) */}
             <Box
               sx={{
-                width: { xs: '100%', lg: '350px' },
-                position: { xs: 'static', lg: 'sticky' },
-                top: { lg: '60px' },
-                alignSelf: { lg: 'flex-start' },
-                maxHeight: { lg: 'calc(100vh - 40px)' },
-                overflowY: { lg: 'auto' },
-                order: { xs: -1, lg: 1 }, // Show charts first on mobile, last on desktop
+                display: { xs: 'none', lg: 'block' },
+                width: '350px',
+                position: 'sticky',
+                top: '60px',
+                alignSelf: 'flex-start',
+                maxHeight: 'calc(100vh - 40px)',
+                overflowY: 'auto',
               }}
             >
               {/* Charts Container */}
@@ -1225,6 +1265,10 @@ const UserActivites = () => {
       )}
       <NoteViewerModal config={noteViewerConfig} />
       <HistoryDetailModal config={detailModalConfig} />
+      <EditHistoryModal
+        config={editModalConfig}
+        historyRecord={editHistoryRecord}
+      />
     </Container>
   )
 }