diff --git a/frontend/src/Components/CreatePetModal.tsx b/frontend/src/Components/CreatePetModal.tsx
index 970e0912..3117746b 100644
--- a/frontend/src/Components/CreatePetModal.tsx
+++ b/frontend/src/Components/CreatePetModal.tsx
@@ -1,11 +1,195 @@
-import { SetStateAction, useState } from 'react';
-import Popup from 'reactjs-popup';
-import 'reactjs-popup/dist/index.css';
-import profile_land from '../Misc/8-bit-dog-nobg.png';
-import profile_air from '../Misc/duck_8bit.png';
-import profile_water from '../Misc/fish_8bit.png'
+import { SetStateAction, useState } from "react";
+import Popup from "reactjs-popup";
+import "reactjs-popup/dist/index.css";
+import profile_land from "../Misc/8-bit-dog-nobg.png";
+import profile_air from "../Misc/duck_8bit.png";
+import profile_water from "../Misc/frog.png";
 
 const CreatePetModal = () => {
+  const [open, setOpen] = useState(false);
+  const [petName, setPetName] = useState("");
+  const [petType, setPetType] = useState("Land");
+
+  const handleClose = () => {
+    setPetName("");
+    setPetType("Land");
+    setOpen(false);
+  };
+
+  const handleInputPetName = (e: {
+    target: { value: SetStateAction<string> };
+  }) => {
+    setPetName(e.target.value);
+  };
+
+  const handleInputPetType = (e: {
+    target: { value: SetStateAction<string> };
+  }) => {
+    setPetType(e.target.value);
+  };
+
+  const handleSubmit = (e: { preventDefault: () => void }) => {
+    e.preventDefault(); // Prevent form from reloading the page
+    if (petName.trim() === "" || petType === "") {
+      return;
+    }
+    // TODO: Save the device ID or perform any action with the input value
+    console.log("Pet Name:", petName, " Pet Type:", petType);
+    setOpen(false); // Close the popup after submission
+  };
+
+  return (
+    <>
+      <div
+        className="container-fluid d-flex justify-content-center align-items-center"
+        style={{ height: "100vh" }}
+      >
+        <button className="btn btn-success" onClick={() => setOpen(true)}>
+          Create Teamagochi
+        </button>
+      </div>
+      <Popup
+        open={open}
+        onClose={handleClose}
+        overlayStyle={{ background: "rgba(0, 0, 0, 0.5)" }}
+        contentStyle={{
+          borderRadius: "10px",
+          border: "2px solid grey",
+          width: "50%",
+        }}
+      >
+        <div style={{ padding: "20px", position: "relative" }}>
+          <button
+            type="button"
+            className="btn-close"
+            aria-label="Close"
+            style={{ position: "absolute", top: "10px", right: "10px" }}
+            onClick={handleClose}
+          ></button>
+
+          <form
+            className="row g-0 needs-validation justify-content-center"
+            onSubmit={handleSubmit}
+          >
+            <figure className="text-center">
+              <p className="lead">
+                <strong>Enter your Pet Name below and choose it's Type:</strong>
+              </p>
+            </figure>
+
+            {petType === "Land" && (
+              <div
+                className="card align-items-center m-3"
+                style={{ width: "40%" }}
+              >
+                <img
+                  src={profile_land}
+                  className="card-img-top py-3"
+                  style={{ width: "80%", height: "auto" }}
+                />
+              </div>
+            )}
+
+            {petType == "Air" && (
+              <div
+                className="card align-items-center m-3"
+                style={{ width: "40%" }}
+              >
+                <img
+                  src={profile_air}
+                  className="card-img-top py-3"
+                  alt="profile picture"
+                  style={{ width: "80%", height: "auto" }}
+                />
+              </div>
+            )}
+
+            {petType == "Water" && (
+              <div
+                className="card align-items-center m-3"
+                style={{ width: "40%" }}
+              >
+                <img
+                  src={profile_water}
+                  className="card-img-top py-3"
+                  alt="profile picture"
+                  style={{ width: "80%", height: "auto" }}
+                />
+              </div>
+            )}
+
+            <div className="input-group  mb-1">
+              <span className="input-group-text">@</span>
+              <label htmlFor="inputLink" className="visually-hidden">
+                Pet Name
+              </label>
+              <input
+                type="text"
+                className="form-control"
+                id="inputPetName"
+                placeholder="Pet Name"
+                required
+                value={petName}
+                onChange={handleInputPetName}
+              />
+              <div className="invalid-feedback">ok</div>
+            </div>
+
+            <div
+              className="btn-group btn-group-toggle pt-2"
+              data-toggle="buttons"
+            >
+              <input
+                type="radio"
+                className="btn-check"
+                name="options"
+                id="option1"
+                value="Land"
+                autoComplete="off"
+                checked={petType === "Land"}
+                onChange={handleInputPetType}
+              ></input>
+              <label className="btn btn-secondary" htmlFor="option1">
+                Land
+              </label>
+
+              <input
+                type="radio"
+                className="btn-check"
+                name="options"
+                id="option2"
+                value="Air"
+                autoComplete="off"
+                checked={petType === "Air"}
+                onChange={handleInputPetType}
+              ></input>
+              <label className="btn btn-secondary" htmlFor="option2">
+                Air
+              </label>
+
+              <input
+                type="radio"
+                className="btn-check"
+                name="options"
+                id="option3"
+                value="Water"
+                autoComplete="off"
+                checked={petType === "Water"}
+                onChange={handleInputPetType}
+              ></input>
+              <label className="btn btn-secondary" htmlFor="option3">
+                Water
+              </label>
+            </div>
+
+            <button type="submit" className="btn btn-success mt-2 mb-2">
+              Create
+            </button>
+          </form>
+        </div>
+      </Popup>
+    </>
+  );
     const [open, setOpen] = useState(false);
     const [petName, setPetName] = useState("");
     const [petType, setPetType] = useState("Land");
@@ -111,6 +295,7 @@ const CreatePetModal = () => {
             </Popup>
         </>
     );
+
 };
 
 export default CreatePetModal;
diff --git a/frontend/src/Components/PetPage.tsx b/frontend/src/Components/PetPage.tsx
index 087b8560..4a38a4e4 100644
--- a/frontend/src/Components/PetPage.tsx
+++ b/frontend/src/Components/PetPage.tsx
@@ -1,5 +1,5 @@
 import { useEffect, useState } from "react";
-import petImage from "../assets/pet_frog.png";
+import petImage from "../Misc/frog.png";
 import CreatePetModal from "./CreatePetModal";
 import { Device, useDeviceApi } from "../lib/api/useDeviceApi";
 import { Pet, usePetApi } from "../lib/api/usePetApi";
@@ -26,7 +26,7 @@ const PetPage = () => {
         const pet = await petApi.getPetById(defaultDevice.petId);
         setPet(pet);
       }
-    }
+    };
 
     fetchData();
   }, [deviceApi, petApi]);
diff --git a/frontend/src/Misc/frog.png b/frontend/src/Misc/frog.png
new file mode 100644
index 00000000..8f85866f
Binary files /dev/null and b/frontend/src/Misc/frog.png differ