diff --git a/admin-portal-frontend/emergencies.ts b/admin-portal-frontend/src/app/api/emergencies.ts
similarity index 77%
rename from admin-portal-frontend/emergencies.ts
rename to admin-portal-frontend/src/app/api/emergencies.ts
index 93aa7f6..27249ea 100644
--- a/admin-portal-frontend/emergencies.ts
+++ b/admin-portal-frontend/src/app/api/emergencies.ts
@@ -65,7 +65,13 @@ export async function createEmergency(
   emergency: CreateEmergencyRequest,
 ): Promise<APIResult<Emergency>> {
   try {
-    const response = await post("/api/emergencies", emergency);
+    if (!process.env.API_URL) {
+      throw new Error("API URL is not defined");
+    }
+
+    const url = `${process.env.API_URL}/emergencyFlow`;
+
+    const response = await post(url, emergency);
     const json = (await response.json()) as Emergency;
     return { success: true, data: json };
   } catch (error) {
@@ -75,7 +81,13 @@ export async function createEmergency(
 
 export async function getEmergency(id: string): Promise<APIResult<Emergency>> {
   try {
-    const response = await get(`/api/emergencies/${id}`);
+    if (!process.env.API_URL) {
+      throw new Error("API URL is not defined");
+    }
+
+    const url = `${process.env.API_URL}/emergencyFlow/${id}`;
+
+    const response = await get(url);
     const json = (await response.json()) as Emergency;
     return { success: true, data: json };
   } catch (error) {
@@ -85,7 +97,12 @@ export async function getEmergency(id: string): Promise<APIResult<Emergency>> {
 
 export async function getAllEmergencies(): Promise<APIResult<Emergency[]>> {
   try {
-    const response = await get(`/api/emergencies/`);
+    if (!process.env.API_URL) {
+      throw new Error("API URL is not defined");
+    }
+
+    const url = `${process.env.API_URL}/emergencyFlow`;
+    const response = await get(url);
     const json = (await response.json()) as Emergency[];
     // const parsedJson = json.map((element) => (element));
     return { success: true, data: json };
@@ -99,8 +116,12 @@ export async function updateEmergency(
   emergency: UpdateEmergencyRequest,
 ): Promise<APIResult<Emergency>> {
   try {
-    // your code here
-    const response = await put(`/api/emergencies/${emergency._id}`, emergency);
+    if (!process.env.API_URL) {
+      throw new Error("API URL is not defined");
+    }
+
+    const url = `${process.env.API_URL}/emergencyFlow/${emergency._id}`;
+    const response = await put(url, emergency);
     const json = (await response.json()) as Emergency;
     return { success: true, data: json };
   } catch (error) {
diff --git a/admin-portal-frontend/requests.ts b/admin-portal-frontend/src/app/api/requests.ts
similarity index 100%
rename from admin-portal-frontend/requests.ts
rename to admin-portal-frontend/src/app/api/requests.ts
diff --git a/admin-portal-frontend/src/app/pages/EmergencyFlow.tsx b/admin-portal-frontend/src/app/pages/EmergencyFlow.tsx
index b52b8a4..7bbdf70 100644
--- a/admin-portal-frontend/src/app/pages/EmergencyFlow.tsx
+++ b/admin-portal-frontend/src/app/pages/EmergencyFlow.tsx
@@ -5,7 +5,7 @@
 import { useRouter } from "next/navigation";
 import React from "react";
 
-import { CreateEmergencyRequest, createEmergency } from "../../../emergencies";
+import { CreateEmergencyRequest, createEmergency } from "../api/emergencies";
 
 import styles from "./EmergencyFlowStyles";
 
@@ -130,8 +130,16 @@ const EmergencyFlow: React.FC = () => {
           // If the problem is something we don't really control, such as network
           // issues or an unexpected exception on the server side, then use a
           // banner, modal, popup, or similar.
-
-          alert(result.error);
+          if (
+            !emergencyTitle ||
+            emergencyTitle === "" ||
+            !emergencySubtitle ||
+            emergencyTitle === ""
+          ) {
+            alert("Missing required title or subtitle fields. Please resubmit the form.");
+          } else {
+            alert(result.error);
+          }
           console.log(result);
         }
       })
diff --git a/package.json b/package.json
deleted file mode 100644
index b24af46..0000000
--- a/package.json
+++ /dev/null
@@ -1,5 +0,0 @@
-{
-  "dependencies": {
-    "react-router-dom": "^6.23.0"
-  }
-}