diff --git a/front/app/_orgs/[orgslug]/settings/account/passwords/page.tsx b/front/app/_orgs/[orgslug]/settings/account/passwords/page.tsx
index 9fc62bfe..4bca9638 100644
--- a/front/app/_orgs/[orgslug]/settings/account/passwords/page.tsx
+++ b/front/app/_orgs/[orgslug]/settings/account/passwords/page.tsx
@@ -21,7 +21,7 @@ function SettingsProfilePasswordsPage() {
 
             {auth.isAuthenticated && (
                 <div>
-                    <h1>Account Password</h1>
+                    <h1 className='text-3xl font-bold'>Account Password</h1>
                     <br /><br />
 
                     <Formik
@@ -35,13 +35,34 @@ function SettingsProfilePasswordsPage() {
                         }}
                     >
                         {({ isSubmitting }) => (
-                            <Form>
-                                Old Password  <Field type="password" name="old_password" /><br />
-                                New password  <Field type="password" name="new_password" /><br />
-                                <button type="submit" disabled={isSubmitting}>
-                                    Submit
-                                </button>
-                            </Form>
+                            <Form className="max-w-md">
+                            <label className="block mb-2 font-bold" htmlFor="old_password">
+                              Old Password
+                            </label>
+                            <Field
+                              className="w-full px-4 py-2 mb-4 border rounded-lg focus:outline-none focus:ring-2 focus:ring-blue-500"
+                              type="password"
+                              name="old_password"
+                            />
+                          
+                            <label className="block mb-2 font-bold" htmlFor="new_password">
+                              New Password
+                            </label>
+                            <Field
+                              className="w-full px-4 py-2 mb-4 border rounded-lg focus:outline-none focus:ring-2 focus:ring-blue-500"
+                              type="password"
+                              name="new_password"
+                            />
+                          
+                            <button
+                              type="submit"
+                              disabled={isSubmitting}
+                              className="px-6 py-3 text-white bg-black rounded-lg shadow-md hover:bg-black focus:outline-none focus:ring-2 focus:ring-blue-500"
+                            >
+                              Submit
+                            </button>
+                          </Form>
+                          
                         )}
                     </Formik>
                 </div>
diff --git a/front/app/_orgs/[orgslug]/settings/account/profile/page.tsx b/front/app/_orgs/[orgslug]/settings/account/profile/page.tsx
index 40c11323..ea0e297b 100644
--- a/front/app/_orgs/[orgslug]/settings/account/profile/page.tsx
+++ b/front/app/_orgs/[orgslug]/settings/account/profile/page.tsx
@@ -12,7 +12,7 @@ function SettingsProfilePage() {
 
             {auth.isAuthenticated && (
                 <div>
-                    <h1>Profile Settings</h1>
+                    <h1 className='text-3xl font-bold'>Profile Settings</h1>
                     <br /><br />
 
                     <Formik
@@ -27,14 +27,44 @@ function SettingsProfilePage() {
                         }}
                     >
                         {({ isSubmitting }) => (
-                            <Form>
-                                Full name  <Field type="textarea" name="full_name" /><br />
-                                Email  <Field type="email" name="email" /><br />
-                                Bio  <Field as="textarea" type="textarea" name="bio" /><br />
-                                <button type="submit" disabled={isSubmitting}>
+                            <Form className="max-w-md">
+                                <label className="block mb-2 font-bold" htmlFor="full_name">
+                                    Full Name
+                                </label>
+                                <Field
+                                    className="w-full px-4 py-2 mb-4 border rounded-lg focus:outline-none focus:ring-2 focus:ring-blue-500"
+                                    type="textarea"
+                                    name="full_name"
+                                />
+
+                                <label className="block mb-2 font-bold" htmlFor="email">
+                                    Email
+                                </label>
+                                <Field
+                                    className="w-full px-4 py-2 mb-4 border rounded-lg focus:outline-none focus:ring-2 focus:ring-blue-500"
+                                    type="email"
+                                    name="email"
+                                />
+
+                                <label className="block mb-2 font-bold" htmlFor="bio">
+                                    Bio
+                                </label>
+                                <Field
+                                    as="textarea"
+                                    className="w-full px-4 py-2 mb-4 border rounded-lg focus:outline-none focus:ring-2 focus:ring-blue-500"
+                                    type="textarea"
+                                    name="bio"
+                                />
+
+                                <button
+                                    type="submit"
+                                    disabled={isSubmitting}
+                                    className="px-6 py-3 text-white bg-black rounded-lg shadow-md hover:bg-black focus:outline-none focus:ring-2 focus:ring-blue-500"
+                                >
                                     Submit
                                 </button>
                             </Form>
+
                         )}
                     </Formik>
                 </div>
diff --git a/front/app/_orgs/[orgslug]/settings/organization/general/page.tsx b/front/app/_orgs/[orgslug]/settings/organization/general/page.tsx
index 048f4fc2..63c4b227 100644
--- a/front/app/_orgs/[orgslug]/settings/organization/general/page.tsx
+++ b/front/app/_orgs/[orgslug]/settings/organization/general/page.tsx
@@ -37,7 +37,7 @@ function SettingsOrganizationGeneral(params: any) {
 
     return (
       <div>
-        <h1>Oganization Settings</h1>
+        <h1 className='text-3xl font-bold'>Oganization Settings</h1>
         <br /><br />
         {error && <p>Failed to load</p>}
         {!org ? (
@@ -55,15 +55,53 @@ function SettingsOrganizationGeneral(params: any) {
             }}
           >
             {({ isSubmitting }) => (
-              <Form>
-                Name  <Field type="text" name="name" /><br />
-                Description  <Field type="text" name="description" /><br />
-                Slug  <Field disabled type="text" name="slug" /> <br /> 
-                Email  <Field type="email" name="email" /><br />
-                <button type="submit" disabled={isSubmitting}>
-                  Submit
-                </button>
-              </Form>
+             <Form>
+             <label className="block mb-2 font-bold" htmlFor="name">
+               Name
+             </label>
+             <Field
+               className="w-full px-4 py-2 mb-4 border rounded-lg focus:outline-none focus:ring-2 focus:ring-blue-500"
+               type="text"
+               name="name"
+             />
+           
+             <label className="block mb-2 font-bold" htmlFor="description">
+               Description
+             </label>
+             <Field
+               className="w-full px-4 py-2 mb-4 border rounded-lg focus:outline-none focus:ring-2 focus:ring-blue-500"
+               type="text"
+               name="description"
+             />
+           
+             <label className="block mb-2 font-bold" htmlFor="slug">
+               Slug
+             </label>
+             <Field
+               className="w-full px-4 py-2 mb-4 border rounded-lg bg-gray-200 cursor-not-allowed"
+               disabled
+               type="text"
+               name="slug"
+             />
+           
+             <label className="block mb-2 font-bold" htmlFor="email">
+               Email
+             </label>
+             <Field
+               className="w-full px-4 py-2 mb-4 border rounded-lg focus:outline-none focus:ring-2 focus:ring-blue-500"
+               type="email"
+               name="email"
+             />
+           
+             <button
+               type="submit"
+               disabled={isSubmitting}
+               className="px-6 py-3 text-white bg-black rounded-lg shadow-md hover:bg-gray-800 focus:outline-none focus:ring-2 focus:ring-black"
+             >
+               Submit
+             </button>
+           </Form>
+           
             )}
           </Formik>
         )}
diff --git a/front/next.config.js b/front/next.config.js
index 704aab78..0bacc25a 100644
--- a/front/next.config.js
+++ b/front/next.config.js
@@ -9,8 +9,9 @@ const nextConfig = {
   reactStrictMode: false,
   experimental: {
     appDir : true,
+    swcFileReading: false,
   },
-  swcMinify: true,
+  swcMinify: false,
   compiler: {
     styledComponents: true,
   },