diff --git a/src/components/EventEditor.vue b/src/components/EventEditor.vue
index 40fe817..e897b51 100644
--- a/src/components/EventEditor.vue
+++ b/src/components/EventEditor.vue
@@ -252,9 +252,7 @@ watch(
 
         <EventEditorParticipants
           :mode="mode"
-          :organizer="entityObject!.organizer"
           :participants="entityObject!.participants || {}"
-          @update:organizer="entityObject!.organizer = $event"
           @add-participant="addParticipant"
           @remove-participant="removeParticipant"
         />
diff --git a/src/components/editors/EventEditorLocations.vue b/src/components/editors/EventEditorLocations.vue
index 3c569ed..a16c354 100644
--- a/src/components/editors/EventEditorLocations.vue
+++ b/src/components/editors/EventEditorLocations.vue
@@ -22,21 +22,30 @@ const hasLocations = () => {
 
 <template>
   <div v-if="hasLocations() || mode === 'edit'" class="event-editor-section">
-    <div class="text-subtitle-1 mb-2">Locations</div>
+    <div class="d-flex align-center justify-space-between mb-2">
+      <div class="text-subtitle-1">Locations</div>
+      <div v-if="mode === 'edit'" class="d-flex ga-2">
+        <v-btn
+          icon="mdi-map-marker"
+          size="x-small"
+          variant="text"
+          rounded="0"
+          title="Add Physical Location"
+          @click="$emit('add-location-physical')">
+        </v-btn>
+        <v-btn
+          icon="mdi-web"
+          size="x-small"
+          variant="text"
+          rounded="0"
+          title="Add Virtual Location"
+          @click="$emit('add-location-virtual')">
+        </v-btn>
+      </div>
+    </div>
 
     <!-- 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</div>
-        <v-btn v-if="mode === 'edit'"
-          size="small"
-          variant="outlined"
-          @click="$emit('add-location-physical')">
-          <v-icon left>mdi-plus</v-icon>
-          Add
-        </v-btn>
-      </div>
-
       <!-- Read-only view -->
       <div v-if="mode === 'view'">
         <div v-for="(location, key) in locationsPhysical" :key="key" class="mb-2 pa-2 border rounded">
@@ -100,17 +109,6 @@ 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</div>
-        <v-btn v-if="mode === 'edit'"
-          size="small"
-          variant="outlined"
-          @click="$emit('add-location-virtual')">
-          <v-icon left>mdi-plus</v-icon>
-          Add
-        </v-btn>
-      </div>
-
       <!-- Read-only view -->
       <div v-if="mode === 'view'">
         <div v-for="(location, key) in locationsVirtual" :key="key" class="mb-2 pa-2 border rounded">
diff --git a/src/components/editors/EventEditorNotifications.vue b/src/components/editors/EventEditorNotifications.vue
index 80e4d7c..6216646 100644
--- a/src/components/editors/EventEditorNotifications.vue
+++ b/src/components/editors/EventEditorNotifications.vue
@@ -56,11 +56,12 @@ const formatNotification = (notification: any) => {
     <div class="d-flex align-center justify-space-between mb-2">
       <div class="text-subtitle-1">Notifications</div>
       <v-btn v-if="mode === 'edit'"
-        size="small"
-        variant="outlined"
+        icon="mdi-bell"
+        size="x-small"
+        variant="text"
+        rounded="0"
+        title="Add Notification"
         @click="$emit('add-notification')">
-        <v-icon left>mdi-plus</v-icon>
-        Add
       </v-btn>
     </div>
 
diff --git a/src/components/editors/EventEditorOccurrence.vue b/src/components/editors/EventEditorOccurrence.vue
index 7e6edfe..3c29052 100644
--- a/src/components/editors/EventEditorOccurrence.vue
+++ b/src/components/editors/EventEditorOccurrence.vue
@@ -221,13 +221,13 @@ const formatRecurrence = (pattern: RecurrencePattern) => {
       <div class="text-subtitle-1">Recurrence</div>
       <v-btn
         v-if="mode === 'edit' && !pattern"
-        size="small"
-        variant="outlined"
+        icon="mdi-repeat"
+        size="x-small"
+        variant="text"
+        rounded="0"
+        title="Add Recurrence"
         @click="addRecurrence"
-      >
-        <v-icon start icon="mdi-plus" />
-        Add
-      </v-btn>
+      />
       <v-btn
         v-else-if="mode === 'edit'"
         icon="mdi-delete"
diff --git a/src/components/editors/EventEditorParticipants.vue b/src/components/editors/EventEditorParticipants.vue
index 27ece98..9e5fa3f 100644
--- a/src/components/editors/EventEditorParticipants.vue
+++ b/src/components/editors/EventEditorParticipants.vue
@@ -1,14 +1,12 @@
 <script setup lang="ts">
 interface Props {
   mode: 'edit' | 'view'
-  organizer: any | null
   participants: Record<string, any>
 }
 
 const props = defineProps<Props>()
 
 const emit = defineEmits<{
-  'update:organizer': [organizer: any | null]
   'add-participant': []
   'remove-participant': [key: string]
 }>()
@@ -39,61 +37,26 @@ const typeOptions = [
 ]
 
 const hasParticipants = () => {
-  return props.organizer || Object.keys(props.participants || {}).length > 0
+  return Object.keys(props.participants || {}).length > 0
 }
 </script>
 
 <template>
   <div v-if="hasParticipants() || mode === 'edit'" class="event-editor-section">
-    <div class="text-subtitle-1 mb-2">Participants</div>
-
-    <!-- Organizer -->
-    <div v-if="organizer || mode === 'edit'" class="mb-4">
-      <div class="text-subtitle-2 mb-2">Organizer</div>
-      
-      <!-- Read-only view -->
-      <div v-if="mode === 'view' && organizer" class="pa-2 border rounded">
-        <div class="mb-1"><strong>{{ organizer.name || organizer.address }}</strong></div>
-        <div class="text-caption text-grey">{{ organizer.address }}</div>
-      </div>
-
-      <!-- Edit view -->
-      <div v-else-if="mode === 'edit'" class="pa-3 border rounded">
-        <v-row dense>
-          <v-col cols="12" md="6">
-            <v-text-field
-              v-model="organizer.name"
-              label="Name"
-              variant="outlined"
-              density="compact"
-            />
-          </v-col>
-          <v-col cols="12" md="6">
-            <v-text-field
-              v-model="organizer.address"
-              label="Email/Address"
-              variant="outlined"
-              density="compact"
-              :rules="[v => !!v || 'Address is required']"
-            />
-          </v-col>
-        </v-row>
-      </div>
+    <div class="d-flex align-center justify-space-between mb-2">
+      <div class="text-subtitle-1">Participants</div>
+      <v-btn v-if="mode === 'edit'"
+        icon="mdi-account"
+        size="x-small"
+        variant="text"
+        rounded="0"
+        title="Add Attendee"
+        @click="$emit('add-participant')">
+      </v-btn>
     </div>
 
     <!-- Participants List -->
     <div v-if="Object.keys(participants || {}).length > 0 || mode === 'edit'">
-      <div class="d-flex align-center justify-space-between mb-2">
-        <div class="text-subtitle-2">Attendees</div>
-        <v-btn v-if="mode === 'edit'"
-          size="small"
-          variant="outlined"
-          @click="$emit('add-participant')">
-          <v-icon left>mdi-plus</v-icon>
-          Add
-        </v-btn>
-      </div>
-
       <!-- Read-only view -->
       <div v-if="mode === 'view'">
         <div v-for="(participant, key) in participants" :key="key" class="mb-2 pa-2 border rounded">