diff --git a/cypress/e2e/users_spec/user_crud.cy.ts b/cypress/e2e/users_spec/user_crud.cy.ts
index e950e98e1c8..dd6860f743f 100644
--- a/cypress/e2e/users_spec/user_crud.cy.ts
+++ b/cypress/e2e/users_spec/user_crud.cy.ts
@@ -108,7 +108,7 @@ describe("User management", () => {
       .wait("@getFacilities");
     cy.get("li[role='option']").contains("cypress facility").click();
     cy.intercept(/\/api\/v1\/users\/\w+\/add_facility\//).as("addFacility");
-    cy.get("button > span").contains("Add").click();
+    cy.get("button[id='link-facility']").click();
     cy.wait("@addFacility")
       // .its("response.statusCode")
       // .should("eq", 201)
diff --git a/src/Components/Users/ManageUsers.tsx b/src/Components/Users/ManageUsers.tsx
index a8648425a51..b6237a3b0c9 100644
--- a/src/Components/Users/ManageUsers.tsx
+++ b/src/Components/Users/ManageUsers.tsx
@@ -1,6 +1,4 @@
 import * as Notification from "../../Utils/Notifications.js";
-
-import { Button, CircularProgress } from "@material-ui/core";
 import {
   addUserFacility,
   clearHomeFacility,
@@ -37,9 +35,10 @@ import moment from "moment";
 import { navigate } from "raviger";
 import useFilters from "../../Common/hooks/useFilters";
 import useWindowDimensions from "../../Common/hooks/useWindowDimensions";
+import CircularProgress from "../Common/components/CircularProgress.js";
+import Page from "../Common/components/Page.js";
 
 const Loading = loadable(() => import("../Common/Loading"));
-const PageTitle = loadable(() => import("../Common/PageTitle"));
 
 export default function ManageUsers() {
   const { width } = useWindowDimensions();
@@ -422,7 +421,12 @@ export default function ManageUsers() {
   }
 
   return (
-    <div>
+    <Page
+      title="User Management"
+      hideBack={true}
+      className="mx-5 px-2"
+      breadcrumbs={false}
+    >
       {expandSkillList && (
         <SkillsSlideOver
           show={expandSkillList}
@@ -430,12 +434,6 @@ export default function ManageUsers() {
           username={selectedUser}
         />
       )}
-      <PageTitle
-        title="User Management"
-        hideBack={true}
-        className="mx-5 px-2"
-        breadcrumbs={false}
-      />
       <SlideOverCustom
         open={expandFacilityList}
         setOpen={setExpandFacilityList}
@@ -500,7 +498,7 @@ export default function ManageUsers() {
           handleOk={handleSubmit}
         />
       )}
-    </div>
+    </Page>
   );
 }
 
@@ -644,19 +642,18 @@ function UserFacilities(props: { user: any }) {
           errors=""
           className="z-40"
         />
-        <Button
-          color="primary"
+        <ButtonV2
+          id="link-facility"
           disabled={!facility}
           className="mt-1"
           onClick={() => addFacility(username, facility)}
-          autoFocus
         >
           Add
-        </Button>
+        </ButtonV2>
       </div>
       {isLoading ? (
         <div className="flex justify-center items-center">
-          <CircularProgress className="text-primary-500" />
+          <CircularProgress />
         </div>
       ) : (
         <div className="flex flex-col">