diff --git a/frontend/src/components/Auth/AuthModal.tsx b/frontend/src/components/Auth/AuthModal.tsx
index 7613322..91eeb90 100644
--- a/frontend/src/components/Auth/AuthModal.tsx
+++ b/frontend/src/components/Auth/AuthModal.tsx
@@ -48,9 +48,9 @@ const AuthModal: React.FC<AuthModalProps> = ({ onClose }) => {
         id="auth-modal"
         className="fixed inset-0 flex items-start justify-center z-[9000] h-[95vh] m-auto pt-[15vh] rounded-[5rem] transition-all animate-floating"
       >
-        <div className="relative w-[35vw] min-w-[300px]">
+        <div className="relative min-w-[30em]">
           {/* Login/Register Buttons Container */}
-          <div className="absolute top-0 left-1/2 -translate-x-1/2 -translate-y-20 w-[250px] flex justify-center gap-8 transition-transform overflow-visible">
+          <div className="absolute top-0 left-1/2 -translate-x-1/2 -translate-y-20 flex justify-center gap-8 transition-transform overflow-visible">
             {/* Login Toggle */}
             <ToggleButton
               toggled={selectedTab === "Login"}
@@ -75,13 +75,13 @@ const AuthModal: React.FC<AuthModalProps> = ({ onClose }) => {
           {/* Form Container */}
           <div
             className="container flex flex-col items-center justify-around z-[9999] 
-            h-[70vh] m-auto rounded-[5rem] transition-all"
+            h-[70vh] m-auto w-full rounded-[5rem] transition-all"
             style={{ "--spin-duration": spinDuration } as React.CSSProperties}
           >
             {/*Border Container*/}
             <div
               id="border-container"
-              className="front-content bg-authForm flex flex-col justify-center
+              className="front-content bg-authForm flex flex-col justify-center items-center
                 z-50 rounded-[5rem] transition-all"
             >
               <button
@@ -92,7 +92,7 @@ const AuthModal: React.FC<AuthModalProps> = ({ onClose }) => {
               </button>
               <div
                 id="login-methods"
-                className="flex flex-row items-center justify-evenly h-full py-[10%]"
+                className="flex flex-row items-center w-[20em] justify-evenly h-full py-[10%]"
               >
                 {authSwitch()}
               </div>
diff --git a/frontend/src/components/Auth/LoginForm.tsx b/frontend/src/components/Auth/LoginForm.tsx
index 54d0ee0..cabad08 100644
--- a/frontend/src/components/Auth/LoginForm.tsx
+++ b/frontend/src/components/Auth/LoginForm.tsx
@@ -100,72 +100,69 @@ const LoginForm: React.FC<SubmitProps> = ({ onSubmit, onForgotPassword }) => {
 
   return (
     <>
-      <div className="flex flex-col items-center h-full">
+      <div className="flex flex-col items-center h-full overflow-hidden">
         <h1 className="flex flex-col text-white text-[1.5em] font-[800] md:text-[1.75em] lg:text-[2em]">
           Login
         </h1>
-        <div className="flex flex-col justify-evenly flex-grow mt-[4vh] bg-white/10 backdrop-blur-md p-6 rounded-xl shadow-lg w-full border border-white/10 sm:max-w-[16em] md:max-w-[18em] lg:max-w-[20em]">
-          <form
-            onSubmit={handleSubmit}
-            id="login-form"
-            className="flex flex-col justify-evenly flex-grow"
-          >
-            {errors.general && (
-              <p className="text-red-500 text-sm text-center text-[0.75em]">
-                {errors.general}
-              </p>
-            )}
+        <form
+          onSubmit={handleSubmit}
+          id="login-form"
+          className="flex flex-col justify-evenly flex-grow mt-[4vh] bg-white/10 backdrop-blur-md p-6 rounded-xl shadow-lg w-full border border-white/10 sm:max-w-[16em] md:max-w-[18em] lg:max-w-[20em] overflow-auto"
+        >
+          {errors.general && (
+            <p className="text-red-500 text-sm text-center text-[0.75em]">
+              {errors.general}
+            </p>
+          )}
 
-            {errors.username && (
-              <p className="text-red-500 text-center text-[0.75em]">
-                {errors.username}
-              </p>
-            )}
+          {errors.username && (
+            <p className="text-red-500 text-center text-[0.75em]">
+              {errors.username}
+            </p>
+          )}
+          <Input
+            name="username"
+            placeholder="Username"
+            value={formData.username}
+            onChange={handleInputChange}
+            extraClasses={`w-full focus:w-[120%] p-3 ${
+              errors.username ? "border-red-500" : ""
+            }`}
+          />
+
+          {errors.password && (
+            <p className="text-red-500 text-center text-[0.75em]">
+              {errors.password}
+            </p>
+          )}
+
+          <div className="pb-4">
             <Input
-              name="username"
-              placeholder="Username"
-              value={formData.username}
+              name="password"
+              type="password"
+              placeholder="Password"
+              value={formData.password}
               onChange={handleInputChange}
               extraClasses={`w-full focus:w-[120%] p-3 ${
-                errors.username ? "border-red-500" : ""
+                errors.password ? "border-red-500" : ""
               }`}
-            />
-
-            {errors.password && (
-              <p className="text-red-500 text-center text-[0.75em]">
-                {errors.password}
-              </p>
-            )}
-
-            <div className="pb-4">
-              <Input
-                name="password"
-                type="password"
-                placeholder="Password"
-                value={formData.password}
-                onChange={handleInputChange}
-                extraClasses={`w-full focus:w-[120%] p-3 ${
-                  errors.password ? "border-red-500" : ""
-                }`}
-              ></Input>
-              <div className="flex justify-end">
-                <button
-                  type="button"
-                  className="flex items-center w-fit text-white font-semibold hover:scale-105 mt-2 transition-all ease-in"
-                  onClick={onForgotPassword}
-                >
-                  <ForgotIcon size={16} className="flex flex-row mr-1" />
-                  <span className="text-[calc((1.5vw+1vh)/2)]">
-                    Forgot Password
-                  </span>
-                </button>
-              </div>
+            ></Input>
+            <div className="flex justify-end">
+              <button
+                type="button"
+                className="flex items-center w-fit text-white font-semibold hover:scale-105 mt-2 transition-all ease-in"
+                onClick={onForgotPassword}
+              >
+                <ForgotIcon size={16} className="flex flex-row mr-1" />
+                <span className="text-[calc((1.5vw+1vh)/2)]">
+                  Forgot Password
+                </span>
+              </button>
             </div>
-            <Button type="submit">Login</Button>
-          </form>
-
+          </div>
+          <Button type="submit">Login</Button>
           <GoogleLogin />
-        </div>
+        </form>
       </div>
     </>
   );
diff --git a/frontend/src/components/Auth/RegisterForm.tsx b/frontend/src/components/Auth/RegisterForm.tsx
index 9572116..43b3bef 100644
--- a/frontend/src/components/Auth/RegisterForm.tsx
+++ b/frontend/src/components/Auth/RegisterForm.tsx
@@ -108,97 +108,86 @@ const RegisterForm: React.FC<SubmitProps> = ({ onSubmit }) => {
 
   return (
     <>
-      <div className="mb-2">
-        <div className="flex flex-col items-center p-[2.5rem]">
-          <h1 className="flex flex-col text-white text-[1.5em] font-[800] md:text-[1.75em] lg:text-[2em]">
-            Register
-          </h1>
-          <div className="mt-10 bg-white/10 backdrop-blur-md p-6 rounded-xl shadow-lg w-full max-w-[10em] min-w-[14em] border border-white/10 sm:max-w-[16em] md:max-w-[18em] lg:max-w-[20em]">
-            <form
-              onSubmit={handleSubmit}
-              id="register-form"
-              className="flex flex-col"
-            >
-              <div className="relative w-full">
-                {errors.general && (
-                  <p className="absolute top-[-1.5em] text-red-500 text-sm text-center w-full">
-                    {errors.general}
-                  </p>
-                )}
-
-                {errors.username && (
-                  <p className="absolute top-[-1.5em] text-red-500 text-sm text-center w-full">
-                    {errors.username}
-                  </p>
-                )}
-                <Input
-                  name="username"
-                  placeholder="Username"
-                  value={formData.username}
-                  onChange={handleInputChange}
-                  extraClasses={`w-full focus:w-[120%] mb-[1.5em] p-[0.5rem] ${
-                    errors.username ? "border-red-500" : ""
-                  }`}
-                />
-              </div>
-
-              <div className="relative w-full">
-                {errors.email && (
-                  <p className="absolute top-[-1.5em] text-red-500 text-sm text-center w-full">
-                    {errors.email}
-                  </p>
-                )}
-                <Input
-                  name="email"
-                  type="email"
-                  placeholder="Email"
-                  value={formData.email}
-                  onChange={handleInputChange}
-                  extraClasses={`w-full focus:w-[120%] mb-[1.5em] p-[0.5rem] ${
-                    errors.email ? "border-red-500" : ""
-                  }`}
-                />
-              </div>
-
-              <div className="relative w-full">
-                {errors.password && (
-                  <p className="absolute top-[-1.5em] text-red-500 text-sm text-center w-full">
-                    {errors.password}
-                  </p>
-                )}
-                <Input
-                  name="password"
-                  type="password"
-                  placeholder="Password"
-                  value={formData.password}
-                  onChange={handleInputChange}
-                  extraClasses={`w-full focus:w-[120%] mb-[1.5em] p-[0.5rem] ${
-                    errors.password ? "border-red-500" : ""
-                  }`}
-                />
-              </div>
-              <div className="relative w-full">
-                {errors.confirmPassword && (
-                  <p className="absolute top-[-1.5em] text-red-500 text-sm text-center w-full">
-                    {errors.confirmPassword}
-                  </p>
-                )}
-                <Input
-                  name="confirmPassword"
-                  type="password"
-                  placeholder="Confirm Password"
-                  value={formData.confirmPassword}
-                  onChange={handleInputChange}
-                  extraClasses={`w-full focus:w-[120%] mb-[1.5em] p-[0.5rem] ${
-                    errors.confirmPassword ? "border-red-500" : ""
-                  }`}
-                />
-              </div>
-
-              <Button type="submit">Register</Button>
-            </form>
-          </div>
-        </div>
+      <div className="flex flex-col items-center h-full overflow-hidden">
+        <h1 className="flex flex-col text-white text-[1.5em] font-[800] md:text-[1.75em] lg:text-[2em]">
+          Register
+        </h1>
+        <form
+          onSubmit={handleSubmit}
+          id="register-form"
+          className="flex flex-col justify-evenly flex-grow mt-[4vh] bg-white/10 backdrop-blur-md p-6 rounded-xl shadow-lg w-full border border-white/10 sm:max-w-[16em] md:max-w-[18em] lg:max-w-[20em] overflow-auto"
+        >
+          {errors.general && (
+            <p className="text-red-500 text-sm text-center text-[0.75em]">
+              {errors.general}
+            </p>
+          )}
+  
+          {errors.username && (
+            <p className="text-red-500 text-center text-[0.75em]">
+              {errors.username}
+            </p>
+          )}
+          <Input
+            name="username"
+            placeholder="Username"
+            value={formData.username}
+            onChange={handleInputChange}
+            extraClasses={`w-full focus:w-[120%] p-3 ${
+              errors.username ? "border-red-500" : ""
+            }`}
+          />
+  
+          {errors.email && (
+            <p className="text-red-500 text-center text-[0.75em]">
+              {errors.email}
+            </p>
+          )}
+          <Input
+            name="email"
+            type="email"
+            placeholder="Email"
+            value={formData.email}
+            onChange={handleInputChange}
+            extraClasses={`w-full focus:w-[120%] p-3 ${
+              errors.email ? "border-red-500" : ""
+            }`}
+          />
+  
+          {errors.password && (
+            <p className="text-red-500 text-center text-[0.75em]">
+              {errors.password}
+            </p>
+          )}
+          <Input
+            name="password"
+            type="password"
+            placeholder="Password"
+            value={formData.password}
+            onChange={handleInputChange}
+            extraClasses={`w-full focus:w-[120%] p-3 ${
+              errors.password ? "border-red-500" : ""
+            }`}
+          />
+  
+          {errors.confirmPassword && (
+            <p className="text-red-500 text-center text-[0.75em]">
+              {errors.confirmPassword}
+            </p>
+          )}
+          <Input
+            name="confirmPassword"
+            type="password"
+            placeholder="Confirm Password"
+            value={formData.confirmPassword}
+            onChange={handleInputChange}
+            extraClasses={`w-full focus:w-[120%] p-3 ${
+              errors.confirmPassword ? "border-red-500" : ""
+            }`}
+          />
+  
+          <Button type="submit">Register</Button>
+        </form>
       </div>
     </>
   );