diff --git a/src/Components/Facility/SetInventoryForm.tsx b/src/Components/Facility/SetInventoryForm.tsx
index 9c5e849b7a0..27288c01520 100644
--- a/src/Components/Facility/SetInventoryForm.tsx
+++ b/src/Components/Facility/SetInventoryForm.tsx
@@ -1,19 +1,18 @@
-import { Card, CardContent, InputLabel } from "@material-ui/core";
 import { useCallback, useReducer, useState, useEffect } from "react";
 import { useDispatch } from "react-redux";
 import loadable from "@loadable/component";
 import { statusType, useAbortableEffect } from "../../Common/utils";
 import { getItems, setMinQuantity, getAnyFacility } from "../../Redux/actions";
 import * as Notification from "../../Utils/Notifications.js";
-import {
-  LegacySelectField,
-  LegacyTextInputField,
-} from "../Common/HelperInputFields";
 import { InventoryItemsModel } from "./models";
 import { Cancel, Submit } from "../Common/components/ButtonV2";
 import useAppHistory from "../../Common/hooks/useAppHistory";
+import Page from "../Common/components/Page";
+import Card from "../../CAREUI/display/Card";
+import { FieldChangeEvent } from "../Form/FormFields/Utils";
+import { SelectFormField } from "../Form/FormFields/SelectFormField";
+import TextFormField from "../Form/FormFields/TextFormField";
 const Loading = loadable(() => import("../Common/Loading"));
-const PageTitle = loadable(() => import("../Common/PageTitle"));
 
 const initForm = {
   id: "",
@@ -48,7 +47,6 @@ export const SetInventoryForm = (props: any) => {
   const { facilityId } = props;
   const dispatchAction: any = useDispatch();
   const [isLoading, setIsLoading] = useState(false);
-  // const [offset, setOffset] = useState(0);
   const [data, setData] = useState<Array<InventoryItemsModel>>([]);
   const [currentUnit, setCurrentUnit] = useState<any>();
   const [facilityName, setFacilityName] = useState("");
@@ -123,10 +121,8 @@ export const SetInventoryForm = (props: any) => {
     goBack();
   };
 
-  const handleChange = (e: any) => {
-    const form = { ...state.form };
-    form[e.target.name] = e.target.value;
-    dispatch({ type: "set_form", form });
+  const handleChange = ({ name, value }: FieldChangeEvent<unknown>) => {
+    dispatch({ type: "set_form", form: { ...state.form, [name]: value } });
   };
 
   if (isLoading) {
@@ -134,78 +130,59 @@ export const SetInventoryForm = (props: any) => {
   }
 
   return (
-    <div className="px-2 pb-2">
-      <PageTitle
-        title="Set Minimum Quantity"
-        crumbsReplacements={{
-          [facilityId]: { name: facilityName },
-          min_quantity: {
-            name: "Min Quantity",
-            uri: `/facility/${facilityId}/inventory/min_quantity/list`,
-          },
-          set: {
-            style: "pointer-events-none",
-          },
-        }}
-        backUrl={`/facility/${facilityId}/inventory/min_quantity/list`}
-      />
-      <div className="mt-4">
-        <Card>
-          <form onSubmit={(e) => handleSubmit(e)}>
-            <CardContent>
-              <div className="mt-2 grid gap-4 grid-cols-1 md:grid-cols-2">
-                <div>
-                  <InputLabel id="inventory_name_label">
-                    Inventory Name
-                  </InputLabel>
-                  <LegacySelectField
-                    name="id"
-                    variant="outlined"
-                    margin="dense"
-                    value={state.form.id}
-                    options={data.map((e) => {
-                      return { id: e.id, name: e.name };
-                    })}
-                    onChange={handleChange}
-                    optionKey="id"
-                    optionValue="name"
-                  />
-                </div>
-
-                <div>
-                  <InputLabel id="inventory_name_label">Unit</InputLabel>
-                  <LegacyTextInputField
-                    name="id"
-                    variant="outlined"
-                    margin="dense"
-                    type="string"
-                    value={currentUnit}
-                    errors=""
-                  />
-                </div>
-
-                <div className="md:col-span-2">
-                  <InputLabel id="quantity">Item Min Quantity</InputLabel>
-                  <LegacyTextInputField
-                    fullWidth
-                    name="quantity"
-                    variant="outlined"
-                    margin="dense"
-                    type="number"
-                    value={state.form.quantity}
-                    onChange={handleChange}
-                    errors=""
-                  />
-                </div>
-              </div>
-              <div className="sm:flex sm:justify-between mt-4">
-                <Cancel onClick={() => goBack()} />
-                <Submit onClick={handleSubmit} label="Set" />
-              </div>
-            </CardContent>
-          </form>
-        </Card>
-      </div>
-    </div>
+    <Page
+      title="Set Minimum Quantity"
+      crumbsReplacements={{
+        [facilityId]: { name: facilityName },
+        min_quantity: {
+          name: "Min Quantity",
+          uri: `/facility/${facilityId}/inventory/min_quantity/list`,
+        },
+        set: {
+          style: "pointer-events-none",
+        },
+      }}
+      backUrl={`/facility/${facilityId}/inventory/min_quantity/list`}
+    >
+      <Card className="mt-10 max-w-3xl mx-auto">
+        <form onSubmit={(e) => handleSubmit(e)} className="mt-6 flex flex-col">
+          <SelectFormField
+            name="id"
+            required
+            label="Inventory Name"
+            value={state.form.id}
+            options={data}
+            onChange={handleChange}
+            optionValue={(item) => item.id}
+            optionLabel={(item) => item.name}
+          />
+
+          <div className="flex gap-2">
+            <TextFormField
+              className="w-full"
+              label="Minimum Quantity"
+              required
+              name="quantity"
+              type="number"
+              value={state.form.quantity}
+              onChange={handleChange}
+            />
+
+            <TextFormField
+              name="unit"
+              label="Unit"
+              value={currentUnit}
+              onChange={handleChange}
+              disabled
+            />
+          </div>
+
+          <div className="flex flex-col sm:flex-row justify-end mt-4 gap-2">
+            <Cancel onClick={() => goBack()} />
+            <Submit label="Set" />
+          </div>
+        </form>
+      </Card>
+    </Page>
   );
 };