diff --git a/app/composables/useAdmin.ts b/app/composables/useAdmin.ts
index 685b6bb..8e20b74 100644
--- a/app/composables/useAdmin.ts
+++ b/app/composables/useAdmin.ts
@@ -1,8 +1,10 @@
 // composables/useAdmin.ts
 // Place this at: app/composables/useAdmin.ts
 import dayjs from 'dayjs'
+import isoWeek from 'dayjs/plugin/isoWeek'
 import utc from 'dayjs/plugin/utc'
 
+dayjs.extend(isoWeek)
 dayjs.extend(utc)
 export const useAdmin = () => {
   const callFormApi = async <T>(method: 'GET' | 'POST' | 'PUT' | 'DELETE', params: Record<string, unknown> = {}, body?: Record<string, unknown>): Promise<T> => {
@@ -35,10 +37,7 @@ export const useAdmin = () => {
   }
 
   const formatYmdLocal = (date: Date) => {
-    const year = date.getFullYear()
-    const month = String(date.getMonth() + 1).padStart(2, '0')
-    const day = String(date.getDate()).padStart(2, '0')
-    return `${year}-${month}-${day}`
+    return dayjs(date).format('YYYY-MM-DD')
   }
 
   const parseDateToYmd = (value: string) => {
@@ -82,12 +81,14 @@ export const useAdmin = () => {
 
   const mapApiFormToUi = (form: any) => {
     const questionList = Array.isArray(form.questions) ? form.questions : []
+    const formDate = parseDateToYmd(form.startDate || form.weekStart || '')
 
     return {
       id: Number(form.id),
       weekStart: parseDateToYmd(form.weekStart || form.startDate || ''),
       day: form.day || 'Monday',
       title: form.title || `Form ${form.id}`,
+      startDate: formDate,
       date: form.date || formatDate(form.startDate || ''),
       status: form.status || (form.published ? 'Active' : 'Unpublished'),
       questions: questionList.map((question: any, index: number) => ({
@@ -119,10 +120,24 @@ export const useAdmin = () => {
   const formWeekStart    = useState('formWeekStart', () => monStr)
   const formDays         = useState<string[]>('formDays', () => ['Monday'])
   const historyWeekStart = useState('historyWeekStart', () => '')
+  const historyKeywordQuery = useState('historyKeywordQuery', () => '')
+  const historyAdvancedFiltersOpen = useState('historyAdvancedFiltersOpen', () => false)
   const historyStatusSelection = useState<Array<'published' | 'unpublished'>>('historyStatusSelection', () => ['published', 'unpublished'])
   const historyGroupStartDate = useState('historyGroupStartDate', () => '')
   const historyGroupEndDate = useState('historyGroupEndDate', () => '')
+  const emptyFormPromptOpen = useState('emptyFormPromptOpen', () => false)
   const selectedFormDetails = useState<any | null>('selectedFormDetails', () => null)
+  const publishSuccessInfo = useState<any | null>('publishSuccessInfo', () => null)
+
+  const resetHistoryAdvancedFilters = () => {
+    historyStatusSelection.value = ['published', 'unpublished']
+    historyGroupStartDate.value = ''
+    historyGroupEndDate.value = ''
+  }
+  const resetHistoryFilters = () => {
+    historyKeywordQuery.value = ''
+    historyWeekStart.value = ''
+  }
 
   const toggleHistoryStatus = (value: 'published' | 'unpublished') => {
     if (historyStatusSelection.value.includes(value)) {
@@ -133,52 +148,10 @@ export const useAdmin = () => {
     historyStatusSelection.value = [...historyStatusSelection.value, value]
   }
 
-  // ── Helpers ──
-  const getCalculatedDate = (weekStartStr: string, dayName: string): string => {
-    if (!weekStartStr) return ''
-
-    const days = ['Monday', 'Tuesday', 'Wednesday', 'Thursday', 'Friday', 'Saturday', 'Sunday']
-    const idx = days.indexOf(dayName)
-    if (idx === -1) return ''
-
-    const base = parseLocalDate(weekStartStr)
-    if (!base) return ''
-
-    const d = new Date(base)
-    d.setDate(base.getDate() + idx)
-
-    return d.toLocaleDateString('en-US', {
-      weekday: 'long',
-      month: 'short',
-      day: 'numeric',
-      year: 'numeric',
-    })
-  }
-
-  const getLastMonday = (dateStr: string) => {
-    const d = parseLocalDate(dateStr)
-    if (!d) return ''
-
-    const day = d.getDay()
-    const diffToMonday = day === 0 ? -6 : 1 - day
-
-    const monday = new Date(d)
-    monday.setDate(d.getDate() + diffToMonday)
-
-    return formatYmdLocal(monday)
-  }
-
   const formatDate = (dateStr: string): string => {
     if (!dateStr) return ''
 
-    const parsed = parseLocalDate(dateStr)
-    if (!parsed) return ''
-
-    return parsed.toLocaleDateString('en-US', {
-      month: 'short',
-      day: 'numeric',
-      year: 'numeric',
-    })
+    return dayjs.utc(dateStr).format('MMM D, YYYY')
   }
 
   const defaultQuestions = (): any[] => [
@@ -204,17 +177,44 @@ export const useAdmin = () => {
       const matchesUnpublished = historyStatusSelection.value.includes('unpublished') && !isActive
       const matchesStatus = matchesPublished || matchesUnpublished
 
+      const normalizedKeyword = historyKeywordQuery.value.trim().toLowerCase()
+      const searchableFields = [
+        form.title,
+        form.day,
+        form.weekStart,
+        form.date,
+        form.status,
+      ]
+
+      for (const question of form.questions ?? []) {
+        searchableFields.push(
+          question.type,
+          question.text,
+          question.textEs,
+          question.reference,
+          question.referenceEs,
+          question.url,
+        )
+
+        for (const choice of question.choices ?? []) {
+          searchableFields.push(choice.text)
+        }
+      }
+
+      const matchesKeyword =
+        !normalizedKeyword || searchableFields.filter(Boolean).join(' ').toLowerCase().includes(normalizedKeyword)
+
       const matchesGroupStart =
         !historyGroupStartDate.value ||
-        !form.weekStart ||
-        form.weekStart >= historyGroupStartDate.value
+        !form.startDate ||
+        form.startDate >= historyGroupStartDate.value
 
       const matchesGroupEnd =
         !historyGroupEndDate.value ||
-        !form.weekStart ||
-        form.weekStart <= historyGroupEndDate.value
+        !form.startDate ||
+        form.startDate <= historyGroupEndDate.value
 
-      return matchesStatus && matchesGroupStart && matchesGroupEnd
+      return matchesStatus && matchesKeyword && matchesGroupStart && matchesGroupEnd
     })
   )
 
@@ -237,8 +237,8 @@ export const useAdmin = () => {
       return
     }
 
-    const fallbackWeekStart = getLastMonday(historyWeekStart.value)
-    const fallbackWeekEnd = dayjs.utc(fallbackWeekStart).add(6, 'day').format('YYYY-MM-DD')
+    const fallbackWeekStart = dayjs.utc(historyWeekStart.value).startOf('isoWeek').format('YYYY-MM-DD')
+    const fallbackWeekEnd = dayjs.utc(fallbackWeekStart).endOf('isoWeek').format('YYYY-MM-DD')
 
     try {
       const result = await callFormApi<{
@@ -304,110 +304,124 @@ export const useAdmin = () => {
     questions.value.push(q)
   }
 
-  const publishForm = async () => {
-    if (!formTitle.value)       { alert('Please enter a title!');           return }
-    if (!formDays.value.length) { alert('Please select at least one day!'); return }
+  const persistForm = async (published: boolean) => {
+    if (!formTitle.value)       { alert('Please enter a title!');           return false }
+    if (!formDays.value.length) { alert('Please select at least one day!'); return false }
 
-    try {
-      const weekStart = getLastMonday(formWeekStart.value || '')
-      const days = ['Monday','Tuesday','Wednesday','Thursday','Friday','Saturday','Sunday']
-
-      if (editingFormId.value) {
-        const targetDay = formDays.value[0] || 'Monday'
-        const dayIndex = days.indexOf(targetDay)
+    const weekStart = dayjs.utc(formWeekStart.value || '').startOf('isoWeek').format('YYYY-MM-DD')
+    const days = ['Monday','Tuesday','Wednesday','Thursday','Friday','Saturday','Sunday']
 
-        if (dayIndex === -1) {
-          throw new Error('Invalid day selected for update')
-        }
+    if (editingFormId.value) {
+      const targetDay = formDays.value[0] || 'Monday'
+      const dayIndex = days.indexOf(targetDay)
 
-        const startDate = parseLocalDate(weekStart)
-        if (!startDate) throw new Error('Invalid week start date')
-        startDate.setDate(startDate.getDate() + dayIndex)
+      if (dayIndex === -1) {
+        throw new Error('Invalid day selected for update')
+      }
 
-        await callFormApi('PUT', {}, {
-          action: 'updateForm',
-          id: editingFormId.value,
-          startDate: formatYmdLocal(startDate),
-          published: true,
-          title: formTitle.value,
-        })
+      const startDate = dayjs.utc(weekStart).add(dayIndex, 'day')
 
-        const existingForm = publishedForms.value.find((form) => Number(form.id) === Number(editingFormId.value))
-        const existingComponentIds = new Set<number>(
-          (existingForm?.questions ?? [])
-            .map((question: any) => Number(question.id))
-            .filter((questionId: number) => Number.isInteger(questionId) && questionId > 0)
-        )
+      await callFormApi('PUT', {}, {
+        action: 'updateForm',
+        id: editingFormId.value,
+        startDate: startDate.format('YYYY-MM-DD'),
+        published,
+        title: formTitle.value,
+      })
 
-        for (let index = 0; index < questions.value.length; index++) {
-          const question = questions.value[index]
-          const numericQuestionId = Number(question.id)
-          const isExistingComponent = Number.isInteger(numericQuestionId) && existingComponentIds.has(numericQuestionId)
-
-          if (isExistingComponent) {
-            await callFormApi('PUT', {}, {
-              action: 'updateComponent',
-              id: numericQuestionId,
-              order: index,
-              questionType: question.type,
-              questionText: toApiQuestionText(question, formTitle.value),
-              questionOptions: buildQuestionOptions(question),
-            })
-
-            existingComponentIds.delete(numericQuestionId)
-          } else {
-            await callFormApi('POST', {}, {
-              action: 'createComponent',
-              form: editingFormId.value,
-              order: index,
-              questionType: question.type,
-              questionText: toApiQuestionText(question, formTitle.value),
-              questionOptions: buildQuestionOptions(question),
-            })
-          }
-        }
+      const existingForm = publishedForms.value.find((form) => Number(form.id) === Number(editingFormId.value))
+      const existingComponentIds = new Set<number>(
+        (existingForm?.questions ?? [])
+          .map((question: any) => Number(question.id))
+          .filter((questionId: number) => Number.isInteger(questionId) && questionId > 0)
+      )
+
+      for (let index = 0; index < questions.value.length; index++) {
+        const question = questions.value[index]
+        const numericQuestionId = Number(question.id)
+        const isExistingComponent = Number.isInteger(numericQuestionId) && existingComponentIds.has(numericQuestionId)
+
+        if (isExistingComponent) {
+          await callFormApi('PUT', {}, {
+            action: 'updateComponent',
+            id: numericQuestionId,
+            order: index,
+            questionType: question.type,
+            questionText: toApiQuestionText(question, formTitle.value),
+            questionOptions: buildQuestionOptions(question),
+          })
 
-        for (const removedId of existingComponentIds) {
-          await callFormApi('DELETE', {}, {
-            action: 'deleteComponent',
-            id: removedId,
+          existingComponentIds.delete(numericQuestionId)
+        } else {
+          await callFormApi('POST', {}, {
+            action: 'createComponent',
+            form: editingFormId.value,
+            order: index,
+            questionType: question.type,
+            questionText: toApiQuestionText(question, formTitle.value),
+            questionOptions: buildQuestionOptions(question),
           })
         }
+      }
 
-        await loadPublishedForms()
-        editingFormId.value = null
-        builderSubTab.value = 'history'
-        alert('Form updated successfully')
-        return
+      for (const removedId of existingComponentIds) {
+        await callFormApi('DELETE', {}, {
+          action: 'deleteComponent',
+          id: removedId,
+        })
       }
 
-      for (const day of formDays.value) {
-        const dayIndex = days.indexOf(day)
+      await loadPublishedForms()
 
-        if (dayIndex === -1) {
-          continue
+      if (published) {
+        publishSuccessInfo.value = {
+          title: formTitle.value,
+          days: formDays.value,
+          weekStart: dayjs.utc(weekStart).startOf('isoWeek').format('YYYY-MM-DD'),
+          isUpdate: true,
+          questionCount: questions.value.length,
         }
+      }
 
-        const startDate = parseLocalDate(weekStart)
-        if (!startDate) {
-          continue
-        }
+      editingFormId.value = null
+      builderSubTab.value = 'history'
+      return true
+    }
 
-        startDate.setDate(startDate.getDate() + dayIndex)
+    const createdFormResponse = await callFormApi<any>('POST', {}, {
+      action: 'createForm',
+      startDate: weekStart || dayjs.utc().startOf('isoWeek').format('YYYY-MM-DD'),
+      published,
+      title: formTitle.value,
+    })
 
-          const createdFormResponse = await callFormApi<any>('POST', {}, {
-            action: 'createForm',
-            startDate: formatYmdLocal(startDate),
-            published: true,
-            title: formTitle.value,
-          })
+    const createdForm = createdFormResponse?.data
+
+    if (!createdForm?.id) {
+      return false
+    }
 
-        const createdForm = createdFormResponse?.data
+    const publishedDates: string[] = []
+
+    if (published) {
+      for (const day of formDays.value) {
+        const dayIndex = days.indexOf(day)
 
-        if (!createdForm?.id) {
+        if (dayIndex === -1) {
           continue
         }
 
+        const startDate = dayjs.utc(weekStart).add(dayIndex, 'day')
+        publishedDates.push(dayjs.utc(weekStart).add(dayIndex, 'day').format('dddd, MMM D, YYYY'))
+
+        await callFormApi('PUT', {}, {
+          action: 'updateForm',
+          id: createdForm.id,
+          startDate: startDate.format('YYYY-MM-DD'),
+          published: true,
+          title: formTitle.value,
+        })
+
         for (let index = 0; index < questions.value.length; index++) {
           const question = questions.value[index]
 
@@ -421,15 +435,49 @@ export const useAdmin = () => {
           })
         }
       }
+    }
 
-      await loadPublishedForms()
-      alert(`Published for: ${formDays.value.join(', ')}`)
+    await loadPublishedForms()
+
+    if (published) {
+      publishSuccessInfo.value = {
+        title: formTitle.value,
+        days: formDays.value,
+        weekStart: dayjs.utc(weekStart).startOf('isoWeek').format('YYYY-MM-DD'),
+        publishedDates,
+        questionCount: questions.value.length,
+        isUpdate: false,
+      }
+    }
+
+    builderSubTab.value = 'history'
+    return true
+  }
+
+  const publishForm = async () => {
+    if (questions.value.length === 0) {
+      emptyFormPromptOpen.value = true
+      return
+    }
+
+    try {
+      await persistForm(true)
     } catch (error) {
       console.error('Failed to publish form', error)
       alert('Failed to publish form. Please try again.')
     }
   }
 
+  const saveEmptyFormDraft = async () => {
+    try {
+      await persistForm(false)
+      emptyFormPromptOpen.value = false
+    } catch (error) {
+      console.error('Failed to save empty form', error)
+      alert('Failed to save form. Please try again.')
+    }
+  }
+
   const editPublishedForm = (form: any) => {
     formTitle.value     = form.title
     formWeekStart.value = form.weekStart || formWeekStart.value
@@ -444,6 +492,33 @@ export const useAdmin = () => {
     form.status = form.status === 'Active' ? 'Unpublished' : 'Active'
   }
 
+  const deleteStoredForm = async (form: any, skipConfirm = false) => {
+    const id = Number(form?.id)
+
+    if (!Number.isInteger(id)) {
+      return
+    }
+
+    if (!skipConfirm && !confirm(`Delete "${form.title}"? This cannot be undone.`)) {
+      return
+    }
+
+    await callFormApi('DELETE', {}, {
+      action: 'deleteForm',
+      id,
+    })
+
+    if (selectedFormDetails.value?.id === id) {
+      selectedFormDetails.value = null
+    }
+
+    if (editingFormId.value === id) {
+      editingFormId.value = null
+    }
+
+    await loadPublishedForms()
+  }
+
   const viewFormDetails = (form: any) => {
     selectedFormDetails.value = form
   }
@@ -523,12 +598,13 @@ export const useAdmin = () => {
   return {
     // builder
     builderSubTab, formTitle, editingFormId, questions,
-    formWeekStart, formDays, historyWeekStart, historyStatusSelection, historyGroupStartDate, historyGroupEndDate, toggleHistoryStatus, getLastMonday,
-    getCalculatedDate, formatDate, defaultQuestions,
+    formWeekStart, formDays, historyWeekStart, historyKeywordQuery, historyAdvancedFiltersOpen,
+    historyStatusSelection, historyGroupStartDate, historyGroupEndDate, emptyFormPromptOpen,
+    toggleHistoryStatus, resetHistoryAdvancedFilters, resetHistoryFilters, formatDate, defaultQuestions,
     publishedForms, filteredPublishedForms,
-    selectedFormDetails, viewFormDetails,
+    selectedFormDetails, viewFormDetails, publishSuccessInfo,
     draggedIdx, dragStart, onDrop,
-    addQuestion, publishForm, editPublishedForm, toggleFormPublish,
+    addQuestion, publishForm, saveEmptyFormDraft, editPublishedForm, toggleFormPublish, deleteStoredForm,
     loadPublishedForms,
     // progress
     students, searchStudent, sortStudent, filteredAndSortedStudents,
diff --git a/app/pages/admin/builder.vue b/app/pages/admin/builder.vue
index 0a8aaab..e1168f6 100644
--- a/app/pages/admin/builder.vue
+++ b/app/pages/admin/builder.vue
@@ -1,22 +1,48 @@
 <script setup lang="ts">
 definePageMeta({ ssr: false, layout: "admin" })
 
+import dayjs from 'dayjs'
+import isoWeek from 'dayjs/plugin/isoWeek'
+import utc from 'dayjs/plugin/utc'
+
+dayjs.extend(isoWeek)
+dayjs.extend(utc)
+
 const builderSectionRef = ref<HTMLElement | null>(null)
 
 const {
   builderSubTab, formTitle, editingFormId, questions,
-  formWeekStart, formDays, historyWeekStart, historyStatusSelection, historyGroupStartDate, historyGroupEndDate, toggleHistoryStatus, getLastMonday,
-  getCalculatedDate, formatDate, defaultQuestions,
-  filteredPublishedForms, selectedFormDetails, viewFormDetails,
+  formWeekStart, formDays, historyWeekStart, historyKeywordQuery, historyAdvancedFiltersOpen,
+  historyStatusSelection, historyGroupStartDate, historyGroupEndDate, emptyFormPromptOpen,
+  toggleHistoryStatus, resetHistoryAdvancedFilters, resetHistoryFilters, formatDate, defaultQuestions,
+  filteredPublishedForms, selectedFormDetails, viewFormDetails, publishSuccessInfo,
   draggedIdx, dragStart, onDrop,
-  addQuestion, publishForm, editPublishedForm, toggleFormPublish, loadPublishedForms,
+  addQuestion, publishForm, saveEmptyFormDraft, editPublishedForm, toggleFormPublish, deleteStoredForm, loadPublishedForms,
 } = useAdmin()
 
+const dayLabels = ['Monday', 'Tuesday', 'Wednesday', 'Thursday', 'Friday', 'Saturday', 'Sunday']
+
+const getWeekStartLabel = (weekStart: string) => {
+  if (!weekStart) return ''
+
+  return dayjs.utc(weekStart).startOf('isoWeek').format('YYYY-MM-DD')
+}
+
 const previewDates = computed(() => {
   if (!formDays.value.length) return []
-  const weekStart = getLastMonday(formWeekStart.value || '')
+  const weekStart = getWeekStartLabel(formWeekStart.value || '')
   if (!weekStart) return []
-  return formDays.value.map(day => `${day}: ${getCalculatedDate(weekStart, day)}`)
+  return formDays.value
+    .map((day) => {
+      const index = dayLabels.indexOf(day)
+
+      if (index === -1) {
+        return ''
+      }
+
+      return `${day}: ${dayjs.utc(weekStart).add(index, 'day').format('dddd, MMM D, YYYY')}`
+    })
+    .filter(Boolean)
 })
 
 const questionTypeLabel = (type: string) => {
@@ -76,6 +102,23 @@ const removeQuestion = (index: number) => {
   questions.value.splice(index, 1)
 }
 
+const resetBuilderForm = () => {
+  editingFormId.value = null
+  formTitle.value = ''
+  formDays.value = ['Monday']
+  questions.value = defaultQuestions()
+  emptyFormPromptOpen.value = false
+  builderSubTab.value = 'history'
+}
+
+const deleteEmptyForm = async () => {
+  if (editingFormId.value) {
+    await deleteStoredForm({ id: editingFormId.value, title: formTitle.value }, true)
+  }
+
+  resetBuilderForm()
+}
+
 const handleBuilderEnter = (event: KeyboardEvent) => {
   const currentTarget = event.target as HTMLElement | null
 
@@ -124,6 +167,35 @@ onBeforeUnmount(() => {
 <template>
   <div class="builder-wrap">
 
+    <!-- ══════════════════════════════════════════ -->
+    <!--  FORM DETAILS MODAL                        -->
+    <!-- ══════════════════════════════════════════ -->
+    <Transition name="fade">
+      <div v-if="emptyFormPromptOpen" class="modal-backdrop">
+        <div class="modal-overlay" @click="emptyFormPromptOpen = false" />
+        <div class="modal-box">
+          <div class="modal-header">
+            <div>
+              <h3 class="modal-title">You cannot publish because its empty.</h3>
+              <p class="modal-meta">It's empty — do you still want to save or delete?</p>
+            </div>
+          </div>
+
+          <div class="modal-body">
+            <p class="empty-form-copy">
+              Save this form as an unpublished draft, or delete it and start over.
+            </p>
+          </div>
+
+          <div class="modal-footer success-footer">
+            <button class="btn-indigo" @click="saveEmptyFormDraft()">Save</button>
+            <button class="btn-dark" @click="deleteEmptyForm()">Delete</button>
+            <button class="btn-ghost" @click="emptyFormPromptOpen = false">Cancel</button>
+          </div>
+        </div>
+      </div>
+    </Transition>
+
     <!-- ══════════════════════════════════════════ -->
     <!--  FORM DETAILS MODAL                        -->
     <!-- ══════════════════════════════════════════ -->
@@ -172,6 +244,45 @@ onBeforeUnmount(() => {
       </div>
     </Transition>
 
+    <!-- ══════════════════════════════════════════ -->
+    <!--  PUBLISH SUCCESS MODAL                     -->
+    <!-- ══════════════════════════════════════════ -->
+    <Transition name="fade">
+      <div v-if="publishSuccessInfo" class="modal-backdrop">
+        <div class="modal-overlay" @click="publishSuccessInfo = null" />
+        <div class="modal-box success-modal">
+
+          <div class="modal-header success-header">
+            <div class="success-icon">✓</div>
+            <div>
+              <h3 class="modal-title">{{ publishSuccessInfo.isUpdate ? 'Form Updated Successfully' : 'Form Published Successfully' }}</h3>
+              <p class="modal-meta">{{ publishSuccessInfo.title }}</p>
+            </div>
+          </div>
+
+          <div class="modal-body success-body">
+            <div class="success-info-block">
+              <div class="info-row">
+                <span class="info-label">📅 Week Starting:</span>
+                <span class="info-value">{{ publishSuccessInfo.weekStart }}</span>
+              </div>
+              <div v-if="publishSuccessInfo.publishedDates && publishSuccessInfo.publishedDates.length > 0" class="info-row">
+                <span class="info-label">📆 Dates:</span>
+                <div class="date-list">
+                  <span v-for="date in publishSuccessInfo.publishedDates" :key="date" class="date-tag">{{ date }}</span>
+                </div>
+              </div>
+            </div>
+          </div>
+
+          <div class="modal-footer success-footer">
+            <button class="btn-indigo" @click="publishSuccessInfo = null; builderSubTab = 'history';">View in History</button>
+            <button class="btn-dark" @click="publishSuccessInfo = null">Close</button>
+          </div>
+        </div>
+      </div>
+    </Transition>
+
     <!-- ══════════════════════════════════════════ -->
     <!--  CREATION SUB-TAB                          -->
     <!-- ══════════════════════════════════════════ -->
@@ -194,7 +305,7 @@ onBeforeUnmount(() => {
         <div class="week-row">
           <div>
             <p class="field-hint">Selected Week</p>
-            <h4 class="week-label">{{ formWeekStart ? 'Week of ' + getLastMonday(formWeekStart) : 'Select a week' }}</h4>
+            <h4 class="week-label">{{ formWeekStart ? 'Week of ' + getWeekStartLabel(formWeekStart) : 'Select a week' }}</h4>
           </div>
           <div>
             <label class="field-label">Change Week Starting (Mon)</label>
@@ -385,48 +496,87 @@ onBeforeUnmount(() => {
         >+ Create New Form</button>
       </div>
 
-      <!-- Filters -->
-      <div class="section-card">
-        <div class="history-filters-grid">
-          <div>
-            <label class="field-label">Weekly Date (Find Matching Form Group)</label>
+      <div class="section-card history-toolbar">
+        <div class="history-toolbar-main">
+          <div class="history-toolbar-field">
+            <label class="field-label">Weekly Date</label>
             <input v-model="historyWeekStart" type="date" class="input-base" />
           </div>
 
-          <div>
-            <label class="field-label">Status</label>
-            <div class="status-filter-btns">
-              <button
-                class="status-filter-btn"
-                :class="historyStatusSelection.includes('published') ? 'active' : ''"
-                @click="toggleHistoryStatus('published')"
-              >Published</button>
-              <button
-                class="status-filter-btn"
-                :class="historyStatusSelection.includes('unpublished') ? 'active' : ''"
-                @click="toggleHistoryStatus('unpublished')"
-              >Unpublished</button>
-            </div>
+          <div class="history-toolbar-field history-search-field">
+            <label class="field-label">Keyword Search</label>
+            <input
+              v-model="historyKeywordQuery"
+              type="search"
+              class="input-base"
+              placeholder="Search titles, dates, questions, or answers"
+            />
           </div>
+        </div>
+        <button class="btn-ghost" @click="resetHistoryFilters()">Reset</button>
+        <button class="btn-indigo history-advanced-btn" @click="historyAdvancedFiltersOpen = true">
+          Advanced Filter Options
+        </button>
+      </div>
 
-          <div>
-            <label class="field-label">Form Group Start (From)</label>
-            <input v-model="historyGroupStartDate" type="date" class="input-base" />
-          </div>
+      <Transition name="drawer">
+        <div
+          v-if="historyAdvancedFiltersOpen"
+          class="history-drawer-backdrop"
+          @click.self="historyAdvancedFiltersOpen = false"
+        >
+          <aside class="history-drawer">
+            <div class="history-drawer-header">
+              <div>
+                <h4 class="history-drawer-title">Advanced Filter Options</h4>
+                <p class="history-drawer-subtitle">Refine history by status and exact date range.</p>
+              </div>
+              <button class="history-drawer-close" @click="historyAdvancedFiltersOpen = false">×</button>
+            </div>
 
-          <div>
-            <label class="field-label">Form Group Start (To)</label>
-            <input v-model="historyGroupEndDate" type="date" class="input-base" />
-          </div>
+            <div class="history-drawer-body">
+              <div>
+                <label class="field-label">Status</label>
+                <div class="status-filter-btns history-status-stack">
+                  <button
+                    class="status-filter-btn"
+                    :class="historyStatusSelection.includes('published') ? 'active' : ''"
+                    @click="toggleHistoryStatus('published')"
+                  >Published</button>
+                  <button
+                    class="status-filter-btn"
+                    :class="historyStatusSelection.includes('unpublished') ? 'active' : ''"
+                    @click="toggleHistoryStatus('unpublished')"
+                  >Unpublished</button>
+                </div>
+              </div>
+
+              <div>
+                <label class="field-label">Form Date (From)</label>
+                <input v-model="historyGroupStartDate" type="date" class="input-base" />
+              </div>
+
+              <div>
+                <label class="field-label">Form Date (To)</label>
+                <input v-model="historyGroupEndDate" type="date" class="input-base" />
+              </div>
+            </div>
+
+            <div class="history-drawer-footer">
+              <button class="btn-ghost" @click="resetHistoryAdvancedFilters()">Reset Filters</button>
+              <button class="btn-indigo history-advanced-btn" @click="historyAdvancedFiltersOpen = false">Done</button>
+            </div>
+          </aside>
         </div>
-      </div>
+      </Transition>
 
       <!-- Form rows -->
       <div class="space-y-3">
         <div
           v-for="form in filteredPublishedForms" :key="form.id"
-          class="form-row"
+          class="form-row cursor-pointer hover:shadow-lg transition-shadow"
           :class="form.status === 'Unpublished' ? 'opacity-60' : ''"
+          @click="viewFormDetails(form)"
         >
           <!-- Week/day badge -->
           <div class="week-badge">
@@ -445,12 +595,13 @@ onBeforeUnmount(() => {
 
           <div class="form-row-actions">
             <span class="status-pill" :class="form.status === 'Active' ? 'active' : 'inactive'">{{ form.status }}</span>
-            <button class="btn-sm-indigo" @click="viewFormDetails(form)">Details</button>
-            <button class="btn-sm-indigo" @click="editPublishedForm(form)">Edit</button>
+            <button class="btn-sm-indigo" @click.stop="viewFormDetails(form)">Details</button>
+            <button class="btn-sm-indigo" @click.stop="editPublishedForm(form)">Edit</button>
+            <button class="btn-sm danger" @click.stop="deleteStoredForm(form)">Delete</button>
             <button
               class="btn-sm"
               :class="form.status === 'Active' ? 'danger' : 'success'"
-              @click="toggleFormPublish(form)"
+              @click.stop="toggleFormPublish(form)"
             >{{ form.status === 'Active' ? 'Unpublish' : 'Republish' }}</button>
           </div>
         </div>
diff --git a/app/pages/admin/raffle.vue b/app/pages/admin/raffle.vue
index 56d404a..bc2a74c 100644
--- a/app/pages/admin/raffle.vue
+++ b/app/pages/admin/raffle.vue
@@ -1,9 +1,14 @@
 <script setup lang="ts">
 definePageMeta({ ssr: false, layout: "admin" })
 
-const {
-  getLastMonday, formatDate,
-} = useAdmin()
+import dayjs from 'dayjs'
+import isoWeek from 'dayjs/plugin/isoWeek'
+import utc from 'dayjs/plugin/utc'
+
+dayjs.extend(isoWeek)
+dayjs.extend(utc)
+
+const { formatDate } = useAdmin()
 
 const {loadRaffleData, raffleWeekStart, raffleWinner, raffleFormGroup, raffleSubmissions, spinRaffle, spinCount} = useRaffleSpin()
 
@@ -34,7 +39,7 @@ onMounted(() => {
     <div class="week-row">
       <div>
         <p class="field-hint">Selected Week</p>
-        <h4 class="week-label">{{ raffleWeekStart ? 'Week of ' + getLastMonday(raffleWeekStart.toLocaleString()) : 'Select a week' }}</h4>
+        <h4 class="week-label">{{ raffleWeekStart ? 'Week of ' + dayjs.utc(raffleWeekStart).startOf('isoWeek').format('YYYY-MM-DD') : 'Select a week' }}</h4>
       </div>
       <div>
         <label class="field-label">Change Week Starting (Mon)</label>
diff --git a/app/pages/admin/styles/builder.css b/app/pages/admin/styles/builder.css
index ff8b9d7..3aa2f50 100644
--- a/app/pages/admin/styles/builder.css
+++ b/app/pages/admin/styles/builder.css
@@ -176,6 +176,50 @@
 .step-choice.correct { background: #f0fdf4; border-color: #bbf7d0; color: #15803d; opacity: 1; }
 .step-url     { margin-top: 0.75rem; }
 .step-code    { font-size: 0.75rem; background: #f3f4f6; padding: 0.25rem 0.5rem; border-radius: 0.375rem; color: #6b7280; word-break: break-all; }
+.empty-form-copy { margin: 0; color: #374151; font-weight: 500; line-height: 1.5; }
+
+ .empty-form-copy { margin: 0; color: #374151; font-weight: 500; line-height: 1.5; }
+
+/* ── Success Modal ── */
+.modal-box.success-modal { border-bottom: 8px solid #10b981; }
+.success-header {
+  padding: 2rem 1.5rem; background: linear-gradient(135deg, #f0fdf4 0%, #dcfce7 100%);
+  border-bottom: 1px solid #bbf7d0;
+  display: flex; align-items: center; gap: 1rem;
+}
+.success-icon {
+  width: 3.5rem; height: 3.5rem; border-radius: 50%; background: #10b981; color: white;
+  display: flex; align-items: center; justify-content: center;
+  font-size: 1.75rem; font-weight: 900;
+}
+.success-body {
+  padding: 2rem 1.5rem; background: white;
+}
+.success-info-block {
+  display: flex; flex-direction: column; gap: 1.25rem;
+}
+.info-row {
+  display: flex; align-items: center; gap: 1rem; padding: 1rem;
+  background: #f9fafb; border-radius: 0.75rem; border-left: 4px solid #10b981;
+}
+.info-label {
+  font-weight: 600; color: #6b7280; font-size: 0.875rem; min-width: 130px;
+}
+.info-value {
+  font-weight: 700; color: #111827; font-size: 1rem;
+}
+.date-list {
+  display: flex; flex-wrap: wrap; gap: 0.75rem;
+}
+.date-tag {
+  background: #ecfdf5; color: #059669; padding: 0.5rem 1rem;
+  border-radius: 0.5rem; font-size: 0.875rem; font-weight: 600;
+  border: 1px solid #a7f3d0;
+}
+.success-footer {
+  padding: 1.5rem; background: linear-gradient(135deg, #f9fafb 0%, #f3f4f6 100%);
+  border-top: 1px solid #e5e7eb; display: flex; justify-content: flex-end; gap: 0.75rem;
+}
 
 /* ── Buttons ── */
 .btn-dark    { padding: 1rem 2rem; border-radius: 0.75rem; font-weight: 700; font-size: 1.125rem; background: #111827; color: white; border: none; cursor: pointer; transition: all 0.15s; box-shadow: 0 10px 25px rgba(0,0,0,0.2); }
@@ -272,20 +316,42 @@
 /* ── History ── */
 .history-header { display: flex; justify-content: space-between; align-items: center; }
 .history-title  { font-size: 2.25rem; font-weight: 500; color: #111827; }
-.history-filters-grid {
+.history-toolbar {
+  display: flex;
+  flex-direction: column;
+  gap: 1rem;
+}
+@media (min-width: 900px) {
+  .history-toolbar {
+    flex-direction: row;
+    align-items: end;
+    justify-content: space-between;
+  }
+}
+.history-toolbar-main {
   display: grid;
   grid-template-columns: 1fr;
   gap: 0.75rem;
+  flex: 1;
 }
 @media (min-width: 900px) {
-  .history-filters-grid {
-    grid-template-columns: repeat(4, minmax(0, 1fr));
+  .history-toolbar-main {
+    grid-template-columns: 220px minmax(0, 1fr);
   }
 }
+.history-toolbar-field { min-width: 0; }
+.history-search-field input { width: 100%; }
+.history-advanced-btn { width: 100%; white-space: nowrap; }
+@media (min-width: 900px) {
+  .history-advanced-btn { width: auto; }
+}
 .status-filter-btns {
   display: flex;
   gap: 0.5rem;
 }
+.history-status-stack {
+  flex-direction: column;
+}
 .status-filter-btn {
   flex: 1;
   padding: 0.6rem 0.8rem;
@@ -335,9 +401,87 @@
 .btn-sm.success { background: #f0fdf4; color: #16a34a; }
 .btn-sm.success:hover { background: #dcfce7; }
 
+/* ── History drawer ── */
+.history-drawer-backdrop {
+  position: fixed;
+  inset: 0;
+  z-index: 320;
+  background: rgba(15, 23, 42, 0.35);
+  display: flex;
+  justify-content: flex-end;
+}
+.history-drawer {
+  width: min(100%, 23rem);
+  height: 100%;
+  background: white;
+  box-shadow: -20px 0 50px rgba(15, 23, 42, 0.18);
+  display: flex;
+  flex-direction: column;
+  border-left: 1px solid #e2e8f0;
+}
+.history-drawer-header {
+  display: flex;
+  justify-content: space-between;
+  gap: 1rem;
+  align-items: flex-start;
+  padding: 1.25rem 1.25rem 1rem;
+  border-bottom: 1px solid #eef2ff;
+  background: linear-gradient(135deg, #f8fafc 0%, #eef2ff 100%);
+}
+.history-drawer-title {
+  margin: 0;
+  font-size: 1.125rem;
+  font-weight: 700;
+  color: #111827;
+}
+.history-drawer-subtitle {
+  margin: 0.25rem 0 0;
+  font-size: 0.875rem;
+  color: #64748b;
+}
+.history-drawer-close {
+  width: 2.25rem;
+  height: 2.25rem;
+  border-radius: 0.75rem;
+  border: none;
+  background: white;
+  color: #64748b;
+  font-size: 1.5rem;
+  line-height: 1;
+  cursor: pointer;
+  box-shadow: 0 1px 3px rgba(0, 0, 0, 0.08);
+}
+.history-drawer-body {
+  display: flex;
+  flex-direction: column;
+  gap: 1rem;
+  padding: 1.25rem;
+}
+.history-drawer-footer {
+  margin-top: auto;
+  padding: 1rem 1.25rem 1.25rem;
+  display: flex;
+  gap: 0.75rem;
+  border-top: 1px solid #f3f4f6;
+}
+.history-drawer-footer .btn-ghost,
+.history-drawer-footer .btn-dark {
+  flex: 1;
+}
+
 /* ── Transitions ── */
 .fade-enter-active, .fade-leave-active { transition: opacity 0.25s ease; }
 .fade-enter-from, .fade-leave-to       { opacity: 0; }
+.drawer-enter-active, .drawer-leave-active { transition: opacity 0.2s ease; }
+.drawer-enter-from, .drawer-leave-to { opacity: 0; }
+.drawer-enter-active .history-drawer,
+.drawer-leave-active .history-drawer {
+  transition: transform 0.25s ease;
+}
+.drawer-enter-from .history-drawer,
+.drawer-leave-to .history-drawer {
+  transform: translateX(100%);
+}
 
 /* ── Flex utilities ── */
 .flex-grow { flex: 1; }
diff --git a/package-lock.json b/package-lock.json
index e7db9a4..a33b4b6 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -89,7 +89,6 @@
       "resolved": "https://registry.npmjs.org/@babel/core/-/core-7.29.0.tgz",
       "integrity": "sha512-CGOfOJqWjg2qW/Mb6zNsDm+u5vFQ8DxXfbM09z69p5Z6+mE1ikP2jUXw+j42Pf1XTYED2Rni5f95npYeuwMDQA==",
       "license": "MIT",
-      "peer": true,
       "dependencies": {
         "@babel/code-frame": "^7.29.0",
         "@babel/generator": "^7.29.0",
@@ -464,7 +463,6 @@
       "resolved": "https://registry.npmjs.org/@better-auth/core/-/core-1.5.1.tgz",
       "integrity": "sha512-lHDoChK6FFy3+oawt/tl9S08LuYNnbT1o3HKxleFrRtQIyIdUKu38X8AUJ8ueB6sE+ju5YhxBqoCFhdb6Aa67A==",
       "license": "MIT",
-      "peer": true,
       "dependencies": {
         "@standard-schema/spec": "^1.1.0",
         "zod": "^4.3.6"
@@ -559,14 +557,12 @@
       "version": "0.3.1",
       "resolved": "https://registry.npmjs.org/@better-auth/utils/-/utils-0.3.1.tgz",
       "integrity": "sha512-+CGp4UmZSUrHHnpHhLPYu6cV+wSUSvVbZbNykxhUDocpVNTo9uFFxw/NqJlh1iC4wQ9HKKWGCKuZ5wUgS0v6Kg==",
-      "license": "MIT",
-      "peer": true
+      "license": "MIT"
     },
     "node_modules/@better-fetch/fetch": {
       "version": "1.1.21",
       "resolved": "https://registry.npmjs.org/@better-fetch/fetch/-/fetch-1.1.21.tgz",
-      "integrity": "sha512-/ImESw0sskqlVR94jB+5+Pxjf+xBwDZF/N5+y2/q4EqD7IARUTSpPfIo8uf39SYpCxyOCtbyYpUrZ3F/k0zT4A==",
-      "peer": true
+      "integrity": "sha512-/ImESw0sskqlVR94jB+5+Pxjf+xBwDZF/N5+y2/q4EqD7IARUTSpPfIo8uf39SYpCxyOCtbyYpUrZ3F/k0zT4A=="
     },
     "node_modules/@bomb.sh/tab": {
       "version": "0.0.12",
@@ -703,8 +699,7 @@
       "version": "0.3.15",
       "resolved": "https://registry.npmjs.org/@electric-sql/pglite/-/pglite-0.3.15.tgz",
       "integrity": "sha512-Cj++n1Mekf9ETfdc16TlDi+cDDQF0W7EcbyRHYOAeZdsAe8M/FJg18itDTSwyHfar2WIezawM9o0EKaRGVKygQ==",
-      "license": "Apache-2.0",
-      "peer": true
+      "license": "Apache-2.0"
     },
     "node_modules/@electric-sql/pglite-socket": {
       "version": "0.0.20",
@@ -1227,7 +1222,6 @@
       "resolved": "https://registry.npmjs.org/@floating-ui/dom/-/dom-1.7.5.tgz",
       "integrity": "sha512-N0bD2kIPInNHUHehXhMke1rBGs1dwqvC9O9KYMyyjK7iXt7GAhnro7UlcuYcGdS/yYOlq0MAVgrow8IbWJwyqg==",
       "license": "MIT",
-      "peer": true,
       "dependencies": {
         "@floating-ui/core": "^1.7.4",
         "@floating-ui/utils": "^0.2.10"
@@ -2023,6 +2017,7 @@
       "resolved": "https://registry.npmjs.org/@mongodb-js/saslprep/-/saslprep-1.4.6.tgz",
       "integrity": "sha512-y+x3H1xBZd38n10NZF/rEBlvDOOMQ6LKUTHqr8R9VkJ+mmQOYtJFxIlkkK8fZrtOiL6VixbOBWMbZGBdal3Z1g==",
       "license": "MIT",
+      "peer": true,
       "dependencies": {
         "sparse-bitfield": "^3.0.3"
       }
@@ -2386,7 +2381,6 @@
       "resolved": "https://registry.npmjs.org/@nuxt/kit/-/kit-4.3.1.tgz",
       "integrity": "sha512-UjBFt72dnpc+83BV3OIbCT0YHLevJtgJCHpxMX0YRKWLDhhbcDdUse87GtsQBrjvOzK7WUNUYLDS/hQLYev5rA==",
       "license": "MIT",
-      "peer": true,
       "dependencies": {
         "c12": "^3.3.3",
         "consola": "^3.4.2",
@@ -5284,7 +5278,6 @@
       "resolved": "https://registry.npmjs.org/@tiptap/core/-/core-3.20.0.tgz",
       "integrity": "sha512-aC9aROgia/SpJqhsXFiX9TsligL8d+oeoI8W3u00WI45s0VfsqjgeKQLDLF7Tu7hC+7F02teC84SAHuup003VQ==",
       "license": "MIT",
-      "peer": true,
       "funding": {
         "type": "github",
         "url": "https://github.com/sponsors/ueberdosis"
@@ -5381,7 +5374,6 @@
       "resolved": "https://registry.npmjs.org/@tiptap/extension-collaboration/-/extension-collaboration-3.20.0.tgz",
       "integrity": "sha512-JItmI4U0i4kqorO114u24hM9k945IdaQ6Uc2DEtPBFFuS8cepJf2zw+ulAT1kAx6ZRiNvNpT9M7w+J0mWRn+Sg==",
       "license": "MIT",
-      "peer": true,
       "funding": {
         "type": "github",
         "url": "https://github.com/sponsors/ueberdosis"
@@ -5411,7 +5403,6 @@
       "resolved": "https://registry.npmjs.org/@tiptap/extension-drag-handle/-/extension-drag-handle-3.20.0.tgz",
       "integrity": "sha512-CzLRyxZe5QddQey0RUWJUvICyhuRnU/jvzMIYlFvMxM7W97sZ2ggk0cRThlRt2pRUoSr8mmmUnobiorpISmksA==",
       "license": "MIT",
-      "peer": true,
       "dependencies": {
         "@floating-ui/dom": "^1.6.13"
       },
@@ -5572,7 +5563,6 @@
       "resolved": "https://registry.npmjs.org/@tiptap/extension-list/-/extension-list-3.20.0.tgz",
       "integrity": "sha512-+V0/gsVWAv+7vcY0MAe6D52LYTIicMSHw00wz3ISZgprSb2yQhJ4+4gurOnUrQ4Du3AnRQvxPROaofwxIQ66WQ==",
       "license": "MIT",
-      "peer": true,
       "funding": {
         "type": "github",
         "url": "https://github.com/sponsors/ueberdosis"
@@ -5628,7 +5618,6 @@
       "resolved": "https://registry.npmjs.org/@tiptap/extension-node-range/-/extension-node-range-3.20.0.tgz",
       "integrity": "sha512-XeKKTV88VuJ4Mh0Rxvc/PPzG76cb44sE+rB4u0J/ms63R/WFTm6yJQlCgUVGnGeHleSlrWuZY8gGSuoljmQzqg==",
       "license": "MIT",
-      "peer": true,
       "funding": {
         "type": "github",
         "url": "https://github.com/sponsors/ueberdosis"
@@ -5721,7 +5710,6 @@
       "resolved": "https://registry.npmjs.org/@tiptap/extensions/-/extensions-3.20.0.tgz",
       "integrity": "sha512-HIsXX942w3nbxEQBlMAAR/aa6qiMBEP7CsSMxaxmTIVAmW35p6yUASw6GdV1u0o3lCZjXq2OSRMTskzIqi5uLg==",
       "license": "MIT",
-      "peer": true,
       "funding": {
         "type": "github",
         "url": "https://github.com/sponsors/ueberdosis"
@@ -5753,7 +5741,6 @@
       "resolved": "https://registry.npmjs.org/@tiptap/pm/-/pm-3.20.0.tgz",
       "integrity": "sha512-jn+2KnQZn+b+VXr8EFOJKsnjVNaA4diAEr6FOazupMt8W8ro1hfpYtZ25JL87Kao/WbMze55sd8M8BDXLUKu1A==",
       "license": "MIT",
-      "peer": true,
       "dependencies": {
         "prosemirror-changeset": "^2.3.0",
         "prosemirror-collab": "^1.3.1",
@@ -5820,7 +5807,6 @@
       "resolved": "https://registry.npmjs.org/@tiptap/suggestion/-/suggestion-3.20.0.tgz",
       "integrity": "sha512-OA9Fe+1Q/Ex0ivTcpRcVFiLnNsVdIBmiEoctt/gu4H2ayCYmZ906veioXNdc1m/3MtVVUIuEnvwwsrOZXlfDEw==",
       "license": "MIT",
-      "peer": true,
       "funding": {
         "type": "github",
         "url": "https://github.com/sponsors/ueberdosis"
@@ -5835,7 +5821,6 @@
       "resolved": "https://registry.npmjs.org/@tiptap/vue-3/-/vue-3-3.20.0.tgz",
       "integrity": "sha512-u8UfDKsbIOF+mVsXwJ946p1jfrLGFUyqp9i/DAeGGg2I85DPOkhZgz67bUPVXkpossoEk+jKCkRN0eBHl9+eZQ==",
       "license": "MIT",
-      "peer": true,
       "funding": {
         "type": "github",
         "url": "https://github.com/sponsors/ueberdosis"
@@ -5888,7 +5873,6 @@
       "integrity": "sha512-NMv9ASNARoKksWtsq/SHakpYAYnhBrQgGD8zkLYk/jaK8jUGn08CfEdTRgYhMypUQAfzSP8W6gNLe0q19/t4VA==",
       "devOptional": true,
       "license": "MIT",
-      "peer": true,
       "dependencies": {
         "@types/node": "*"
       }
@@ -5976,13 +5960,15 @@
       "version": "7.0.3",
       "resolved": "https://registry.npmjs.org/@types/webidl-conversions/-/webidl-conversions-7.0.3.tgz",
       "integrity": "sha512-CiJJvcRtIgzadHCYXw7dqEnMNRjhGZlYK05Mj9OyktqV8uVT8fD2BFOB7S1uwBE3Kj2Z+4UyPmFw/Ixgw/LAlA==",
-      "license": "MIT"
+      "license": "MIT",
+      "peer": true
     },
     "node_modules/@types/whatwg-url": {
       "version": "13.0.0",
       "resolved": "https://registry.npmjs.org/@types/whatwg-url/-/whatwg-url-13.0.0.tgz",
       "integrity": "sha512-N8WXpbE6Wgri7KUSvrmQcqrMllKZ9uxkYWMt+mCSGwNc0Hsw9VQTW7ApqI4XNrx6/SaM2QQJCzMPDEXE058s+Q==",
       "license": "MIT",
+      "peer": true,
       "dependencies": {
         "@types/webidl-conversions": "*"
       }
@@ -6219,7 +6205,6 @@
       "resolved": "https://registry.npmjs.org/@vue/compiler-sfc/-/compiler-sfc-3.5.29.tgz",
       "integrity": "sha512-oJZhN5XJs35Gzr50E82jg2cYdZQ78wEwvRO6Y63TvLVTc+6xICzJHP1UIecdSPPYIbkautNBanDiWYa64QSFIA==",
       "license": "MIT",
-      "peer": true,
       "dependencies": {
         "@babel/parser": "^7.29.0",
         "@vue/compiler-core": "3.5.29",
@@ -6364,7 +6349,6 @@
       "resolved": "https://registry.npmjs.org/@vueuse/core/-/core-14.2.1.tgz",
       "integrity": "sha512-3vwDzV+GDUNpdegRY6kzpLm4Igptq+GA0QkJ3W61Iv27YWwW/ufSlOfgQIpN6FZRMG0mkaz4gglJRtq5SeJyIQ==",
       "license": "MIT",
-      "peer": true,
       "dependencies": {
         "@types/web-bluetooth": "^0.0.21",
         "@vueuse/metadata": "14.2.1",
@@ -6490,7 +6474,6 @@
       "resolved": "https://registry.npmjs.org/acorn/-/acorn-8.16.0.tgz",
       "integrity": "sha512-UVJyE9MttOsBQIDKw1skb9nAwQuR5wuGD3+82K6JgJlm/Y+KI92oNsMNGZCYdDsVtRHSak0pcV5Dno5+4jh9sw==",
       "license": "MIT",
-      "peer": true,
       "bin": {
         "acorn": "bin/acorn"
       },
@@ -6836,7 +6819,6 @@
       "resolved": "https://registry.npmjs.org/bare-events/-/bare-events-2.8.2.tgz",
       "integrity": "sha512-riJjyv1/mHLIPX4RwiK+oW9/4c3TEUeORHKefKAKnZ5kyslbN+HXowtbaVEqt4IMUB7OXlfixcs6gsFeo/jhiQ==",
       "license": "Apache-2.0",
-      "peer": true,
       "peerDependencies": {
         "bare-abort-controller": "*"
       },
@@ -7061,7 +7043,6 @@
       "resolved": "https://registry.npmjs.org/better-call/-/better-call-1.3.2.tgz",
       "integrity": "sha512-4cZIfrerDsNTn3cm+MhLbUePN0gdwkhSXEuG7r/zuQ8c/H7iU0/jSK5TD3FW7U0MgKHce/8jGpPYNO4Ve+4NBw==",
       "license": "MIT",
-      "peer": true,
       "dependencies": {
         "@better-auth/utils": "^0.3.1",
         "@better-fetch/fetch": "^1.1.21",
@@ -7207,7 +7188,6 @@
         }
       ],
       "license": "MIT",
-      "peer": true,
       "dependencies": {
         "baseline-browser-mapping": "^2.9.0",
         "caniuse-lite": "^1.0.30001759",
@@ -7227,6 +7207,7 @@
       "resolved": "https://registry.npmjs.org/bson/-/bson-7.2.0.tgz",
       "integrity": "sha512-YCEo7KjMlbNlyHhz7zAZNDpIpQbd+wOEHJYezv0nMYTn4x31eIUM2yomNNubclAt63dObUzKHWsBLJ9QcZNSnQ==",
       "license": "Apache-2.0",
+      "peer": true,
       "engines": {
         "node": ">=20.19.0"
       }
@@ -7328,7 +7309,6 @@
       "resolved": "https://registry.npmjs.org/cac/-/cac-6.7.14.tgz",
       "integrity": "sha512-b6Ilus+c3RrdDk+JhLKUAQfzzgLEPy6wcXqS7f/xe1EETvsDP6GORG7SFuOs6cID5YkqchW/LXZbX5bc8j7ZcQ==",
       "license": "MIT",
-      "peer": true,
       "engines": {
         "node": ">=8"
       }
@@ -8322,8 +8302,7 @@
       "version": "8.6.0",
       "resolved": "https://registry.npmjs.org/embla-carousel/-/embla-carousel-8.6.0.tgz",
       "integrity": "sha512-SjWyZBHJPbqxHOzckOfo8lHisEaJWmwd23XppYFYVh10bU66/Pn5tkVkbkCMZVdbUE5eTCI2nD8OyIP4Z+uwkA==",
-      "license": "MIT",
-      "peer": true
+      "license": "MIT"
     },
     "node_modules/embla-carousel-auto-height": {
       "version": "8.6.0",
@@ -8919,7 +8898,6 @@
       "resolved": "https://registry.npmjs.org/fuse.js/-/fuse.js-7.1.0.tgz",
       "integrity": "sha512-trLf4SzuuUxfusZADLINj+dE8clK1frKdmqiJNb1Es75fmI5oY6X2mxLVUciLLjxqw/xr72Dhy+lER6dGd02FQ==",
       "license": "Apache-2.0",
-      "peer": true,
       "engines": {
         "node": ">=10"
       }
@@ -9158,7 +9136,6 @@
       "resolved": "https://registry.npmjs.org/hono/-/hono-4.11.4.tgz",
       "integrity": "sha512-U7tt8JsyrxSRKspfhtLET79pU8K+tInj5QZXs1jSugO1Vq5dFj3kmZsRldo29mTBfcjDRVRXrEZ6LS63Cog9ZA==",
       "license": "MIT",
-      "peer": true,
       "engines": {
         "node": ">=16.9.0"
       }
@@ -9579,6 +9556,7 @@
       "resolved": "https://registry.npmjs.org/isomorphic.js/-/isomorphic.js-0.2.5.tgz",
       "integrity": "sha512-PIeMbHqMt4DnUP3MA/Flc0HElYjMXArsw1qwJZcm9sqR8mq3l8NYizFMty0pWwE/tzIGH3EKK5+jes5mAr85yw==",
       "license": "MIT",
+      "peer": true,
       "funding": {
         "type": "GitHub Sponsors ❤",
         "url": "https://github.com/sponsors/dmonad"
@@ -9613,7 +9591,6 @@
       "resolved": "https://registry.npmjs.org/jose/-/jose-6.1.3.tgz",
       "integrity": "sha512-0TpaTfihd4QMNwrz/ob2Bp7X04yuxJkjRGi4aKmOqwhov54i6u79oCv7T+C7lo70MKH6BesI3vscD1yb/yzKXQ==",
       "license": "MIT",
-      "peer": true,
       "funding": {
         "url": "https://github.com/sponsors/panva"
       }
@@ -9677,7 +9654,6 @@
       "resolved": "https://registry.npmjs.org/kysely/-/kysely-0.28.11.tgz",
       "integrity": "sha512-zpGIFg0HuoC893rIjYX1BETkVWdDnzTzF5e0kWXJFg5lE0k1/LfNWBejrcnOFu8Q2Rfq/hTDTU7XLUM8QOrpzg==",
       "license": "MIT",
-      "peer": true,
       "engines": {
         "node": ">=20.0.0"
       }
@@ -9739,6 +9715,7 @@
       "resolved": "https://registry.npmjs.org/lib0/-/lib0-0.2.117.tgz",
       "integrity": "sha512-DeXj9X5xDCjgKLU/7RR+/HQEVzuuEUiwldwOGsHK/sfAfELGWEyTcf0x+uOvCvK3O2zPmZePXWL85vtia6GyZw==",
       "license": "MIT",
+      "peer": true,
       "dependencies": {
         "isomorphic.js": "^0.2.4"
       },
@@ -10266,7 +10243,8 @@
       "version": "1.5.0",
       "resolved": "https://registry.npmjs.org/memory-pager/-/memory-pager-1.5.0.tgz",
       "integrity": "sha512-ZS4Bp4r/Zoeq6+NLJpP+0Zzm0pR8whtGPf1XExKLJBAczGMnSi3It14OiNCStjQjM6NU1okjQGSxgEZN8eBYKg==",
-      "license": "MIT"
+      "license": "MIT",
+      "peer": true
     },
     "node_modules/merge-stream": {
       "version": "2.0.0",
@@ -10510,6 +10488,7 @@
       "resolved": "https://registry.npmjs.org/mongodb-connection-string-url/-/mongodb-connection-string-url-7.0.1.tgz",
       "integrity": "sha512-h0AZ9A7IDVwwHyMxmdMXKy+9oNlF0zFoahHiX3vQ8e3KFcSP3VmsmfvtRSuLPxmyv2vjIDxqty8smTgie/SNRQ==",
       "license": "Apache-2.0",
+      "peer": true,
       "dependencies": {
         "@types/whatwg-url": "^13.0.0",
         "whatwg-url": "^14.1.0"
@@ -10574,7 +10553,6 @@
       "resolved": "https://registry.npmjs.org/mysql2/-/mysql2-3.15.3.tgz",
       "integrity": "sha512-FBrGau0IXmuqg4haEZRBfHNWB5mUARw6hNwPDXXGg0XzVJ50mr/9hb267lvpVMnhZ1FON3qNd4Xfcez1rbFwSg==",
       "license": "MIT",
-      "peer": true,
       "dependencies": {
         "aws-ssl-profiles": "^1.1.1",
         "denque": "^2.1.0",
@@ -10647,7 +10625,6 @@
         }
       ],
       "license": "MIT",
-      "peer": true,
       "engines": {
         "node": "^20.0.0 || >=22.0.0"
       }
@@ -10954,7 +10931,6 @@
       "resolved": "https://registry.npmjs.org/nuxt/-/nuxt-4.3.1.tgz",
       "integrity": "sha512-bl+0rFcT5Ax16aiWFBFPyWcsTob19NTZaDL5P6t0MQdK63AtgS6fN6fwvwdbXtnTk6/YdCzlmuLzXhSM22h0OA==",
       "license": "MIT",
-      "peer": true,
       "dependencies": {
         "@dxup/nuxt": "^0.3.2",
         "@nuxt/cli": "^3.33.0",
@@ -11233,7 +11209,6 @@
       "resolved": "https://registry.npmjs.org/oxc-parser/-/oxc-parser-0.112.0.tgz",
       "integrity": "sha512-7rQ3QdJwobMQLMZwQaPuPYMEF2fDRZwf51lZ//V+bA37nejjKW5ifMHbbCwvA889Y4RLhT+/wLJpPRhAoBaZYw==",
       "license": "MIT",
-      "peer": true,
       "dependencies": {
         "@oxc-project/types": "^0.112.0"
       },
@@ -11396,7 +11371,6 @@
       "resolved": "https://registry.npmjs.org/pg/-/pg-8.20.0.tgz",
       "integrity": "sha512-ldhMxz2r8fl/6QkXnBD3CR9/xg694oT6DZQ2s6c/RI28OjtSOpxnPrUCGOBJ46RCUxcWdx3p6kw/xnDHjKvaRA==",
       "license": "MIT",
-      "peer": true,
       "dependencies": {
         "pg-connection-string": "^2.12.0",
         "pg-pool": "^3.13.0",
@@ -11595,7 +11569,6 @@
         }
       ],
       "license": "MIT",
-      "peer": true,
       "dependencies": {
         "nanoid": "^3.3.11",
         "picocolors": "^1.1.1",
@@ -12040,7 +12013,6 @@
       "resolved": "https://registry.npmjs.org/postgres/-/postgres-3.4.7.tgz",
       "integrity": "sha512-Jtc2612XINuBjIl/QTWsV5UvE8UHuNblcO3vVADSrKsrc6RqGX6lOW1cEo3CM2v0XG4Nat8nI+YM7/f26VxXLw==",
       "license": "Unlicense",
-      "peer": true,
       "engines": {
         "node": ">=12"
       },
@@ -12127,7 +12099,6 @@
       "integrity": "sha512-v6UNi1+3hSlVvv8fSaoUbggEM5VErKmmpGA7Pl3HF8V6uKY7rvClBOJlH6yNwQtfTueNkGVpOv/mtWL9L4bgRA==",
       "dev": true,
       "license": "MIT",
-      "peer": true,
       "bin": {
         "prettier": "bin/prettier.cjs"
       },
@@ -12235,7 +12206,6 @@
       "integrity": "sha512-n30qZpWehaYQzigLjmuPisyEsvOzHt7bZeRyg8gZ5DvJo9FGjD+gNaY59Ns3hlLD5/jZH5GBeftIss0jDbUoLg==",
       "hasInstallScript": true,
       "license": "Apache-2.0",
-      "peer": true,
       "dependencies": {
         "@prisma/config": "7.5.0",
         "@prisma/dev": "0.20.0",
@@ -12407,7 +12377,6 @@
       "resolved": "https://registry.npmjs.org/prosemirror-model/-/prosemirror-model-1.25.4.tgz",
       "integrity": "sha512-PIM7E43PBxKce8OQeezAs9j4TP+5yDpZVbuurd1h5phUxEKIu+G2a+EUZzIC5nS1mJktDJWzbqS23n1tsAf5QA==",
       "license": "MIT",
-      "peer": true,
       "dependencies": {
         "orderedmap": "^2.0.0"
       }
@@ -12437,7 +12406,6 @@
       "resolved": "https://registry.npmjs.org/prosemirror-state/-/prosemirror-state-1.4.4.tgz",
       "integrity": "sha512-6jiYHH2CIGbCfnxdHbXZ12gySFY/fz/ulZE333G6bPqIZ4F+TXo9ifiR86nAHpWnfoNjOb3o5ESi7J8Uz1jXHw==",
       "license": "MIT",
-      "peer": true,
       "dependencies": {
         "prosemirror-model": "^1.0.0",
         "prosemirror-transform": "^1.0.0",
@@ -12498,7 +12466,6 @@
       "resolved": "https://registry.npmjs.org/prosemirror-view/-/prosemirror-view-1.41.6.tgz",
       "integrity": "sha512-mxpcDG4hNQa/CPtzxjdlir5bJFDlm0/x5nGBbStB2BWX+XOQ9M8ekEG+ojqB5BcVu2Rc80/jssCMZzSstJuSYg==",
       "license": "MIT",
-      "peer": true,
       "dependencies": {
         "prosemirror-model": "^1.20.0",
         "prosemirror-state": "^1.0.0",
@@ -12520,6 +12487,7 @@
       "resolved": "https://registry.npmjs.org/punycode/-/punycode-2.3.1.tgz",
       "integrity": "sha512-vYt7UD1U9Wg6138shLtLOvdAu+8DsC/ilFtEVHcH+wydcSpNE20AfSOduf6MkRFahL5FY7X1oU7nKVZFtfq8Fg==",
       "license": "MIT",
+      "peer": true,
       "engines": {
         "node": ">=6"
       }
@@ -12870,7 +12838,6 @@
       "resolved": "https://registry.npmjs.org/rollup/-/rollup-4.59.0.tgz",
       "integrity": "sha512-2oMpl67a3zCH9H79LeMcbDhXW/UmWG/y2zuqnF2jQq5uq9TbM9TVyXvA4+t+ne2IIkBdrLpAaRQAvo7YI/Yyeg==",
       "license": "MIT",
-      "peer": true,
       "dependencies": {
         "@types/estree": "1.0.8"
       },
@@ -13036,7 +13003,8 @@
       "version": "0.27.0",
       "resolved": "https://registry.npmjs.org/scheduler/-/scheduler-0.27.0.tgz",
       "integrity": "sha512-eNv+WrVbKu1f3vbYJT/xtiF5syA5HPIMtf9IgY/nKg0sWqzAUEvqY/xm7OcZc/qafLx/iO9FgOmeSAp4v5ti/Q==",
-      "license": "MIT"
+      "license": "MIT",
+      "peer": true
     },
     "node_modules/scule": {
       "version": "1.3.0",
@@ -13378,6 +13346,7 @@
       "resolved": "https://registry.npmjs.org/sparse-bitfield/-/sparse-bitfield-3.0.3.tgz",
       "integrity": "sha512-kvzhi7vqKTfkh0PZU+2D2PIllw2ymqJKujUcyPMd9Y75Nv4nPbGJZXNhxsgdQab2BmlDct1YnfQCguEvHr7VsQ==",
       "license": "MIT",
+      "peer": true,
       "dependencies": {
         "memory-pager": "^1.0.2"
       }
@@ -13659,7 +13628,6 @@
       "resolved": "https://registry.npmjs.org/tailwind-merge/-/tailwind-merge-3.5.0.tgz",
       "integrity": "sha512-I8K9wewnVDkL1NTGoqWmVEIlUcB9gFriAEkXkfCjX5ib8ezGxtR3xD7iZIxrfArjEsH7F1CHD4RFUtxefdqV/A==",
       "license": "MIT",
-      "peer": true,
       "funding": {
         "type": "github",
         "url": "https://github.com/sponsors/dcastil"
@@ -13688,8 +13656,7 @@
       "version": "4.2.1",
       "resolved": "https://registry.npmjs.org/tailwindcss/-/tailwindcss-4.2.1.tgz",
       "integrity": "sha512-/tBrSQ36vCleJkAOsy9kbNTgaxvGbyOamC30PRePTQe/o1MFwEKHQk4Cn7BNGaPtjp+PuUrByJehM1hgxfq4sw==",
-      "license": "MIT",
-      "peer": true
+      "license": "MIT"
     },
     "node_modules/tapable": {
       "version": "2.3.0",
@@ -13903,6 +13870,7 @@
       "resolved": "https://registry.npmjs.org/tr46/-/tr46-5.1.1.tgz",
       "integrity": "sha512-hdF5ZgjTqgAntKkklYw0R03MG2x/bSzTtkxmIRw/sTNV8YXsCJ1tfLAX23lhxhHJlEf3CRCOCGGWw3vI3GaSPw==",
       "license": "MIT",
+      "peer": true,
       "dependencies": {
         "punycode": "^2.3.1"
       },
@@ -13932,7 +13900,6 @@
       "integrity": "sha512-5C1sg4USs1lfG0GFb2RLXsdpXqBSEhAaA/0kPL01wxzpMqLILNxIxIOKiILz+cdg/pLnOUxFYOR5yhHU666wbw==",
       "devOptional": true,
       "license": "MIT",
-      "peer": true,
       "dependencies": {
         "esbuild": "~0.27.0",
         "get-tsconfig": "^4.7.5"
@@ -14581,7 +14548,6 @@
       "resolved": "https://registry.npmjs.org/valibot/-/valibot-1.2.0.tgz",
       "integrity": "sha512-mm1rxUsmOxzrwnX5arGS+U4T25RdvpPjPN4yR0u9pUBov9+zGVtO84tif1eY4r6zWxVxu3KzIyknJy3rxfRZZg==",
       "license": "MIT",
-      "peer": true,
       "peerDependencies": {
         "typescript": ">=5"
       },
@@ -14704,7 +14670,6 @@
       "resolved": "https://registry.npmjs.org/vite/-/vite-7.3.1.tgz",
       "integrity": "sha512-w+N7Hifpc3gRjZ63vYBXA56dvvRlNWRczTdmCBBa+CotUzAPf5b7YMdMR/8CQoeYE5LX3W4wj6RYTgonm1b9DA==",
       "license": "MIT",
-      "peer": true,
       "dependencies": {
         "esbuild": "^0.27.0",
         "fdir": "^6.5.0",
@@ -15073,7 +15038,6 @@
       "resolved": "https://registry.npmjs.org/vue/-/vue-3.5.29.tgz",
       "integrity": "sha512-BZqN4Ze6mDQVNAni0IHeMJ5mwr8VAJ3MQC9FmprRhcBYENw+wOAAjRj8jfmN6FLl0j96OXbR+CjWhmAmM+QGnA==",
       "license": "MIT",
-      "peer": true,
       "dependencies": {
         "@vue/compiler-dom": "3.5.29",
         "@vue/compiler-sfc": "3.5.29",
@@ -15116,7 +15080,6 @@
       "resolved": "https://registry.npmjs.org/vue-router/-/vue-router-4.6.4.tgz",
       "integrity": "sha512-Hz9q5sa33Yhduglwz6g9skT8OBPii+4bFn88w6J+J4MfEo4KRRpmiNG/hHHkdbRFlLBOqxN8y8gf2Fb0MTUgVg==",
       "license": "MIT",
-      "peer": true,
       "dependencies": {
         "@vue/devtools-api": "^6.6.4"
       },
@@ -15138,6 +15101,7 @@
       "resolved": "https://registry.npmjs.org/webidl-conversions/-/webidl-conversions-7.0.0.tgz",
       "integrity": "sha512-VwddBukDzu71offAQR975unBIGqfKZpM+8ZX6ySk8nYhVoo5CYaZyzt3YBvYtRtO+aoGlqxPg/B87NGVZ/fu6g==",
       "license": "BSD-2-Clause",
+      "peer": true,
       "engines": {
         "node": ">=12"
       }
@@ -15153,6 +15117,7 @@
       "resolved": "https://registry.npmjs.org/whatwg-url/-/whatwg-url-14.2.0.tgz",
       "integrity": "sha512-De72GdQZzNTUBBChsXueQUnPKDkg/5A5zp7pFDuQAj5UFoENpiACU0wlCvzpAGnTkj++ihpKwKyYewn/XNUbKw==",
       "license": "MIT",
+      "peer": true,
       "dependencies": {
         "tr46": "^5.1.0",
         "webidl-conversions": "^7.0.0"
@@ -15336,7 +15301,6 @@
       "resolved": "https://registry.npmjs.org/yaml/-/yaml-2.8.2.tgz",
       "integrity": "sha512-mplynKqc1C2hTVYxd0PU2xQAc22TI1vShAYGksCCfxbn/dFwnHTNi1bvYsBTkhdUNtGIf5xNOg938rrSSYvS9A==",
       "license": "ISC",
-      "peer": true,
       "bin": {
         "yaml": "bin.mjs"
       },
@@ -15450,7 +15414,6 @@
       "resolved": "https://registry.npmjs.org/zod/-/zod-4.3.6.tgz",
       "integrity": "sha512-rftlrkhHZOcjDwkGlnUtZZkvaPHCsDATp4pGpuOOMDaTdDDXF91wuVDJoWoPsKX/3YPQ5fHuF3STjcYyKr+Qhg==",
       "license": "MIT",
-      "peer": true,
       "funding": {
         "url": "https://github.com/sponsors/colinhacks"
       }
diff --git a/server/api/admin/class-progress.get.ts b/server/api/admin/class-progress.get.ts
index c52daa5..f34d480 100644
--- a/server/api/admin/class-progress.get.ts
+++ b/server/api/admin/class-progress.get.ts
@@ -1,14 +1,12 @@
 import { prisma } from '../../utils/prisma'
 import { auth } from '../../utils/auth'
 import { getQuery } from 'h3'
+import dayjs from 'dayjs'
+import isoWeek from 'dayjs/plugin/isoWeek'
+import utc from 'dayjs/plugin/utc'
 
-/// Standardizes a UTC date into YYYY-MM-DD string
-const formatYmdUtc = (date: Date) => {
-  const year = date.getUTCFullYear()
-  const month = String(date.getUTCMonth() + 1).padStart(2, '0')
-  const day = String(date.getUTCDate()).padStart(2, '0')
-  return `${year}-${month}-${day}`
-}
+dayjs.extend(isoWeek)
+dayjs.extend(utc)
 
 // Formats a UTC date for friendly frontend display (e.g., Nov 4, 2024)
 const formatDisplayDateUtc = (date: Date) => {
@@ -20,37 +18,6 @@ const formatDisplayDateUtc = (date: Date) => {
   }).format(date)
 }
 
-// Safely parses YYYY-MM-DD from user input
-const parseLocalDate = (dateString: string) => {
-  const parts = dateString.split('-')
-  if (parts.length !== 3) {
-    throw createError({ statusCode: 400, statusMessage: 'Invalid date format' })
-  }
-  return new Date(Number(parts[0]), Number(parts[1]) - 1, Number(parts[2]))
-}
-
-// Calculates start and end Date objects for a given week. 
-// Resolves dates from Monday to Sunday.
-const getWeekBoundsDates = (dateString: string) => {
-  const date = parseLocalDate(dateString)
-  const day = date.getDay()
-  const diffToMonday = day === 0 ? -6 : 1 - day
-
-  const monday = new Date(date)
-  monday.setDate(date.getDate() + diffToMonday)
-
-  const sunday = new Date(monday)
-  sunday.setDate(monday.getDate() + 6)
-
-  const mondayYmd = formatYmdUtc(monday)
-  const sundayYmd = formatYmdUtc(sunday)
-
-  return {
-    mondayDate: new Date(`${mondayYmd}T00:00:00.000Z`),
-    sundayDate: new Date(`${sundayYmd}T23:59:59.999Z`)
-  }
-}
-
 // HELPER: Fetches a standard list of individual completed records.
 // Queries db directly without pulling extra arrays into memory.
 async function getCompletedRecords(queryState: any) {
@@ -70,7 +37,8 @@ async function getCompletedRecords(queryState: any) {
 
   // Filter timeframe (week)
   if (selectedDate) {
-    const { mondayDate, sundayDate } = getWeekBoundsDates(selectedDate)
+    const mondayDate = dayjs.utc(selectedDate).startOf('isoWeek').toDate()
+    const sundayDate = dayjs.utc(selectedDate).endOf('isoWeek').toDate()
     where.Form = {
       ...where.Form,
       FormGroup: {
@@ -116,11 +84,11 @@ async function getCompletedRecords(queryState: any) {
       studentName: submission.Student.name,
       formGroupId: submission.Form.FormGroup.id,
       formGroupLabel: `Week of ${formatDisplayDateUtc(groupStart)}`,
-      formGroupStartDate: formatYmdUtc(groupStart),
+      formGroupStartDate: dayjs.utc(groupStart).format('YYYY-MM-DD'),
       formId: submission.Form.id,
       formTitle: submission.Form.title || `Form ${submission.Form.id}`,
       dateCompleted: formatDisplayDateUtc(completedAt),
-      dateCompletedYmd: formatYmdUtc(completedAt),
+      dateCompletedYmd: dayjs.utc(completedAt).format('YYYY-MM-DD'),
     }
   })
 
@@ -135,7 +103,8 @@ async function getGroupedRecords(queryState: any) {
   const submissionWhere: any = {}
 
   if (selectedDate) {
-    const { mondayDate, sundayDate } = getWeekBoundsDates(selectedDate)
+    const mondayDate = dayjs.utc(selectedDate).startOf('isoWeek').toDate()
+    const sundayDate = dayjs.utc(selectedDate).endOf('isoWeek').toDate()
     submissionWhere.Form = { FormGroup: { startDate: { gte: mondayDate, lte: sundayDate } } }
   }
 
@@ -169,7 +138,7 @@ async function getGroupedRecords(queryState: any) {
       studentName: studentNameMap.get(g.student) || 'Unknown',
       formsCompleted: g._count.id,
       lastSubmitted: formatDisplayDateUtc(date),
-      lastSubmittedYmd: formatYmdUtc(date),
+      lastSubmittedYmd: dayjs.utc(date).format('YYYY-MM-DD'),
     }
   })
 
@@ -200,7 +169,8 @@ async function getMissingRecords(queryState: any) {
   }
 
   // Calculate only forms that are expected in this specific week
-  const { mondayDate, sundayDate } = getWeekBoundsDates(selectedDate)
+  const mondayDate = dayjs.utc(selectedDate).startOf('isoWeek').toDate()
+  const sundayDate = dayjs.utc(selectedDate).endOf('isoWeek').toDate()
   const expectedForms = await prisma.form.findMany({
     where: { FormGroup: { startDate: { gte: mondayDate, lte: sundayDate } } },
     select: { id: true, title: true }
@@ -246,7 +216,7 @@ async function getMissingRecords(queryState: any) {
         missingFormsCount: missingForms.length,
         missingForms,
         lastSubmitted: lastSub ? formatDisplayDateUtc(lastSub) : '',
-        lastSubmittedYmd: lastSub ? formatYmdUtc(lastSub) : '',
+        lastSubmittedYmd: lastSub ? dayjs.utc(lastSub).format('YYYY-MM-DD') : '',
       })
     }
   }
diff --git a/server/api/form/index.ts b/server/api/form/index.ts
index f78e1e0..bb1d0ce 100644
--- a/server/api/form/index.ts
+++ b/server/api/form/index.ts
@@ -2,6 +2,12 @@ import { Prisma } from '~~/prisma/generated/client'
 import { auth } from '~~/server/utils/auth'
 import { prisma } from '~~/server/utils/prisma'
 import { getQuery, setResponseStatus, type H3Event } from 'h3'
+import dayjs from 'dayjs'
+import isoWeek from 'dayjs/plugin/isoWeek'
+import utc from 'dayjs/plugin/utc'
+
+dayjs.extend(isoWeek)
+dayjs.extend(utc)
 
 type ActionName =
   | 'listFormGroups'
@@ -20,8 +26,6 @@ type ActionName =
   | 'deleteForm'
   | 'deleteComponent'
 
-const WEEKDAY_NAMES = ['Sunday', 'Monday', 'Tuesday', 'Wednesday', 'Thursday', 'Friday', 'Saturday']
-
 const hasOwnField = (value: Record<string, unknown> | null, key: string) =>
   Object.prototype.hasOwnProperty.call(value ?? {}, key)
 
@@ -113,7 +117,7 @@ const formatDayName = (value: Date | null | undefined) => {
     return ''
   }
 
-  return WEEKDAY_NAMES[value.getUTCDay()]
+  return dayjs.utc(value).format('dddd')
 }
 
 const formatDisplayDate = (value: Date | null | undefined) => {
@@ -128,23 +132,9 @@ const formatDisplayDate = (value: Date | null | undefined) => {
   })
 }
 
-const getWeekBoundsUtc = (date: Date) => {
-  const normalizedDate = new Date(Date.UTC(date.getUTCFullYear(), date.getUTCMonth(), date.getUTCDate()))
-  const daysSinceMonday = (normalizedDate.getUTCDay() + 6) % 7
-
-  const monday = new Date(normalizedDate)
-  monday.setUTCDate(normalizedDate.getUTCDate() - daysSinceMonday)
-  monday.setUTCHours(0, 0, 0, 0)
-
-  const sunday = new Date(monday)
-  sunday.setUTCDate(monday.getUTCDate() + 6)
-  sunday.setUTCHours(23, 59, 59, 999)
-
-  return { monday, sunday }
-}
-
 const findOrCreateWeeklyFormGroup = async (date: Date) => {
-  const { monday, sunday } = getWeekBoundsUtc(date)
+  const monday = dayjs.utc(date).startOf('isoWeek').toDate()
+  const sunday = dayjs.utc(date).endOf('isoWeek').toDate()
 
   const existingGroup = await prisma.formGroup.findFirst({
     where: {