diff --git a/src/event_manager_controller.js b/src/event_manager_controller.js
index 7e3a33e..d712372 100644
--- a/src/event_manager_controller.js
+++ b/src/event_manager_controller.js
@@ -611,24 +611,22 @@ export function renderEventManagerView(context) {
       commitTeamEdit();
     });
 
-    window.__liveRcTeamActions = {
-      add: () => commitTeamCreate(),
-      edit: (teamId) => {
-        if (!teamId) return;
-        setSelectedTeamEditId(String(teamId));
-        rerenderEventManager(eventId);
-      },
-      remove: (teamId) => {
-        if (!teamId) return;
-        event.raceConfig.teams = getEventTeams(event).filter((item) => item.id !== String(teamId));
-        if (getSelectedTeamEditId() === String(teamId)) {
-          setSelectedTeamEditId(null);
-        }
-        saveState();
-        rerenderEventManager(eventId);
-      },
-      saveEdit: () => commitTeamEdit(),
+    window.liveRcTeamAdd = () => commitTeamCreate();
+    window.liveRcTeamEdit = (teamId) => {
+      if (!teamId) return;
+      setSelectedTeamEditId(String(teamId));
+      rerenderEventManager(eventId);
     };
+    window.liveRcTeamRemove = (teamId) => {
+      if (!teamId) return;
+      event.raceConfig.teams = getEventTeams(event).filter((item) => item.id !== String(teamId));
+      if (getSelectedTeamEditId() === String(teamId)) {
+        setSelectedTeamEditId(null);
+      }
+      saveState();
+      rerenderEventManager(eventId);
+    };
+    window.liveRcTeamSaveEdit = () => commitTeamEdit();
 
 
     document.getElementById("raceFormatBasicToggle")?.addEventListener("click", () => {
diff --git a/src/event_manager_view.js b/src/event_manager_view.js
index 8158feb..d3f7753 100644
--- a/src/event_manager_view.js
+++ b/src/event_manager_view.js
@@ -292,7 +292,7 @@ export function renderEventManagerMarkup(context) {
           <p class="hint">${t("events.team_steps")}</p>
           <form id="teamForm" class="form-grid cols-4 team-create-form">
             <input name="teamName" required placeholder="${t("events.team_name")}" />
-            <button class="btn btn-primary" id="teamAddSave" type="button" onclick="window.__liveRcTeamActions?.add?.()">${t("events.add_team")}</button>
+            <button class="btn btn-primary" id="teamAddSave" type="button" onclick="if(window.liveRcTeamAdd){window.liveRcTeamAdd();}">${t("events.add_team")}</button>
           </form>
           <p class="hint">${t("events.team_hint")}</p>
           <div class="panel-row mt-16">
@@ -353,8 +353,8 @@ export function renderEventManagerMarkup(context) {
                             )}</div>
                           </div>
                           <div class="actions-inline">
-                            <button id="team-edit-${team.id}" class="btn" type="button" onclick="window.__liveRcTeamActions?.edit?.('${team.id}')">${t("events.edit_team")}</button>
-                            <button id="team-delete-${team.id}" class="btn btn-danger" type="button" onclick="window.__liveRcTeamActions?.remove?.('${team.id}')">${t("common.delete")}</button>
+                            <button id="team-edit-${team.id}" class="btn" type="button" onclick="if(window.liveRcTeamEdit){window.liveRcTeamEdit('${team.id}');}">${t("events.edit_team")}</button>
+                            <button id="team-delete-${team.id}" class="btn btn-danger" type="button" onclick="if(window.liveRcTeamRemove){window.liveRcTeamRemove('${team.id}');}">${t("common.delete")}</button>
                           </div>
                         </article>
                       `
@@ -743,7 +743,7 @@ export function renderEventManagerMarkup(context) {
                     </div>
                   </div>
                   <div class="actions-inline">
-                    <button class="btn btn-primary" id="teamEditSave" type="button" onclick="window.__liveRcTeamActions?.saveEdit?.()">${t("common.save")}</button>
+                    <button class="btn btn-primary" id="teamEditSave" type="button" onclick="if(window.liveRcTeamSaveEdit){window.liveRcTeamSaveEdit();}">${t("common.save")}</button>
                     <button class="btn" id="teamEditCancelFooter" type="button">${t("common.cancel")}</button>
                   </div>
                 </form>