diff --git a/src/components/EventEditor.vue b/src/components/EventEditor.vue
index d409cd2..40fe817 100644
--- a/src/components/EventEditor.vue
+++ b/src/components/EventEditor.vue
@@ -148,8 +148,8 @@ watch(
 </script>
 
 <template>
-  <v-sheet class="pa-2 text-start overflow-auto" min-height="84vh" max-height="84vh">
-    <div class="event-editor-header d-flex justify-space-between pa-4">
+  <v-sheet class="text-start overflow-auto" color="surface" min-height="84vh" max-height="84vh">
+    <v-sheet class="event-editor-header d-flex justify-space-between pa-4" color="surface">
       <div>
         <v-icon :icon="entityIcon" class="mr-2" />
         {{ entityObject?.label || 'Nothing Selected' }}
@@ -180,7 +180,7 @@ watch(
           @click="$emit('close')"
         />
       </div>
-    </div>
+    </v-sheet>
 
     <div class="event-editor-fields">
       <v-divider />
@@ -285,7 +285,7 @@ watch(
       <v-divider/>
     </div>
 
-    <div class="event-editor-footer d-flex text-end justify-space-between pa-4">
+    <v-sheet class="event-editor-footer d-flex text-end justify-space-between pa-4" color="surface">
       <v-btn v-if="mode === 'edit'"
         variant="text"
         @click="cancelEdit"
@@ -301,7 +301,7 @@ watch(
         :loading="saving">
         Save
       </v-btn>
-    </div>
+    </v-sheet>
   </v-sheet>
 </template>
 
@@ -309,4 +309,18 @@ watch(
 .event-editor-section {
   margin-bottom: 1.5rem;
 }
+
+.event-editor-header,
+.event-editor-footer {
+  position: sticky;
+  z-index: 2;
+}
+
+.event-editor-header {
+  top: 0;
+}
+
+.event-editor-footer {
+  bottom: 0;
+}
 </style>
diff --git a/src/components/editors/EventEditorDateTimeField.vue b/src/components/editors/EventEditorDateTimeField.vue
new file mode 100644
index 0000000..aa5832a
--- /dev/null
+++ b/src/components/editors/EventEditorDateTimeField.vue
@@ -0,0 +1,96 @@
+<script setup lang="ts">
+import { ref, watch } from 'vue'
+import { formatDisplayDate, formatDisplayTime, formatLocalIsoDate, formatLocalIsoTime } from '@/utils/format'
+
+interface Props {
+  modelValue?: string | null
+}
+
+const props = defineProps<Props>()
+
+const emit = defineEmits<{
+  'update:modelValue': [value: string | null]
+}>()
+
+const dateValue = ref('')
+const timeValue = ref('')
+const dateMenu = ref(false)
+const timeMenu = ref(false)
+
+watch(() => props.modelValue, (value) => {
+  const date = value ? new Date(value) : new Date()
+  dateValue.value = formatLocalIsoDate(date)
+  timeValue.value = formatLocalIsoTime(date)
+}, { immediate: true })
+
+const emitValue = () => {
+  if (!dateValue.value || !timeValue.value) return
+  emit('update:modelValue', new Date(`${dateValue.value}T${timeValue.value}`).toISOString())
+}
+
+const pickerDate = (value: string): Date | null => value ? new Date(`${value}T00:00:00`) : null
+
+const normalizePickerDate = (value: unknown): string => {
+  const selected = Array.isArray(value) ? value[0] : value
+  const date = selected instanceof Date ? selected : new Date(String(selected))
+  return Number.isNaN(date.getTime()) ? '' : formatLocalIsoDate(date)
+}
+
+const selectDate = (value: unknown) => {
+  const date = normalizePickerDate(value)
+  if (date) dateValue.value = date
+  dateMenu.value = false
+  emitValue()
+}
+
+watch(timeValue, () => emitValue())
+</script>
+
+<template>
+  <v-row dense>
+    <v-col cols="6">
+      <v-menu v-model="dateMenu" :close-on-content-click="false" location="bottom start">
+        <template #activator="{ props: activatorProps }">
+          <v-text-field
+            v-bind="activatorProps"
+            :model-value="formatDisplayDate(dateValue)"
+            label="Date"
+            prepend-inner-icon="mdi-calendar"
+            variant="outlined"
+            density="compact"
+            hide-details
+            readonly
+          />
+        </template>
+        <v-date-picker
+          :model-value="pickerDate(dateValue)"
+          color="primary"
+          show-adjacent-months
+          @update:model-value="selectDate"
+        />
+      </v-menu>
+    </v-col>
+    <v-col cols="6">
+      <v-menu v-model="timeMenu" :close-on-content-click="false" location="bottom start">
+        <template #activator="{ props: activatorProps }">
+          <v-text-field
+            v-bind="activatorProps"
+            :model-value="formatDisplayTime(timeValue)"
+            label="Time"
+            prepend-inner-icon="mdi-clock-outline"
+            variant="outlined"
+            density="compact"
+            hide-details
+            readonly
+          />
+        </template>
+        <v-card>
+          <v-time-picker v-model="timeValue" color="primary" format="ampm" />
+          <v-card-actions class="justify-end">
+            <v-btn variant="text" @click="timeMenu = false">Done</v-btn>
+          </v-card-actions>
+        </v-card>
+      </v-menu>
+    </v-col>
+  </v-row>
+</template>
diff --git a/src/components/editors/EventEditorDates.vue b/src/components/editors/EventEditorDates.vue
index c3ee4cd..66b375a 100644
--- a/src/components/editors/EventEditorDates.vue
+++ b/src/components/editors/EventEditorDates.vue
@@ -137,8 +137,6 @@ watch([startDate, startTime, endDate, endTime, timelessValue], () => {
 
 <template>
   <div class="event-editor-section">
-    <div class="text-subtitle-1 mb-2">Date & Time</div>
-    
     <!-- Read-only view -->
     <div v-if="mode === 'view'">
       <div class="mb-2 pa-2">
@@ -164,7 +162,6 @@ watch([startDate, startTime, endDate, endTime, timelessValue], () => {
       />
 
       <div class="mb-3">
-        <div class="text-subtitle-2 mb-2">Start</div>
         <v-row dense>
           <v-col cols="12" md="6">
             <v-menu v-model="startDateMenu" :close-on-content-click="false" location="bottom start">
@@ -212,7 +209,6 @@ watch([startDate, startTime, endDate, endTime, timelessValue], () => {
       </div>
 
       <div class="mb-3">
-        <div class="text-subtitle-2 mb-2">End</div>
         <v-row dense>
           <v-col cols="12" md="6">
             <v-menu v-model="endDateMenu" :close-on-content-click="false" location="bottom start">
diff --git a/src/components/editors/EventEditorDescription.vue b/src/components/editors/EventEditorDescription.vue
index 6d1c33e..1a9744c 100644
--- a/src/components/editors/EventEditorDescription.vue
+++ b/src/components/editors/EventEditorDescription.vue
@@ -20,7 +20,6 @@ const descriptionValue = computed({
 
 <template>
   <div v-if="descriptionValue || mode === 'edit'" class="event-editor-section">
-    <div class="text-subtitle-1 mb-2">Description</div>
     <!-- Read-only view -->
     <div v-if="mode === 'view'" class="mb-4">
       <div class="mb-2 pa-2 white-space-pre-wrap">{{ descriptionValue || 'No description' }}</div>
diff --git a/src/components/editors/EventEditorLabel.vue b/src/components/editors/EventEditorLabel.vue
index 3647ecd..364a57a 100644
--- a/src/components/editors/EventEditorLabel.vue
+++ b/src/components/editors/EventEditorLabel.vue
@@ -20,7 +20,6 @@ const labelValue = computed({
 
 <template>
   <div class="event-editor-section">
-    <div class="text-subtitle-1 mb-2">Title</div>
     <!-- Read-only view -->
     <div v-if="mode === 'view'" class="mb-4">
       <div class="mb-2 pa-2">{{ labelValue || 'Untitled Event' }}</div>
diff --git a/src/components/editors/EventEditorLocations.vue b/src/components/editors/EventEditorLocations.vue
index dd8d157..3c569ed 100644
--- a/src/components/editors/EventEditorLocations.vue
+++ b/src/components/editors/EventEditorLocations.vue
@@ -27,7 +27,7 @@ const hasLocations = () => {
     <!-- Physical Locations -->
     <div v-if="Object.keys(locationsPhysical || {}).length > 0 || mode === 'edit'" class="mb-4">
       <div class="d-flex align-center justify-space-between mb-2">
-        <div class="text-subtitle-2">Physical Locations</div>
+        <div class="text-subtitle-2">Physical</div>
         <v-btn v-if="mode === 'edit'"
           size="small"
           variant="outlined"
@@ -49,8 +49,7 @@ const hasLocations = () => {
       <!-- Edit view -->
       <div v-else>
         <div v-for="(location, key) in locationsPhysical" :key="key" class="mb-3 pa-3 border rounded">
-          <div class="d-flex align-center justify-space-between mb-2">
-            <strong>{{ location.label || 'Physical Location' }}</strong>
+          <div class="d-flex justify-end mb-2">
             <v-btn
               icon="mdi-delete"
               size="small"
@@ -102,7 +101,7 @@ const hasLocations = () => {
     <!-- Virtual Locations -->
     <div v-if="Object.keys(locationsVirtual || {}).length > 0 || mode === 'edit'">
       <div class="d-flex align-center justify-space-between mb-2">
-        <div class="text-subtitle-2">Virtual Locations</div>
+        <div class="text-subtitle-2">Virtual</div>
         <v-btn v-if="mode === 'edit'"
           size="small"
           variant="outlined"
@@ -126,8 +125,7 @@ const hasLocations = () => {
       <!-- Edit view -->
       <div v-else>
         <div v-for="(location, key) in locationsVirtual" :key="key" class="mb-3 pa-3 border rounded">
-          <div class="d-flex align-center justify-space-between mb-2">
-            <strong>{{ location.label || 'Virtual Location' }}</strong>
+          <div class="d-flex justify-end mb-2">
             <v-btn
               icon="mdi-delete"
               size="small"
diff --git a/src/components/editors/EventEditorNotifications.vue b/src/components/editors/EventEditorNotifications.vue
index 4b744eb..80e4d7c 100644
--- a/src/components/editors/EventEditorNotifications.vue
+++ b/src/components/editors/EventEditorNotifications.vue
@@ -1,4 +1,6 @@
 <script setup lang="ts">
+import EventEditorDateTimeField from './EventEditorDateTimeField.vue'
+
 interface Props {
   mode: 'edit' | 'view'
   notifications: Record<string, any>
@@ -13,14 +15,12 @@ const emit = defineEmits<{
 
 const typeOptions = [
   { title: 'Email', value: 'email' },
-  { title: 'Visual (Display)', value: 'visual' },
-  { title: 'Audible (Sound)', value: 'audible' }
+  { title: 'Display', value: 'visual' }
 ]
 
 const patternOptions = [
-  { title: 'Absolute (Specific Time)', value: 'absolute' },
-  { title: 'Relative (Before Event)', value: 'relative' },
-  { title: 'Unknown', value: 'unknown' }
+  { title: 'Relative', value: 'relative' },
+  { title: 'Absolute', value: 'absolute' },
 ]
 
 const anchorOptions = [
@@ -28,6 +28,18 @@ const anchorOptions = [
   { title: 'End Time', value: 'end' }
 ]
 
+const offsetPresets = [
+  { title: '5 minutes before', value: 'PT5M' },
+  { title: '10 minutes before', value: 'PT10M' },
+  { title: '15 minutes before', value: 'PT15M' },
+  { title: '30 minutes before', value: 'PT30M' },
+  { title: '1 hour before', value: 'PT1H' },
+  { title: '2 hours before', value: 'PT2H' },
+  { title: '1 day before', value: 'P1D' },
+  { title: '2 days before', value: 'P2D' },
+  { title: '1 week before', value: 'P1W' },
+]
+
 const formatNotification = (notification: any) => {
   if (notification.pattern === 'absolute' && notification.when) {
     return `At ${new Date(notification.when).toLocaleString()}`
@@ -48,7 +60,7 @@ const formatNotification = (notification: any) => {
         variant="outlined"
         @click="$emit('add-notification')">
         <v-icon left>mdi-plus</v-icon>
-        Add Notification
+        Add
       </v-btn>
     </div>
 
@@ -69,9 +81,65 @@ const formatNotification = (notification: any) => {
 
     <!-- Edit view -->
     <div v-else>
-      <div v-for="(notification, key) in notifications" :key="key" class="mb-3 pa-3 border rounded">
-        <div class="d-flex align-center justify-space-between mb-2">
-          <strong>Notification</strong>
+      <div v-for="(notification, key) in notifications" :key="key" class="mb-2 pa-2 border rounded">
+        <div class="d-flex align-center ga-2">
+          <v-row dense class="flex-grow-1">
+            <v-col cols="6" sm="3">
+              <v-select
+                v-model="notification.type"
+                :items="typeOptions"
+                label="Type"
+                variant="outlined"
+                density="compact"
+                hide-details
+                :rules="[v => !!v || 'Type is required']"
+              />
+            </v-col>
+            <v-col cols="6" sm="3">
+              <v-select
+                v-model="notification.pattern"
+                :items="patternOptions"
+                label="Pattern"
+                variant="outlined"
+                density="compact"
+                hide-details
+                :rules="[v => !!v || 'Pattern is required']"
+              />
+            </v-col>
+
+            <v-col v-if="notification.pattern === 'absolute'" cols="12" sm="6">
+              <EventEditorDateTimeField
+                :model-value="notification.when"
+                @update:model-value="notification.when = $event"
+              />
+            </v-col>
+
+            <template v-else-if="notification.pattern === 'relative'">
+              <v-col cols="6" sm="3">
+                <v-select
+                  v-model="notification.anchor"
+                  :items="anchorOptions"
+                  label="Anchor"
+                  variant="outlined"
+                  density="compact"
+                  hide-details
+                />
+              </v-col>
+              <v-col cols="6" sm="3">
+                <v-combobox
+                  v-model="notification.offset"
+                  :items="offsetPresets"
+                  item-title="title"
+                  item-value="value"
+                  label="Offset"
+                  variant="outlined"
+                  density="compact"
+                  hide-details
+                />
+              </v-col>
+            </template>
+          </v-row>
+
           <v-btn
             icon="mdi-delete"
             size="small"
@@ -80,63 +148,6 @@ const formatNotification = (notification: any) => {
             @click="$emit('remove-notification', key)">
           </v-btn>
         </div>
-
-        <v-row dense class="mb-2">
-          <v-col cols="12" md="6">
-            <v-select
-              v-model="notification.type"
-              :items="typeOptions"
-              label="Type"
-              variant="outlined"
-              density="compact"
-              :rules="[v => !!v || 'Type is required']"
-            />
-          </v-col>
-          <v-col cols="12" md="6">
-            <v-select
-              v-model="notification.pattern"
-              :items="patternOptions"
-              label="Pattern"
-              variant="outlined"
-              density="compact"
-              :rules="[v => !!v || 'Pattern is required']"
-            />
-          </v-col>
-        </v-row>
-
-        <div v-if="notification.pattern === 'absolute'">
-          <v-text-field
-            v-model="notification.when"
-            label="When (ISO Date)"
-            type="datetime-local"
-            variant="outlined"
-            density="compact"
-            hint="Specific date and time for notification"
-          />
-        </div>
-
-        <div v-else-if="notification.pattern === 'relative'">
-          <v-row dense>
-            <v-col cols="12" md="6">
-              <v-text-field
-                v-model="notification.offset"
-                label="Offset (e.g., PT15M)"
-                variant="outlined"
-                density="compact"
-                hint="ISO 8601 duration before event"
-              />
-            </v-col>
-            <v-col cols="12" md="6">
-              <v-select
-                v-model="notification.anchor"
-                :items="anchorOptions"
-                label="Anchor"
-                variant="outlined"
-                density="compact"
-              />
-            </v-col>
-          </v-row>
-        </div>
       </div>
     </div>
   </div>
diff --git a/src/components/editors/EventEditorParticipants.vue b/src/components/editors/EventEditorParticipants.vue
index 926fa94..27ece98 100644
--- a/src/components/editors/EventEditorParticipants.vue
+++ b/src/components/editors/EventEditorParticipants.vue
@@ -90,7 +90,7 @@ const hasParticipants = () => {
           variant="outlined"
           @click="$emit('add-participant')">
           <v-icon left>mdi-plus</v-icon>
-          Add Participant
+          Add
         </v-btn>
       </div>
 
@@ -131,8 +131,7 @@ const hasParticipants = () => {
       <!-- Edit view -->
       <div v-else>
         <div v-for="(participant, key) in participants" :key="key" class="mb-3 pa-3 border rounded">
-          <div class="d-flex align-center justify-space-between mb-2">
-            <strong>{{ participant.name || 'Participant' }}</strong>
+          <div class="d-flex justify-end mb-2">
             <v-btn
               icon="mdi-delete"
               size="small"
diff --git a/src/components/editors/EventEditorTags.vue b/src/components/editors/EventEditorTags.vue
index a8913b2..1661687 100644
--- a/src/components/editors/EventEditorTags.vue
+++ b/src/components/editors/EventEditorTags.vue
@@ -20,8 +20,6 @@ const tagsValue = computed({
 
 <template>
   <div v-if="tagsValue.length > 0 || mode === 'edit'" class="event-editor-section">
-    <div class="text-subtitle-1 mb-2">Tags</div>
-    
     <!-- Read-only view -->
     <div v-if="mode === 'view'" class="mb-4">
       <div v-if="tagsValue.length > 0" class="pa-2">