diff --git a/src/App.tsx b/src/App.tsx
index 8dc4f06..67855de 100644
--- a/src/App.tsx
+++ b/src/App.tsx
@@ -1,9 +1,7 @@
-import React, { useState } from "react";
-import Navbar from "./components/Navbar/Navbar";
-import LoginPopup from "./components/LoginPopup/LoginPopup";
-import SignupPopup from "./components/SignupPopup/SignupPopup";
-import LandingPage from "./components/LandingPage/LandingPage";
-import "./App.css";
+import type React from 'react';
+import { useState } from 'react';
+import { Navbar, LoginPopup, SignupPopup, LandingPage } from '@components';
+import './App.css';
 
 const App: React.FC = () => {
   const [showLogin, setShowLogin] = useState(false);
@@ -11,10 +9,7 @@ const App: React.FC = () => {
 
   return (
     <div className="app">
-      <Navbar
-        onLoginClick={() => setShowLogin(true)}
-        onSignupClick={() => setShowSignup(true)}
-      />
+      <Navbar onLoginClick={() => setShowLogin(true)} onSignupClick={() => setShowSignup(true)} />
       <LandingPage />
       {showLogin && <LoginPopup onClose={() => setShowLogin(false)} />}
       {showSignup && <SignupPopup onClose={() => setShowSignup(false)} />}
diff --git a/src/assets/index.ts b/src/assets/index.ts
index cb0ff5c..984da7a 100644
--- a/src/assets/index.ts
+++ b/src/assets/index.ts
@@ -1 +1 @@
-export {};
+export { default as ThScribesLogo } from './TH-Scribes-Logo.png';
diff --git a/src/components/LandingPage/LandingPage.tsx b/src/components/LandingPage/LandingPage.tsx
index b4f37d6..eedae23 100644
--- a/src/components/LandingPage/LandingPage.tsx
+++ b/src/components/LandingPage/LandingPage.tsx
@@ -1,6 +1,6 @@
-import React from "react";
-import "./LandingPage.css";
-import THLogo from "../../assets/TH-Scribes-Logo.png"; // Import the logo
+import type React from 'react';
+import './LandingPage.css';
+import THLogo from '../../assets/TH-Scribes-Logo.png'; // Import the logo
 
 const LandingPage: React.FC = () => {
   return (
@@ -8,10 +8,11 @@ const LandingPage: React.FC = () => {
       <img src={THLogo} alt="Landing Logo" className="landing-image" />
       <h2>Welcome to Tactical Hacker Scribes</h2>
       <p>
-      Empowering writers and creators with seamless onboarding, secure digital contracts, and a streamlined collaboration experience — all in one place.
+        Empowering writers and creators with seamless onboarding, secure digital contracts, and a streamlined
+        collaboration experience — all in one place.
       </p>
     </div>
   );
 };
 
-export default LandingPage;
\ No newline at end of file
+export default LandingPage;
diff --git a/src/components/LoginPopup/LoginPopup.tsx b/src/components/LoginPopup/LoginPopup.tsx
index 33fedbf..1841b49 100644
--- a/src/components/LoginPopup/LoginPopup.tsx
+++ b/src/components/LoginPopup/LoginPopup.tsx
@@ -1,6 +1,6 @@
-import React from "react";
-import "./LoginPopup.css";
-import THLogo from "../../assets/TH-Scribes-Logo.png"; // Import the logo
+import type React from 'react';
+import './LoginPopup.css';
+import { ThScribesLogo } from '@assets/index.js'; // Import the logo
 
 interface LoginPopupProps {
   onClose: () => void;
@@ -10,13 +10,15 @@ const LoginPopup: React.FC<LoginPopupProps> = ({ onClose }) => {
   return (
     <div className="popup-overlay">
       <div className="popup">
-        <img src={THLogo} alt="Logo" className="popup-logo" />
+        <img src={ThScribesLogo} alt="Logo" className="popup-logo" />
         <h2>Login</h2>
         <input type="email" placeholder="Email" className="popup-input" />
         <input type="password" placeholder="Password" className="popup-input" />
         <div className="popup-buttons">
-          <button className="popup-button">Login</button>
-          <button className="popup-close" onClick={onClose}>
+          <button className="popup-button" type="button">
+            Login
+          </button>
+          <button className="popup-close" type="button" onClick={onClose}>
             Cancel
           </button>
         </div>
@@ -25,4 +27,4 @@ const LoginPopup: React.FC<LoginPopupProps> = ({ onClose }) => {
   );
 };
 
-export default LoginPopup;
\ No newline at end of file
+export default LoginPopup;
diff --git a/src/components/Navbar/Navbar.tsx b/src/components/Navbar/Navbar.tsx
index de789ea..1ba62df 100644
--- a/src/components/Navbar/Navbar.tsx
+++ b/src/components/Navbar/Navbar.tsx
@@ -1,4 +1,4 @@
-import React from "react";
+import type React from "react";
 import "./Navbar.css";
 import THLogo from "../../assets/TH-Scribes-Logo.png"; // Import the logo
 
@@ -16,10 +16,10 @@ const Navbar: React.FC<NavbarProps> = ({ onLoginClick, onSignupClick }) => {
           <h1 className="navbar-title">Tactical Hacker Scribes</h1>
         </div>
         <div className="navbar-links">
-          <button onClick={onLoginClick} className="navbar-button">
+          <button type="button" onClick={onLoginClick} className="navbar-button">
             Login
           </button>
-          <button onClick={onSignupClick} className="navbar-button">
+          <button type="button" onClick={onSignupClick} className="navbar-button">
             Signup
           </button>
         </div>
diff --git a/src/components/SignupPopup/SignupPopup.tsx b/src/components/SignupPopup/SignupPopup.tsx
index 8b89b75..54909ba 100644
--- a/src/components/SignupPopup/SignupPopup.tsx
+++ b/src/components/SignupPopup/SignupPopup.tsx
@@ -1,6 +1,6 @@
-import React from "react";
-import "./SignupPopup.css";
-import THLogo from "../../assets/TH-Scribes-Logo.png"; // Import the logo
+import type React from 'react';
+import './SignupPopup.css';
+import THLogo from '../../assets/TH-Scribes-Logo.png'; // Import the logo
 
 interface SignupPopupProps {
   onClose: () => void;
@@ -17,8 +17,10 @@ const SignupPopup: React.FC<SignupPopupProps> = ({ onClose }) => {
         <input type="password" placeholder="Create Password" className="popup-input" />
         <input type="number" placeholder="Year of Birth" className="popup-input" />
         <div className="popup-buttons">
-          <button className="popup-button">Signup</button>
-          <button className="popup-close" onClick={onClose}>
+          <button className="popup-button" type="button">
+            Signup
+          </button>
+          <button className="popup-close" type="button" onClick={onClose}>
             Cancel
           </button>
         </div>
@@ -27,4 +29,4 @@ const SignupPopup: React.FC<SignupPopupProps> = ({ onClose }) => {
   );
 };
 
-export default SignupPopup;
\ No newline at end of file
+export default SignupPopup;
diff --git a/src/components/index.ts b/src/components/index.ts
new file mode 100644
index 0000000..90fb683
--- /dev/null
+++ b/src/components/index.ts
@@ -0,0 +1,4 @@
+export { default as LandingPage } from './LandingPage/LandingPage';
+export { default as LoginPopup } from './LoginPopup/LoginPopup';
+export { default as Navbar } from './Navbar/Navbar';
+export { default as SignupPopup } from './SignupPopup/SignupPopup';