diff --git a/model/admin.js b/model/admin.js
index ddc5957..d3251e7 100644
--- a/model/admin.js
+++ b/model/admin.js
@@ -6,6 +6,8 @@ const AdminSchema = new mongoose.Schema({
    password: String,
    fullName: String,
    Mobile: Number,
+   resetTokenExpiration: Date,
+   resetToken:String
 })
 
 const Admin = mongoose.model('Admin', AdminSchema);
diff --git a/model/ngo.js b/model/ngo.js
index d39840b..401a357 100644
--- a/model/ngo.js
+++ b/model/ngo.js
@@ -7,7 +7,9 @@ const ngoRegisterSchema = new mongoose.Schema({
   Mobile: { type: String, required: true },
   NgoID: { type: String, required: true },
   NgoLocation: { type: String, required: true },
-  approved: { type: Boolean, default: false } // New field for approval status
+  approved: { type: Boolean, default: false },
+  resetTokenExpiration: Date,
+  resetToken:String // New field for approval status
 });
 
 
diff --git a/routers/NgoRoutes.js b/routers/NgoRoutes.js
index 61706c9..eff3e3d 100644
--- a/routers/NgoRoutes.js
+++ b/routers/NgoRoutes.js
@@ -8,7 +8,7 @@ const bcrypt = require("bcrypt");
 const saltRounds = 10;
 const jwt = require("jsonwebtoken");
 
-const transporter = require("../helpers/emailHelpers");
+const {transporter} = require("../helpers/emailHelpers");
 
 const User = require("../model/user");
 const Admin = require("../model/admin");
@@ -51,6 +51,7 @@ router.post("/NGO-login", async (req, res) => {
 router.post("/NGO-Registarion", async (req, res) => {
   // Check if the NGO already exists
   const existingNGO = await NGO.findOne({ username: req.body.username });
+  console.log("existed ngo",existingNGO);
   if (existingNGO) {
     return res.status(400).json({ error: "NGO already exists" });
   }
@@ -111,6 +112,8 @@ router.post("/NGO-Registarion", async (req, res) => {
     console.error("Error creating NGO:", err);
     res.status(500).json({ error: "Internal server error" });
   }
+
+
   // try {
   //     await newNGO.save();
 
@@ -187,4 +190,162 @@ router.post("/NGO-Registarion", async (req, res) => {
   // });
 });
 
+router.route("/forgot-password-ngo").get(async (req, res) => {
+  res.render("forget-password",{role:"ngo"});
+});
+
+//send Email for the reset password
+router.route("/forgot-password-ngo").post(async (req, res) => {
+  const { email } = req.body;
+  try {
+    const ngo = await NGO.findOne({ username:email });
+
+    if (!ngo) {
+      return res.send("Ngo Not Exist");
+    }
+
+    // Generate a reset token and save it to the user
+    const resetToken = jwt.sign(
+      { email: ngo.username },
+      process.env.ACCESS_TOKEN_SECRET,
+      { expiresIn: "1h" }
+    );
+
+    ngo.resetTokenExpiration = Date.now() + 300000; // 5 minutes
+    ngo.resetToken = resetToken;
+
+    console.log("ngo after setting ", ngo);
+    await ngo.save();
+
+    // Send the reset link to the user via email
+    const resetLink = `http://localhost:3000/reset-password-ngo?email=${encodeURIComponent(
+      ngo.username
+    )}&token=${encodeURIComponent(resetToken)}`; // Replace with the actual path to your logo
+    console.log(resetLink);
+    const mailOptions = {
+      to: ngo.username,
+      subject: "Password Reset",
+      template: "reset-password", // Use the Handlebars template
+      context: {
+        ngo: {
+          fname: ngo.NGOName,
+          _id: ngo._id,
+          username: ngo.NGOName,
+          email: ngo.username,
+        },
+        resetLink,
+      },
+      attachments: [
+        {
+          filename: "logo.png",
+          path: path.join("public", "img", "logo.png"),
+          cid: "logo",
+        },
+      ],
+    };
+    console.log("Ngo email:", ngo.username);
+
+    transporter.sendMail(mailOptions, (error, info) => {
+      if (error) {
+        console.error(error);
+        return res.status(500).send("Error sending reset email");
+      }
+      console.log(`Reset email sent: ${info.response}`);
+      res.send("Password reset link sent successfully");
+    });
+  } catch (error) {
+    console.error(error);
+    res.status(500).send("Internal Server Error");
+  }
+});
+
+// verify Email and render reset password page
+router.route("/reset-password-ngo").get(async (req, res) => {
+  const { email, token } = req.query;
+  try {
+    const ngo = await NGO.findOne({
+      username:email,
+      resetToken: token,
+      resetTokenExpiration: { $gt: Date.now() },
+    });
+
+    if (!ngo) {
+      return res.status(400).send("Invalid or expired reset token");
+    }
+
+    // Verify the token
+    try {
+      const decodedToken = jwt.verify(token, process.env.ACCESS_TOKEN_SECRET);
+      // Process the decoded token (e.g., extract information from it)
+      console.log(decodedToken);
+      // Continue with the reset-password logic
+      res.render("set_password", { email, token,role:"ngo" });
+    } catch (error) {
+      // Handle JWT verification errors
+      console.error("JWT verification error:", error.message);
+      // You might want to send an error response or redirect the user
+      res.status(401).send("Unauthorized");
+    }
+  } catch (error) {
+    console.error(error);
+    res.status(500).send("Internal Server Error");
+  }
+});
+
+//verify the password
+router.route("/reset-password-ngo").post(async (req, res) => {
+  const { email, token } = req.query;
+  const { newPassword } = req.body;
+  // console.log(" User Info",email,token,newPassword);
+
+  try {
+    // Verify the token again
+    const ngo = await NGO.findOne({
+      username:email,
+      resetToken: token,
+      resetTokenExpiration: { $gt: Date.now() },
+    });
+
+    if (!ngo) {
+      return res.status(400).send("Invalid or expired reset token");
+    }
+
+    try {
+      const decodedToken = jwt.verify(token, process.env.ACCESS_TOKEN_SECRET);
+      // Process the decoded token (e.g., extract information from it)
+      console.log(decodedToken);
+
+      // Update the user's password and reset the resetToken fields
+      const hash = await bcrypt.hash(newPassword, saltRounds);
+      ngo.password = hash;
+      ngo.resetToken = null;
+      ngo.resetTokenExpiration = null;
+      await ngo.save();
+
+      const dooner = await User.find(); 
+      
+      return res.render("NGO-DashBoard", {
+        fullName: ngo.NGOName,
+        email: ngo.username,
+        id: ngo.NGOID,
+        phoneNo: ngo.Mobile,
+        address: ngo.NGOLocation,
+        Donation: dooner,
+        Pickup: dooner,
+        complain: "",
+      });
+
+      // Redirect to login page or any other desired page
+    } catch (error) {
+      // Handle JWT verification errors
+      console.error("JWT verification error:", error.message);
+      // You might want to send an error response or redirect the user
+      res.status(401).send("Unauthorized");
+    }
+  } catch (error) {
+    console.error(error);
+    res.status(500).send("Internal Server Error");
+  }
+});
+
 module.exports = router;
diff --git a/routers/adminRoutes.js b/routers/adminRoutes.js
index 4099282..42c175c 100644
--- a/routers/adminRoutes.js
+++ b/routers/adminRoutes.js
@@ -417,4 +417,165 @@ router.post("/complains-response/:email/:userId/:id", async (req, res) => {
   }
 });
 
+router.route("/forgot-password-admin").get(async (req, res) => {
+  res.render("forget-password",{role:"admin"});
+});
+
+//send Email for the reset password
+router.route("/forgot-password-admin").post(async (req, res) => {
+  const { email } = req.body;
+  try {
+    const admin = await Admin.findOne({ email });
+    if (!admin) {
+      return res.send("Admin Not Exist");
+    }
+
+    // Generate a reset token and save it to the user
+    const resetToken = jwt.sign(
+      { email: admin.email },
+      process.env.ACCESS_TOKEN_SECRET,
+      { expiresIn: "1h" }
+    );
+
+    admin.resetTokenExpiration = Date.now() + 300000; // 5 minutes
+    admin.resetToken = resetToken;
+
+    console.log("use after setting ", admin);
+    await admin.save();
+
+    // Send the reset link to the user via email
+    const resetLink = `http://localhost:3000/reset-password-admin?email=${encodeURIComponent(
+      admin.email
+    )}&token=${encodeURIComponent(resetToken)}`; // Replace with the actual path to your logo
+    console.log(resetLink);
+    const mailOptions = {
+      to: admin.email,
+      subject: "Password Reset",
+      template: "reset-password", // Use the Handlebars template
+      context: {
+        admin: {
+          fname: admin.fullName,
+          _id: admin._id,
+          username: admin.username,
+          email: admin.email,
+        },
+        resetLink,
+      },
+      attachments: [
+        {
+          filename: "logo.png",
+          path: path.join("public", "img", "logo.png"),
+          cid: "logo",
+        },
+      ],
+    };
+    console.log("Admin email:", admin.email);
+
+    transporter.sendMail(mailOptions, (error, info) => {
+      if (error) {
+        console.error(error);
+        return res.status(500).send("Error sending reset email");
+      }
+      console.log(`Reset email sent: ${info.response}`);
+      res.send("Password reset link sent successfully");
+    });
+  } catch (error) {
+    console.error(error);
+    res.status(500).send("Internal Server Error");
+  }
+});
+
+// verify Email and render reset password page
+router.route("/reset-password-admin").get(async (req, res) => {
+  const { email, token } = req.query;
+  try {
+    const admin = await Admin.findOne({
+      email,
+      resetToken: token,
+      resetTokenExpiration: { $gt: Date.now() },
+    });
+
+    if (!admin) {
+      return res.status(400).send("Invalid or expired reset token");
+    }
+
+    // Verify the token
+    try {
+      const decodedToken = jwt.verify(token, process.env.ACCESS_TOKEN_SECRET);
+      // Process the decoded token (e.g., extract information from it)
+      console.log(decodedToken);
+      // Continue with the reset-password logic
+      res.render("set_password", { email, token,role:"admin"});
+    } catch (error) {
+      // Handle JWT verification errors
+      console.error("JWT verification error:", error.message);
+      // You might want to send an error response or redirect the user
+      res.status(401).send("Unauthorized");
+    }
+  } catch (error) {
+    console.error(error);
+    res.status(500).send("Internal Server Error");
+  }
+});
+
+//verify the password
+router.route("/reset-password-admin").post(async (req, res) => {
+  const { email, token } = req.query;
+  const { newPassword } = req.body;
+  // console.log(" User Info",email,token,newPassword);
+
+  try {
+    // Verify the token again
+    const admin = await Admin.findOne({
+      email,
+      resetToken: token,
+      resetTokenExpiration: { $gt: Date.now() },
+    });
+
+    if (!admin) {
+      return res.status(400).send("Invalid or expired reset token");
+    }
+
+    try {
+      const decodedToken = jwt.verify(token, process.env.ACCESS_TOKEN_SECRET);
+      // Process the decoded token (e.g., extract information from it)
+      console.log(decodedToken);
+
+      // Update the user's password and reset the resetToken fields
+      const hash = await bcrypt.hash(newPassword, saltRounds);
+      admin.password = hash;
+      admin.resetToken = null;
+      admin.resetTokenExpiration = null;
+      await admin.save();
+
+      const dooner = await User.find(); // Assuming User is your Mongoose model for users
+      const ngo = await NGO.find();
+
+      //return UNRESOLVED query
+       const query1 = await problem.find({ answere: { $exists: false } });
+
+      return res.render("Admin_DashBoard", {
+        fullName: admin.fullName,
+        email: admin.email,
+        phoneNo: admin.Mobile,
+        address: admin.address,
+        NGOname: ngo,
+        Donername: dooner,
+        UserName: "sahil114",
+        complain: query1,
+      });
+
+      // Redirect to login page or any other desired page
+    } catch (error) {
+      // Handle JWT verification errors
+      console.error("JWT verification error:", error.message);
+      // You might want to send an error response or redirect the user
+      res.status(401).send("Unauthorized");
+    }
+  } catch (error) {
+    console.error(error);
+    res.status(500).send("Internal Server Error");
+  }
+});
+
 module.exports = router;
diff --git a/routers/userRoutes.js b/routers/userRoutes.js
index 4a4c3a6..a81cced 100644
--- a/routers/userRoutes.js
+++ b/routers/userRoutes.js
@@ -298,12 +298,12 @@ router.post("/User_singUp", async function (req, res) {
   }
 });
 
-router.route("/forgot-password").get(async (req, res) => {
-  res.render("forget-password");
+router.route("/forgot-password-user").get(async (req, res) => {
+  res.render("forget-password",{role:"user"});
 });
 
 //send Email for the reset password
-router.route("/forgot-password").post(async (req, res) => {
+router.route("/forgot-password-user").post(async (req, res) => {
   const { email } = req.body;
   try {
     const user = await User.findOne({ email });
@@ -325,7 +325,7 @@ router.route("/forgot-password").post(async (req, res) => {
     await user.save();
 
     // Send the reset link to the user via email
-    const resetLink = `http://localhost:3000/reset-password?email=${encodeURIComponent(
+    const resetLink = `http://localhost:3000/reset-password-user?email=${encodeURIComponent(
       user.email
     )}&token=${encodeURIComponent(resetToken)}`; // Replace with the actual path to your logo
     console.log(resetLink);
@@ -367,7 +367,7 @@ router.route("/forgot-password").post(async (req, res) => {
 });
 
 // verify Email and render reset password page
-router.route("/reset-password").get(async (req, res) => {
+router.route("/reset-password-user").get(async (req, res) => {
   const { email, token } = req.query;
   try {
     const user = await User.findOne({
@@ -386,7 +386,7 @@ router.route("/reset-password").get(async (req, res) => {
       // Process the decoded token (e.g., extract information from it)
       console.log(decodedToken);
       // Continue with the reset-password logic
-      res.render("set_password", { email, token });
+      res.render("set_password", { email, token,role:"user" });
     } catch (error) {
       // Handle JWT verification errors
       console.error("JWT verification error:", error.message);
@@ -400,7 +400,7 @@ router.route("/reset-password").get(async (req, res) => {
 });
 
 //verify the password
-router.route("/reset-password").post(async (req, res) => {
+router.route("/reset-password-user").post(async (req, res) => {
   const { email, token } = req.query;
   const { newPassword } = req.body;
   // console.log(" User Info",email,token,newPassword);
@@ -428,12 +428,13 @@ router.route("/reset-password").post(async (req, res) => {
       user.resetToken = null;
       user.resetTokenExpiration = null;
       await user.save();
-
+      const userQuerys = await Query.find({ user_id: user._id });
       return res.render("UserDashBoard", {
         fullName: user.fullName,
         email: user.email,
         phoneNo: user.Mobile,
         address: user.address,
+        complain:userQuerys
       });
 
       // Redirect to login page or any other desired page
diff --git a/views/NGO-Dashboard.ejs b/views/NGO-Dashboard.ejs
index c9dd859..4552ffa 100644
--- a/views/NGO-Dashboard.ejs
+++ b/views/NGO-Dashboard.ejs
@@ -586,7 +586,7 @@
                 </ul>
             </div>
         </section>
-
+        
         <section class="donation" style="display: none;">
             <div class="container">
                 <div class="form-container">
diff --git a/views/Ngo_login.ejs b/views/Ngo_login.ejs
index fd343f9..059d075 100644
--- a/views/Ngo_login.ejs
+++ b/views/Ngo_login.ejs
@@ -58,7 +58,7 @@
                             <label for="formCheck" class="form-check-label text-secondary"><small>Remember Me</small></label>
                         </div>
                         <div class="forgot">
-                            <small><a href="#">Forgot Password?</a></small>
+                            <small><a href="/forgot-password-ngo">Forgot Password?</a></small>
                         </div>
                     </div>
                     <div class="input-group mb-3">
diff --git a/views/UserDashBoard.ejs b/views/UserDashBoard.ejs
index 3e9779a..276f702 100644
--- a/views/UserDashBoard.ejs
+++ b/views/UserDashBoard.ejs
@@ -394,6 +394,25 @@
             cursor: pointer;
             margin-right: 5px;
         }
+        .contactUs-container{
+            display: flex;
+           flex-direction: column;
+           align-items: center;
+           margin: 2rem;
+           background-color: #3e8e41;
+           padding: 2rem 0rem;
+           border-radius: 0.5rem;
+        }
+        .fields{
+            margin: 1rem 0rem;
+            width: 50%;
+        }
+        .contact-btn{
+            width: 100%;
+            padding: 0.5rem 0rem;
+            border-radius: 10px;
+            background-color:bisque;
+        }
     </style>
 
     <!-- //icon -->
@@ -520,6 +539,35 @@
                         </div>
                     </form>
         </section>
+        
+        <!---Contact Us-->
+        <section class="contact-sec" style="display: none; margin-top: 2rem;">
+            <form action="/" method="POST" class="contactUs-container">
+                <h2>Get in touch with us</h2>
+                <div class="fields">
+                    <div class="field name">
+                       <input type="text" name="Fname" placeholder="Name" required>
+                    </div>
+                    <div class="field email">
+                       <input type="email" name="Email" placeholder="Email" required>
+                    </div>
+                    <div class="field">
+                        <input type="text" name="sub" placeholder="Subject" required>
+                    </div>
+                    <div class="field textarea">
+                        <textarea cols="57" rows="8" name="sms" placeholder="Message.." required style="width: 100%;"></textarea>
+                    </div>
+                    <div class="button-area">
+    
+                        <button type="submit" class="contact-btn" id="send">SEND MESSAGE </button>
+                    </div>
+                </div>
+                
+                
+          </form>
+
+        </section>
+
 
         <!-- //QUERY SECTION -->
         <section class="query-sec" style="display: none; margin-top: 2rem;">
@@ -615,21 +663,33 @@
             let donation_sec = document.querySelector('.donation')
             let query_sec = document.querySelector('.query-sec');
             let query = document.querySelector("#query");
+            let contact_sec = document.querySelector('.contact-sec');
+            let contact = document.querySelector("#contact");
 
             donate.addEventListener('click', (e) => {
                 Profile_sec.style.display = 'none';
-                donation_sec.style.display = 'block';
+                donation_sec.style.display ='block';
+                contact_sec.style.display='none';
                 query_sec.style.display = 'none';
             })
             profile.addEventListener('click', (e) => {
                 Profile_sec.style.display = 'block';
                 donation_sec.style.display = 'none';
+                contact_sec.style.display='none';
                 query_sec.style.display = 'none';
+
             })
-            query.addEventListener('click', () => {
+            query.addEventListener('click', (e) => {
                 Profile_sec.style.display = 'none';
                 query_sec.style.display = 'block';
                 donation_sec.style.display = 'none';
+                contact_sec.style.display='none';
+            })
+            contact.addEventListener("click",(e)=>{
+                Profile_sec.style.display='none';
+                contact_sec.style.display='block';
+                donation_sec.style.display='none';
+                query_sec.style.display = 'none';
             })
 
             const body = document.querySelector("body");
diff --git a/views/admin_login.ejs b/views/admin_login.ejs
index 7abe2e8..6b6c4b5 100644
--- a/views/admin_login.ejs
+++ b/views/admin_login.ejs
@@ -58,7 +58,7 @@
                             <label for="formCheck" class="form-check-label text-secondary"><small>Remember Me</small></label>
                         </div>
                         <div class="forgot">
-                            <small><a href="/forgot-password">Forgot Password?</a></small>
+                            <small><a href="/forgot-password-admin">Forgot Password?</a></small>
                         </div>
                     </div>
                     <div class="input-group mb-3">
diff --git a/views/forget-password.ejs b/views/forget-password.ejs
index e2a37b5..eec6b85 100644
--- a/views/forget-password.ejs
+++ b/views/forget-password.ejs
@@ -121,7 +121,7 @@
           <p class="para">Enter your Email ID so  that we can send a link to your Email to reset your Password. 
             Open the link and click on the link to change your password.</p>
         </div>
-        <form action="/forgot-password" class="form" method="post">
+        <form action="/forgot-password-<%=role%>" class="form" method="post">
           <div class="input-group">
             <label for="" class="label-title">Enter your Email</label>
             <input type="email" name="email" placeholder="Enter your Email">
diff --git a/views/index.ejs b/views/index.ejs
index e10947b..590d85b 100644
--- a/views/index.ejs
+++ b/views/index.ejs
@@ -146,14 +146,14 @@
                         <div class="column right">
                             <div class="text">Message me</div>
                             <form action="/" method="POST"">
-                    <div class=" fields">
+                              <div class=" fields">
                                 <div class="field name">
                                     <input type="text" name="Fname" placeholder="Name" required>
                                 </div>
                                 <div class="field email">
                                     <input type="email" name="Email" placeholder="Email" required>
                                 </div>
-                        </div>
+                            </div>
                         <div class="field">
                             <input type="text" name="sub" placeholder="Subject" required>
                         </div>
diff --git a/views/set_password.ejs b/views/set_password.ejs
index 74b9ed6..130e08a 100644
--- a/views/set_password.ejs
+++ b/views/set_password.ejs
@@ -112,7 +112,7 @@
         <div class="title-section">
           <h2 class="title">Reset Password</h2>
     
-        <form action="/reset-password?email=<%=email%>&token=<%=token%>" class="form" method="post">
+        <form action="/reset-password-<%=role%>?email=<%=email%>&token=<%=token%>" class="form" method="post">
           <div class="input-group">
             <label for="" class="label-title">Enter new Password</label>
             <input type="password" name="newPassword" placeholder="Enter your password">
diff --git a/views/user_login.ejs b/views/user_login.ejs
index c3970b9..1b728d0 100644
--- a/views/user_login.ejs
+++ b/views/user_login.ejs
@@ -58,7 +58,7 @@
                         <label for="formCheck" class="form-check-label text-secondary"><small>Remember Me</small></label>
                     </div>
                     <div class="forgot">
-                        <small><a href="/forgot-password">Forgot Password?</a></small>
+                        <small><a href="/forgot-password-user">Forgot Password?</a></small>
                     </div>
                 </div>
                 <div class="input-group mb-3">