diff --git a/frontend/src/app/(routes)/groups/page.tsx b/frontend/src/app/(routes)/groups/page.tsx
index 560bfd85d..dcb2afd6a 100644
--- a/frontend/src/app/(routes)/groups/page.tsx
+++ b/frontend/src/app/(routes)/groups/page.tsx
@@ -6,7 +6,6 @@ const page = () => {
   return (
     <div className="page space-y-10">
       <Groups />
-      <GroupsCards />
       
     </div>
   );
diff --git a/frontend/src/components/tabs/Groups.tsx b/frontend/src/components/tabs/Groups.tsx
index 10c6f7ef4..d35e0e97e 100644
--- a/frontend/src/components/tabs/Groups.tsx
+++ b/frontend/src/components/tabs/Groups.tsx
@@ -2,49 +2,37 @@
 import * as React from "react";
 import Tabs from "@mui/material/Tabs";
 import Tab from "@mui/material/Tab";
-
-
+import CustomTabsGroup, { TabPanel } from "../CustomTabsGroup";
+import GroupsCards from "../GroupsCards";
 
 export default function Groups() {
-  const [value, setValue] = React.useState("created-by-me");
-
-  const handleChange = (event: React.SyntheticEvent, newValue: string) => {
-    console.log(newValue);
-    setValue(newValue);
-  };
-
-  const tabStyle = {
-    textTransform: "none",
-    color: "rgba(176, 176, 176, 0.50)", // Change the text color to black when selected
-    fontFamily: "inter",
-    paddingX: "40px",
-    marginX: "20px",
-
-    paddingY: "0px",
-    fontSize: "16px",
-    fontWeight: 400,
-    lineHeight: "12px",
-    "&.Mui-selected": {
-      color: "white",
-      fontWeight: 700,
-    },
+  const [tab, setTab] = React.useState(0);
+  const handleTabChange = (value: number) => {
+    setTab(value);
   };
   return (
     <>
       <div className="w-full flex justify-center">
-        <Tabs
-          value={value}
-          onChange={handleChange}
-          indicatorColor="primary"
-          textColor="primary"
-          aria-label="groups tabs"
-        >
-          <Tab sx={tabStyle} value={"created-by-me"} label="Created by me" />
-          <Tab sx={tabStyle} value={"create"} label="Create new group" />
-          <Tab sx={tabStyle} value={"other-groups"} label="Other Groups" />
-        </Tabs>
+        <CustomTabsGroup
+          handleTabChange={handleTabChange}
+          tabs={[
+            { title: "Created By Me", disabled: false },
+            { title: "Create new group", disabled: false },
+            { title: "Other Groups", disabled: false },
+          ]}
+        />
+      </div>
+      <div className="mt-10">
+        <TabPanel value={tab} index={0}>
+          <GroupsCards />
+        </TabPanel>
+        <TabPanel value={tab} index={1}>
+          Create new group
+        </TabPanel>
+        <TabPanel value={tab} index={2}>
+          Other groups
+        </TabPanel>
       </div>
-      
     </>
   );
 }