diff --git a/.eslintrc.json b/.eslintrc.json
index 2328b5c..310c8fb 100644
--- a/.eslintrc.json
+++ b/.eslintrc.json
@@ -1,5 +1,10 @@
 {
-  "extends": ["eslint:recommended", "prettier", "prettier/react"],
+  "extends": [
+    "eslint:recommended",
+    "prettier",
+    "plugin:react/recommended",
+    "plugin:react/jsx-runtime"
+  ],
   "plugins": [],
   "parserOptions": {
     "ecmaVersion": 2018,
@@ -13,5 +18,8 @@
     "es6": true,
     "browser": true,
     "node": true
+  },
+  "rules": {
+    "react/prop-types": "off"
   }
-}
\ No newline at end of file
+}
diff --git a/package-lock.json b/package-lock.json
index 1cc7855..246f3a9 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -23,6 +23,7 @@
         "eslint": "^8.56.0",
         "eslint-config-next": "14.0.3",
         "eslint-config-prettier": "^9.1.0",
+        "eslint-plugin-react": "^7.33.2",
         "typescript": "^5.3.3"
       }
     },
diff --git a/package.json b/package.json
index 2601e21..774127f 100644
--- a/package.json
+++ b/package.json
@@ -25,6 +25,7 @@
     "eslint": "^8.56.0",
     "eslint-config-next": "14.0.3",
     "eslint-config-prettier": "^9.1.0",
+    "eslint-plugin-react": "^7.33.2",
     "typescript": "^5.3.3"
   }
 }
diff --git a/src/app/chapters/page.tsx b/src/app/chapters/page.tsx
index 4f7b961..9b1a759 100644
--- a/src/app/chapters/page.tsx
+++ b/src/app/chapters/page.tsx
@@ -1,5 +1,4 @@
 "use client";
-import React from "react";
 
 export default function ChaptersPage() {
   return <div>{/* add components here! */}</div>;
diff --git a/src/app/forstudents/page.tsx b/src/app/forstudents/page.tsx
index a4ff862..5086759 100644
--- a/src/app/forstudents/page.tsx
+++ b/src/app/forstudents/page.tsx
@@ -1,5 +1,4 @@
 "use client";
-import React from "react";
 
 export default function ForStudentsPage() {
   return <div>{/* add components here! */}</div>;
diff --git a/src/app/layout.js b/src/app/layout.tsx
similarity index 97%
rename from src/app/layout.js
rename to src/app/layout.tsx
index 7b021cc..4130642 100644
--- a/src/app/layout.js
+++ b/src/app/layout.tsx
@@ -1,5 +1,4 @@
 "use client";
-import React from "react";
 import { Inter } from "next/font/google";
 import "@mantine/core/styles.css";
 import { MantineProvider, AppShell } from "@mantine/core";
diff --git a/src/app/page.tsx b/src/app/page.tsx
index 7bdd024..1ffd464 100644
--- a/src/app/page.tsx
+++ b/src/app/page.tsx
@@ -1,6 +1,4 @@
 "use client";
-import React from "react";
-import _ from "@/config/firebase";
 import { ChaptersCard } from "@/chapters-card/ChaptersCard";
 
 export default function Home() {
diff --git a/src/app/projects/page.tsx b/src/app/projects/page.tsx
index 10da8f5..1325ef7 100644
--- a/src/app/projects/page.tsx
+++ b/src/app/projects/page.tsx
@@ -1,5 +1,4 @@
 "use client";
-import React from "react";
 
 export default function ProjectsPage() {
   return <div>{/* add components here! */}</div>;
diff --git a/src/app/team/page.tsx b/src/app/team/page.tsx
index 34b8885..fcaead9 100644
--- a/src/app/team/page.tsx
+++ b/src/app/team/page.tsx
@@ -1,5 +1,4 @@
 "use client";
-import React from "react";
 
 export default function TeamPage() {
   return <div>{/* add components here! */}</div>;
diff --git a/src/chapters-card/ChaptersCard.tsx b/src/chapters-card/ChaptersCard.tsx
index 722f139..4c3b95f 100644
--- a/src/chapters-card/ChaptersCard.tsx
+++ b/src/chapters-card/ChaptersCard.tsx
@@ -1,4 +1,3 @@
-import React from "react";
 import { Card, Anchor } from "@mantine/core";
 import "../chapters-card/ChaptersCard.css";
 
diff --git a/src/components/Navbar/Navbar.tsx b/src/components/Navbar/Navbar.tsx
index 991ba80..bc1e915 100644
--- a/src/components/Navbar/Navbar.tsx
+++ b/src/components/Navbar/Navbar.tsx
@@ -1,4 +1,3 @@
-import React from "react";
 import Image from "next/image";
 import { Button } from "@mantine/core";
 import "@/components/Navbar/Navbar.css";
@@ -15,6 +14,7 @@ const items = links.map((link) => (
     variant="transparent"
     component="a"
     href={link.link}
+    key={link.link}
     color="white"
     classNames={{ label: "nav-link" }}
   >