diff --git a/.idea/.gitignore b/.idea/.gitignore
new file mode 100644
index 0000000..b58b603
--- /dev/null
+++ b/.idea/.gitignore
@@ -0,0 +1,5 @@
+# Default ignored files
+/shelf/
+/workspace.xml
+# Editor-based HTTP Client requests
+/httpRequests/
diff --git a/.idea/modules.xml b/.idea/modules.xml
new file mode 100644
index 0000000..89705fc
--- /dev/null
+++ b/.idea/modules.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project version="4">
+  <component name="ProjectModuleManager">
+    <modules>
+      <module fileurl="file://$PROJECT_DIR$/.idea/peetcode.iml" filepath="$PROJECT_DIR$/.idea/peetcode.iml" />
+    </modules>
+  </component>
+</project>
\ No newline at end of file
diff --git a/.idea/peetcode.iml b/.idea/peetcode.iml
new file mode 100644
index 0000000..24643cc
--- /dev/null
+++ b/.idea/peetcode.iml
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<module type="WEB_MODULE" version="4">
+  <component name="NewModuleRootManager">
+    <content url="file://$MODULE_DIR$">
+      <excludeFolder url="file://$MODULE_DIR$/.tmp" />
+      <excludeFolder url="file://$MODULE_DIR$/temp" />
+      <excludeFolder url="file://$MODULE_DIR$/tmp" />
+    </content>
+    <orderEntry type="inheritedJdk" />
+    <orderEntry type="sourceFolder" forTests="false" />
+  </component>
+</module>
\ No newline at end of file
diff --git a/.idea/vcs.xml b/.idea/vcs.xml
new file mode 100644
index 0000000..35eb1dd
--- /dev/null
+++ b/.idea/vcs.xml
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project version="4">
+  <component name="VcsDirectoryMappings">
+    <mapping directory="" vcs="Git" />
+  </component>
+</project>
\ No newline at end of file
diff --git a/client/src/Components/AllProblems/AllProblems.jsx b/client/src/Components/AllProblems/AllProblems.jsx
index 1e16e6b..a4b180e 100644
--- a/client/src/Components/AllProblems/AllProblems.jsx
+++ b/client/src/Components/AllProblems/AllProblems.jsx
@@ -32,7 +32,7 @@ const AllProblemsPage = () => {
           </tr>
 
           {problems.map((prob,index) => (
-            <tr>
+            <tr key={prob.problemId}>
               <Link to={`/problems/:${prob.problemId}`}>
                 <td>{prob.title}</td>
               </Link>
diff --git a/client/src/Components/Login/Login.jsx b/client/src/Components/Login/Login.jsx
index 6cc12bf..329e625 100644
--- a/client/src/Components/Login/Login.jsx
+++ b/client/src/Components/Login/Login.jsx
@@ -27,6 +27,9 @@ const Login = () => {
         <button type="submit" id="test" onClick={async (e) => {
           const response = await fetch(`${backendUrl}/login`, {
             method: "POST",
+            headers:{
+              "Content-Type":"application/json"
+            },
             body: JSON.stringify({
               email: email,
               password: password
diff --git a/client/src/Components/ProblemsPage/ProblemsPage.css b/client/src/Components/ProblemsPage/ProblemsPage.css
index a6bc696..9ecb704 100644
--- a/client/src/Components/ProblemsPage/ProblemsPage.css
+++ b/client/src/Components/ProblemsPage/ProblemsPage.css
@@ -40,4 +40,24 @@ button {
 }
 #submit {
     background-color: rgb(68, 207, 68);
+}
+
+#sub-content{
+    padding: 1vh;
+   border : 1px solid black;
+    border-radius: 0.3vw;
+    height: 39vh;
+    width: 100%;
+    overflow-y: scroll;
+}
+#internal{
+    margin : 1%;
+}
+.AC {
+    color: green;
+    font-weight: 900;
+}
+.WA {
+    color: red;
+    font-weight: 900;
 }
\ No newline at end of file
diff --git a/client/src/Components/ProblemsPage/ProblemsPage.jsx b/client/src/Components/ProblemsPage/ProblemsPage.jsx
index 66cedf3..d8bf4dd 100644
--- a/client/src/Components/ProblemsPage/ProblemsPage.jsx
+++ b/client/src/Components/ProblemsPage/ProblemsPage.jsx
@@ -11,7 +11,22 @@ const ProblemsPage = () => {
   const cleanId = pid.substring(1) ;
   const [problem, setProblem] = useState(null);
   const [submission, setSubmission] = useState("");
+  const [submissions,setSubmissions]= useState([]);
 
+  const handlesubmissions = async ()=>{
+    const response = await fetch(`${backendUrl}/submissions/`+cleanId,{
+      method:"GET",
+      headers: {
+        "authorization": localStorage.getItem("token"),
+      },
+    })
+    const json = await response.json();
+    // let ans = [];
+    const ans = json.submissions.filter((x)=> {
+      console.log(x.status)
+    })
+    setSubmissions(json.submissions);
+  }
     const init = async () => {
       const response = await fetch(`${backendUrl}/problem/` + cleanId, {
         method: "GET",
@@ -19,10 +34,12 @@ const ProblemsPage = () => {
 
       const json = await response.json();
       setProblem(json.problem);
+
     }
 
   useEffect(() => {
     init();
+    handlesubmissions();
   }, [])
   // console.log(cleanId) ;
 
@@ -39,8 +56,8 @@ const ProblemsPage = () => {
   }
 
   return (
+      <>
     <div>
-
       {
         problem? (
           <div id="problempage" className='flex-row'>
@@ -50,6 +67,21 @@ const ProblemsPage = () => {
               <p>{problem.description}</p>
               <code>Input : {problem.exampleIn}</code>
               <code>Output : {problem.exampleOut}</code>
+              <div id="submissions">
+                <h3>Submissions</h3>
+                <div id="sub-content">
+                  {
+                    submissions.map((x,index)=>{
+                      return(
+                          <div id="internal" key ={index} >
+                          <div >Submission: {index}</div>
+
+                          <div className={x.status} >Status: {x.status}</div></div>
+                    )
+                    })
+                  }
+                </div>
+              </div>
             </div>
             <div className="code">
               <h1>Code Here</h1>
@@ -59,7 +91,8 @@ const ProblemsPage = () => {
                   const response = await fetch(`${backendUrl}/submission`, {
                     method: "POST",
                     headers: {
-                      "authorization": localStorage.getItem("token")
+                      "authorization": localStorage.getItem("token"),
+                        "Content-Type":"application/json"
                     },
                     body: JSON.stringify({
                       problemId: cleanId,
@@ -69,7 +102,7 @@ const ProblemsPage = () => {
 
                   const json = await response.json();
                   console.log(json);
-
+                  handlesubmissions();
                 }}>SubmitCode</button>
               </div>
             </div>
@@ -79,7 +112,7 @@ const ProblemsPage = () => {
       }
 
     </div>
-    
+      </>
   )
 }
 
diff --git a/client/src/Components/Signup/Signup.jsx b/client/src/Components/Signup/Signup.jsx
index 20ca0cf..40db8a0 100644
--- a/client/src/Components/Signup/Signup.jsx
+++ b/client/src/Components/Signup/Signup.jsx
@@ -38,6 +38,9 @@ const Signup = () => {
           onClick={async (e) => {
             const response = await fetch(`${backendUrl}/signup`, {
               method: "POST",
+                headers:{
+                    'Content-Type':'application/json'
+                },
               body: JSON.stringify({
                 email: email,
                 password: password,
diff --git a/server/index.js b/server/index.js
index 9691a83..62ef04c 100644
--- a/server/index.js
+++ b/server/index.js
@@ -10,7 +10,9 @@ const bodyParser = require("body-parser");
 var jsonParser = bodyParser.json();
 var urlencodedParser = bodyParser.urlencoded({ extended: false });
 const cors = require("cors");
-app.use(cors());
+app.use(cors(
+    {origin: "*"}
+));
 app.use(jsonParser);
 
 const PROBLEMS = [