diff --git a/src/components/operations/AddPotentialLinkModal.vue b/src/components/operations/AddPotentialLinkModal.vue
index ef7f47a..bedd3db 100644
--- a/src/components/operations/AddPotentialLinkModal.vue
+++ b/src/components/operations/AddPotentialLinkModal.vue
@@ -1,5 +1,5 @@
  <script setup>
-import { inject, ref, onMounted, reactive, computed } from "vue";
+import { inject, ref, onMounted, reactive, computed, watch } from "vue";
 import { storeToRefs } from "pinia";
 import { toast } from 'bulma-toast'
 
@@ -10,7 +10,7 @@ import { useAbilityStore } from "@/stores/abilityStore";
 import { useSourceStore } from "@/stores/sourceStore";
 import { cartesian } from "@/utils/utils";
 
-const props = defineProps({ 
+const props = defineProps({
     active: Boolean,
     operation: Object,
     agent: Object
@@ -25,6 +25,20 @@ const abilityStore = useAbilityStore();
 const sourceStore = useSourceStore();
 const { sources } = storeToRefs(sourceStore);
 
+// Re-fetch abilities and agents when the modal is opened
+watch(
+    () => props.active,
+    async (newValue) => {
+        if (newValue) {
+            await Promise.all([
+                abilityStore.getAbilities($api),
+                agentStore.getAgents($api),
+                sourceStore.getSources($api),
+            ]);
+        }
+    }
+);
+
 let selectedPotentialLink = ref({});
 let selectedPotentialLinkFacts = ref({});
 let potentialLinkCommand = ref("");
diff --git a/src/components/operations/CreateModal.vue b/src/components/operations/CreateModal.vue
index 6394eb9..e4c7b89 100644
--- a/src/components/operations/CreateModal.vue
+++ b/src/components/operations/CreateModal.vue
@@ -1,5 +1,5 @@
 <script setup>
-import { ref, inject, onMounted } from "vue";
+import { ref, inject, onMounted, watch } from "vue";
 import { storeToRefs } from "pinia";
 import { toast } from 'bulma-toast';
 import { sanitizeInput, validateInput } from "@/utils/sanitize";
@@ -45,15 +45,30 @@ let validation = ref({
     name: "",
 });
 
+async function refreshDropdownData() {
+    await Promise.all([
+        agentStore.getAgents($api),
+        adversaryStore.getAdversaries($api),
+        getSources(),
+        coreStore.getObfuscators($api),
+        getPlanners(),
+    ]);
+}
+
 onMounted(async () => {
-    await agentStore.getAgents($api);
-    agentStore.updateAgentGroups();
-    await adversaryStore.getAdversaries($api);
-    await getSources();
-    await coreStore.getObfuscators($api);
-    await getPlanners();
+    await refreshDropdownData();
 });
 
+// Re-fetch all dropdown data when the modal is opened
+watch(
+    () => modals.value.operations.showCreate,
+    async (newValue) => {
+        if (newValue) {
+            await refreshDropdownData();
+        }
+    }
+);
+
 async function getSources() {
     try {
         await sourceStore.getSources($api);
diff --git a/src/components/schedules/CreateScheduleModal.vue b/src/components/schedules/CreateScheduleModal.vue
index ffd87af..5e204e0 100644
--- a/src/components/schedules/CreateScheduleModal.vue
+++ b/src/components/schedules/CreateScheduleModal.vue
@@ -42,19 +42,26 @@ let validation = ref({
   name: "",
 });
 
+async function refreshDropdownData() {
+  await Promise.all([
+    agentStore.getAgents($api),
+    adversaryStore.getAdversaries($api),
+    getSources(),
+    coreStore.getObfuscators($api),
+    getPlanners(),
+  ]);
+}
+
 onMounted(async () => {
-  await agentStore.getAgents($api);
-  agentStore.updateAgentGroups();
-  await adversaryStore.getAdversaries($api);
-  await getSources();
-  await coreStore.getObfuscators($api);
-  await getPlanners();
+  await refreshDropdownData();
 });
 
+// Re-fetch all dropdown data and reset fields when the modal is opened
 watch(
   () => modals.value.schedules.showCreate,
-  (newValue) => {
+  async (newValue) => {
     if (newValue) {
+      await refreshDropdownData();
       resetFields();
     }
   }
diff --git a/src/stores/adversaryStore.js b/src/stores/adversaryStore.js
index 2afb41a..8503444 100644
--- a/src/stores/adversaryStore.js
+++ b/src/stores/adversaryStore.js
@@ -63,7 +63,7 @@ export const useAdversaryStore = defineStore("adversaryStore", {
         this.adversaries.push(response.data);
         this.adversaries.sort((a, b) => a.name > b.name);
         this.selectedAdversary = response.data;
-        this.updateSelectedAdversaryAbilities();
+        this.updateSelectedAdversaryAbilities($api);
       } catch (error) {
         console.error("Error creating an adversary", error);
       }
@@ -112,19 +112,24 @@ export const useAdversaryStore = defineStore("adversaryStore", {
         console.error("Error deleting adversary", error);
       }
     },
-    updateSelectedAdversaryAbilities() {
+    async updateSelectedAdversaryAbilities($api) {
       if (!this.selectedAdversary.atomic_ordering) {
         this.selectedAdversaryAbilities = [];
-      } else {
-        this.selectedAdversaryAbilities =
-          this.selectedAdversary.atomic_ordering.map((ability_id) => {
-            return {
-              ...abilityStore().abilities.find(
-                (ability) => ability.ability_id === ability_id
-              ),
-            };
-          });
+        return;
       }
+      // Re-fetch abilities to ensure we have the latest data
+      if ($api) {
+        await abilityStore().getAbilities($api);
+      }
+      this.selectedAdversaryAbilities =
+        this.selectedAdversary.atomic_ordering
+          .map((ability_id) => {
+            const found = abilityStore().abilities.find(
+              (ability) => ability.ability_id === ability_id
+            );
+            return found ? { ...found } : null;
+          })
+          .filter((ability) => ability !== null);
     },
   },
 });
diff --git a/src/stores/agentStore.js b/src/stores/agentStore.js
index 94aec1b..ae87f90 100644
--- a/src/stores/agentStore.js
+++ b/src/stores/agentStore.js
@@ -6,10 +6,16 @@ export const useAgentStore = defineStore("agentStore", {
             agents: [],
             agentConfig: {},
             selectedAgent: {},
-            agentGroups: []
         };
     },
 
+    getters: {
+        agentGroups: (state) => {
+            if (!state.agents) return [];
+            return [...new Set(state.agents.map((agent) => agent.group))];
+        },
+    },
+
     actions: {
         async getAgents($api) {
             try {
@@ -64,9 +70,6 @@ export const useAgentStore = defineStore("agentStore", {
                 throw error;
             }
         },
-        updateAgentGroups() {
-            if (!this.agents) return;
-            this.agentGroups = [...new Set(this.agents.map((agent) => agent.group))];
-        }
+        // agentGroups is now a getter derived from agents state
     },
 });
diff --git a/src/views/AdversariesView.vue b/src/views/AdversariesView.vue
index 0bfc5ad..d368716 100644
--- a/src/views/AdversariesView.vue
+++ b/src/views/AdversariesView.vue
@@ -33,7 +33,7 @@ onMounted(async () => {
 
 function selectAdversary(adversary) {
     selectedAdversary.value = adversary; 
-    adversaryStore.updateSelectedAdversaryAbilities();
+    adversaryStore.updateSelectedAdversaryAbilities($api);
     isAdversaryDropdownOpen.value = false;
     adversarySearchQuery.value = "";
 }
diff --git a/src/views/OperationsView.vue b/src/views/OperationsView.vue
index c5f7264..2787fca 100644
--- a/src/views/OperationsView.vue
+++ b/src/views/OperationsView.vue
@@ -45,6 +45,7 @@ const coreStore = useCoreStore();
 const { modals } = storeToRefs(coreDisplayStore);
 
 let updateInterval = ref();
+let operationsListInterval = ref();
 let showPotentialLinkModal = ref(false);
 let selectedOutputLink = ref(null);
 
@@ -175,12 +176,18 @@ onMounted(async () => {
   await operationStore.getOperations($api);
   await coreStore.getObfuscators($api);
   await agentStore.getAgents($api);
-  agentStore.updateAgentGroups();
+  // agentGroups is now a computed getter, no manual update needed
   selectOperation();
+
+  // Periodically refresh the operations list to pick up new/changed operations
+  operationsListInterval.value = setInterval(async () => {
+    await operationStore.getOperations($api);
+  }, 15000);
 });
 
 onBeforeUnmount(() => {
   if (updateInterval) clearInterval(updateInterval);
+  if (operationsListInterval.value) clearInterval(operationsListInterval.value);
 });
 
 const resetFilter = () => {
diff --git a/src/views/SchedulesView.vue b/src/views/SchedulesView.vue
index 4363906..fbb0be9 100644
--- a/src/views/SchedulesView.vue
+++ b/src/views/SchedulesView.vue
@@ -30,7 +30,7 @@ onMounted(async () => {
   await scheduleStore.getSchedules($api);
   await coreStore.getObfuscators($api);
   await agentStore.getAgents($api);
-  agentStore.updateAgentGroups();
+  // agentGroups is now a computed getter, no manual update needed
 });
 </script>