diff --git a/src/components/ServiceProject/ManageServiceProject.jsx b/src/components/ServiceProject/ManageServiceProject.jsx
index e995b691..f16b18eb 100644
--- a/src/components/ServiceProject/ManageServiceProject.jsx
+++ b/src/components/ServiceProject/ManageServiceProject.jsx
@@ -192,8 +192,8 @@ const ManageServiceProject = ({ serviceProjectId, onClose }) => {
               {...register("statusId")}
             >
               <option>Select Service</option>
-              {PROJECT_STATUS.map((status) => (
-                <option value={status.id}>{status.label}</option>
+              {PROJECT_STATUS?.map((status) => (
+                <option key={status.id} value={status.id}>{status.label}</option>
               ))}
             </select>
             {errors?.statusId && (
diff --git a/src/components/ServiceProject/ServiceProjectBranch/ServiceBranch.jsx b/src/components/ServiceProject/ServiceProjectBranch/ServiceBranch.jsx
index 4e55618a..c1d17365 100644
--- a/src/components/ServiceProject/ServiceProjectBranch/ServiceBranch.jsx
+++ b/src/components/ServiceProject/ServiceProjectBranch/ServiceBranch.jsx
@@ -103,7 +103,7 @@ const ServiceBranch = () => {
                     htmlFor="inactiveEmployeesCheckbox"
                     className="ms-2 text-xs"
                   >
-                    Show Deleted Branches
+                    {!showInactive ? "Show Deleted" : "Hide Deleted"}
                   </label>
                 </div>
                 <div className="d-flex justify-content-end">
diff --git a/src/components/ServiceProject/ServiceProjectTeam/ServiceProjectTeamAllocation.jsx b/src/components/ServiceProject/ServiceProjectTeam/ServiceProjectTeamAllocation.jsx
index 37005288..e8ef3c36 100644
--- a/src/components/ServiceProject/ServiceProjectTeam/ServiceProjectTeamAllocation.jsx
+++ b/src/components/ServiceProject/ServiceProjectTeam/ServiceProjectTeamAllocation.jsx
@@ -162,7 +162,7 @@ const ServiceProjectTeamAllocation = () => {
               </div>
               <div className="col-12 d-flex flex-row gap-2 flex-wrap">
                 {selectedEmployees.map((e) => (
-                  <EmployeeChip handleRemove={handleRemove} employee={e} />
+                  <EmployeeChip key={`${e.id}-emp`} handleRemove={handleRemove} employee={e} />
                 ))}
               </div>
             </>
diff --git a/src/components/common/Chips.jsx b/src/components/common/Chips.jsx
index 4b8bd8e3..18972b2d 100644
--- a/src/components/common/Chips.jsx
+++ b/src/components/common/Chips.jsx
@@ -1,45 +1,44 @@
-import React from 'react'
+import React from "react";
 
-export const EmployeeChip = ({handleRemove,employee}) => {
- return(
-         <span
-                  key={employee?.id}
-                  className="tagify__tag d-inline-flex align-items-center me-1 mb-1"
-                  role="listitem"
-                >
-                  <div className="d-flex align-items-center">
-                    {employee?.photo ? (
-                      <span className="tagify__tag__avatar-wrap me-1">
-                        <img
-                          src={employee?.avataremployeerl || "/defaemployeelt-avatar.png"}
-                          alt={`${employee?.firstName || ""} ${employee?.lastName || ""}`}
-                          style={{ width: 12, height: 12, objectFit: "cover" }}
-                        />
-                      </span>
-                    ) : (
-                      <div className="avatar avatar-xs me-2">
-                        <span className="avatar-initial roemployeended-circle bg-label-secondary">
-                          {employee?.firstName?.[0] || ""}
-                          {employee?.lastName?.[0] || ""}
-                        </span>
-                      </div>
-                    )}
+export const EmployeeChip = ({ handleRemove, employee }) => {
+  return (
+    <span
+      key={employee?.id}
+      className="tagify__tag d-inline-flex align-items-center me-1 mb-1"
+      role="listitem"
+    >
+      <div className="d-flex align-items-center">
+        {employee?.photo ? (
+          <span className="tagify__tag__avatar-wrap me-1">
+            <img
+              src={employee?.avataremployeerl || "/defaemployeelt-avatar.png"}
+              alt={`${employee?.firstName || ""} ${employee?.lastName || ""}`}
+              style={{ width: 12, height: 12, objectFit: "cover" }}
+            />
+          </span>
+        ) : (
+          <div className="avatar avatar-xs me-2">
+            <span className="avatar-initial roemployeended-circle bg-label-secondary">
+              {employee?.firstName?.[0] || ""}
+              {employee?.lastName?.[0] || ""}
+            </span>
+          </div>
+        )}
 
-                    <div className="d-flex flex-colemployeemn">
-                      <span className="tagify__tag-text">
-                        {employee?.firstName} {employee?.lastName}
-                      </span>
-                    </div>
-                  </div>
-
-                  <bemployeetton
-                    type="bemployeetton"
-                    className="tagify__tag__removeBtn border-none"
-                    onClick={() => handleRemove(employee?.id)}
-                    aria-label={`Remove ${employee?.firstName}`}
-                    title="Remove"
-                  />
-                </span>
-  )
-}
+        <div className="d-flex flex-colemployeemn">
+          <span className="tagify__tag-text">
+            {employee?.firstName} {employee?.lastName}
+          </span>
+        </div>
+      </div>
 
+      <bemployeetton
+        type="bemployeetton"
+        className="tagify__tag__removeBtn border-none"
+        onClick={() => handleRemove(employee?.id)}
+        aria-label={`Remove ${employee?.firstName}`}
+        title="Remove"
+      />
+    </span>
+  );
+};
diff --git a/src/components/common/Forms/InputSuggesstionField.jsx b/src/components/common/Forms/InputSuggesstionField.jsx
index 9b63ff86..2dd700c0 100644
--- a/src/components/common/Forms/InputSuggesstionField.jsx
+++ b/src/components/common/Forms/InputSuggesstionField.jsx
@@ -14,7 +14,6 @@ const InputSuggessionField = ({
 }) => {
   const [open, setOpen] = useState(false);
   const dropdownRef = useRef(null);
-console.log(suggesstionList)
   useEffect(() => {
     const handleClickOutside = (event) => {
       if (dropdownRef.current && !dropdownRef.current.contains(event.target)) {
@@ -61,7 +60,7 @@ console.log(suggesstionList)
 
       {open && !isLoading && (
         <ul
-          className="dropdown-menu w-100 shadow-sm show animate__fadeIn"
+          className="dropdown-menu w-100 shadow-sm show animate__fadeIn h-64 overflow-auto rounded overflow-x-hidden"
           style={{
             position: "absolute",
             top: "100%",