diff --git a/src/Components/DashboardPage/TechnicianButtons.tsx b/src/Components/DashboardPage/TechnicianButtons.tsx
index c388b58..793c782 100644
--- a/src/Components/DashboardPage/TechnicianButtons.tsx
+++ b/src/Components/DashboardPage/TechnicianButtons.tsx
@@ -10,13 +10,13 @@ import NoteIcon from "@mui/icons-material/Note";
 import { colors } from "../../styles";
 import ScienceIcon from "@mui/icons-material/Science";
 import ColorizeIcon from "@mui/icons-material/Colorize";
-import { Dispatch, SetStateAction } from "react";
-
-type props = {
-  SetAddSKUModalOpen: Dispatch<SetStateAction<boolean>>;
-  SetAddItemModalOpen: Dispatch<SetStateAction<boolean>>;
-};
-export default function TechnicianButtons(props: props) {
+import Popup from "reactjs-popup";
+import AddItemModal from "../AddItemModal/AddItemModal";
+import AddSKUModal from "../AddSKUModal/AddSKUModal";
+import { useState } from "react";
+export default function TechnicianButtons() {
+  const [addSKUmodalOpen, SetAddSKUModalOpen] = useState(false);
+  const [additemmodalOpen, SetAddItemModalOpen] = useState(false);
   const navigate = useNavigate();
   const queries = useQueries({
     queries: [
@@ -99,7 +99,7 @@ export default function TechnicianButtons(props: props) {
             },
           }}
           onClick={() => {
-            props.SetAddItemModalOpen(true);
+            SetAddItemModalOpen(true);
           }}
         >
           <AddToQueueIcon
@@ -130,7 +130,7 @@ export default function TechnicianButtons(props: props) {
             },
           }}
           onClick={() => {
-            props.SetAddSKUModalOpen(true);
+            SetAddSKUModalOpen(true);
           }}
         >
           <NoteAddIcon
@@ -256,6 +256,44 @@ export default function TechnicianButtons(props: props) {
           </p>
         </Button>
       </div>
+      <Popup
+        open={addSKUmodalOpen}
+        onClose={() => SetAddSKUModalOpen(false)}
+        modal
+        position={"top center"}
+        contentStyle={{
+          width: "32rem",
+          borderRadius: 16,
+          borderColor: "grey",
+          borderStyle: "solid",
+          borderWidth: 1,
+          padding: 16,
+          alignContent: "center",
+          justifyContent: "center",
+          textAlign: "center",
+        }}
+      >
+        <AddSKUModal />
+      </Popup>
+      <Popup
+        open={additemmodalOpen}
+        onClose={() => SetAddItemModalOpen(false)}
+        modal
+        position={"top center"}
+        contentStyle={{
+          width: "32rem",
+          borderRadius: 16,
+          borderColor: "grey",
+          borderStyle: "solid",
+          borderWidth: 1,
+          padding: 16,
+          alignContent: "center",
+          justifyContent: "center",
+          textAlign: "center",
+        }}
+      >
+        <AddItemModal />
+      </Popup>
     </>
   );
 }
diff --git a/src/Pages/DashboardPage/DashboardPage.tsx b/src/Pages/DashboardPage/DashboardPage.tsx
index ec58fa6..f5b89fd 100644
--- a/src/Pages/DashboardPage/DashboardPage.tsx
+++ b/src/Pages/DashboardPage/DashboardPage.tsx
@@ -6,10 +6,6 @@ import {
   EquipmentInstancesAPI,
   UserAPI,
 } from "../../Components/API/API";
-import { useState } from "react";
-import AddSKUModal from "../../Components/AddSKUModal/AddSKUModal";
-import Popup from "reactjs-popup";
-import AddItemModal from "../../Components/AddItemModal/AddItemModal";
 import RestrictedComponent from "../../Components/RestrictedComponent/RestrictedComponent";
 import TechnicianWidgets from "../../Components/DashboardPage/TechnicianWidgets";
 import TechnicianButtons from "../../Components/DashboardPage/TechnicianButtons";
@@ -34,9 +30,6 @@ export default function Dashboard() {
   });
   const isLoading = queries.some((result) => result.isLoading);
 
-  const [addSKUmodalOpen, SetAddSKUModalOpen] = useState(false);
-  const [additemmodalOpen, SetAddItemModalOpen] = useState(false);
-
   if (isLoading) {
     return (
       <div style={styles.background}>
@@ -71,52 +64,11 @@ export default function Dashboard() {
         <TechnicianWidgets />
       </RestrictedComponent>
       <RestrictedComponent allow_only={"Technician"}>
-        <TechnicianButtons
-          SetAddItemModalOpen={SetAddItemModalOpen}
-          SetAddSKUModalOpen={SetAddSKUModalOpen}
-        />
+        <TechnicianButtons />
       </RestrictedComponent>
       <RestrictedComponent allow_only={"Technician"}>
         <TechnicianLogs />
       </RestrictedComponent>
-      <Popup
-        open={addSKUmodalOpen}
-        onClose={() => SetAddSKUModalOpen(false)}
-        modal
-        position={"top center"}
-        contentStyle={{
-          width: "32rem",
-          borderRadius: 16,
-          borderColor: "grey",
-          borderStyle: "solid",
-          borderWidth: 1,
-          padding: 16,
-          alignContent: "center",
-          justifyContent: "center",
-          textAlign: "center",
-        }}
-      >
-        <AddSKUModal />
-      </Popup>
-      <Popup
-        open={additemmodalOpen}
-        onClose={() => SetAddItemModalOpen(false)}
-        modal
-        position={"top center"}
-        contentStyle={{
-          width: "32rem",
-          borderRadius: 16,
-          borderColor: "grey",
-          borderStyle: "solid",
-          borderWidth: 1,
-          padding: 16,
-          alignContent: "center",
-          justifyContent: "center",
-          textAlign: "center",
-        }}
-      >
-        <AddItemModal />
-      </Popup>
     </div>
   );
 }