diff --git a/peer-prep/src/hooks/useApi.tsx b/peer-prep/src/hooks/useApi.tsx
index e28dc207f9..e691d199b2 100644
--- a/peer-prep/src/hooks/useApi.tsx
+++ b/peer-prep/src/hooks/useApi.tsx
@@ -4,16 +4,10 @@ import { useLocalStorage } from "@mantine/hooks";
 import { useAuth } from "./useAuth";
 import { useNavigate } from "react-router-dom";
 
-export interface QuestionServerResponse<T> {
-  success: boolean;
-  status: number;
-  data: T;
-  message?: string;
-}
-
-export interface UserServerResponse<T> {
-  user?: T;
+export interface ServerResponse<T> {
+  statusCode: number;
   message: string;
+  data: T;
 }
 
 // export interface ServerError {
diff --git a/peer-prep/src/hooks/useAuth.tsx b/peer-prep/src/hooks/useAuth.tsx
index b5322b55cc..a930497bea 100644
--- a/peer-prep/src/hooks/useAuth.tsx
+++ b/peer-prep/src/hooks/useAuth.tsx
@@ -1,8 +1,8 @@
 import { useLocalStorage } from "@mantine/hooks";
 import { createContext, ReactElement, useContext, useMemo } from "react";
 import { useNavigate } from "react-router-dom";
-import { User } from "../types/user";
-import useApi, { SERVICE, UserServerResponse } from "./useApi";
+import { User, UserResponseData } from "../types/user";
+import useApi, { ServerResponse, SERVICE } from "./useApi";
 import { notifications } from "@mantine/notifications";
 
 export interface AuthContextType {
@@ -45,7 +45,7 @@ export const AuthProvider = ({
 
   // call this function when you want to authenticate the user
   const login = async (data: { email: string; password: string }) => {
-    fetchData<UserServerResponse<User>>(
+    fetchData<ServerResponse<UserResponseData>>(
       `/user-service/users/login`,
       SERVICE.USER,
       {
@@ -56,10 +56,10 @@ export const AuthProvider = ({
         body: JSON.stringify(data),
       }
     )
-      .then((data) => {
+      .then((response) => {
         // ok!
-        setUser(data.user || null);
-        console.log(data.user, "<<<<");
+        setUser(response.data.user || null);
+        console.log(response.data.user, "<<<<");
         navigate("/dashboard", { replace: true });
 
         notifications.show({
diff --git a/peer-prep/src/pages/Questions/CreateQuestionPage/CreateQuestionPage.tsx b/peer-prep/src/pages/Questions/CreateQuestionPage/CreateQuestionPage.tsx
index b04a6fb8bf..7a364b03c6 100644
--- a/peer-prep/src/pages/Questions/CreateQuestionPage/CreateQuestionPage.tsx
+++ b/peer-prep/src/pages/Questions/CreateQuestionPage/CreateQuestionPage.tsx
@@ -20,9 +20,10 @@ import ReactQuill from "react-quill";
 import "react-quill/dist/quill.snow.css";
 
 import classes from "./CreateQuestionPage.module.css";
-import { Question, QuestionOlsd, TestCase } from "../../../types/question";
-import useApi, { QuestionServerResponse, SERVICE } from "../../../hooks/useApi";
+import { QuestionResponseData, TestCase } from "../../../types/question";
+import useApi, { ServerResponse, SERVICE } from "../../../hooks/useApi";
 import { notifications } from "@mantine/notifications";
+import { useNavigate } from "react-router-dom";
 
 export default function CreateQuestionPage() {
   const [name, setName] = useState("");
@@ -30,6 +31,10 @@ export default function CreateQuestionPage() {
   const [categories, setCategories] = useState<string[]>([]);
   const [description, setDescription] = useState("");
   const [testCases, setTestCases] = useState<TestCase[]>([]);
+  const [solution, setSolution] = useState("");
+  const [link, setLink] = useState("");
+
+  const navigate = useNavigate();
 
   const [fetchedCategories, setFetchedCategories] = useState<
     { value: string; label: string }[]
@@ -50,27 +55,18 @@ export default function CreateQuestionPage() {
 
   const fetchCategories = async () => {
     try {
-      const response = await fetchData<QuestionServerResponse<string[]>>(
+      const response = await fetchData<ServerResponse<QuestionResponseData>>(
         "/question-service/categories",
         SERVICE.QUESTION
       );
 
-      if (response.success) {
-        const categories = response.data;
-        const transformedCategories = categories.map((category: string) => ({
-          value: category.toUpperCase(),
-          label:
-            category.charAt(0).toUpperCase() + category.slice(1).toLowerCase(),
-        }));
-        setFetchedCategories(transformedCategories);
-      } else {
-        notifications.show({
-          message:
-            response.message ||
-            "Error fetching categories, please try again later.",
-          color: "red",
-        });
-      }
+      const categories = response.data.categories || [];
+      const transformedCategories = categories.map((category: string) => ({
+        value: category.toUpperCase(),
+        label:
+          category.charAt(0).toUpperCase() + category.slice(1).toLowerCase(),
+      }));
+      setFetchedCategories(transformedCategories);
     } catch (error: any) {
       console.error("Error fetching categories", error);
       notifications.show({
@@ -89,7 +85,7 @@ export default function CreateQuestionPage() {
     }));
 
     try {
-      const response = await fetchData<QuestionServerResponse<Question>>(
+      const response = await fetchData<ServerResponse<QuestionResponseData>>(
         "/question-service",
         SERVICE.QUESTION,
         {
@@ -103,21 +99,19 @@ export default function CreateQuestionPage() {
             categories,
             difficulty,
             testCases: updatedTestCases,
+            solutionCode: solution,
+            link,
           }),
         }
       );
+      notifications.show({
+        message: "Question created successfully!",
+        color: "green",
+      });
 
-      if (response.success) {
-        alert("Question created successfully!");
-        window.location.href = "/questions";
-      } else {
-        notifications.show({
-          message:
-            response.message ||
-            "Error creating question, please try again later.",
-          color: "red",
-        });
-      }
+      // Redirect to questions page
+      // todo: redirect to the specific qn page
+      navigate("/questions", { replace: true });
     } catch (error: any) {
       console.log("Error creating question:", error);
       notifications.show({
@@ -183,6 +177,14 @@ export default function CreateQuestionPage() {
             minRows={8}
             required
           />
+
+          <Textarea
+            label={"Solution"}
+            value={solution}
+            onChange={(event) => setSolution(event.currentTarget.value)}
+            minRows={8}
+            required
+          />
           {/* <Input.Wrapper label="Description" required>
             <ReactQuill
               theme="snow"
@@ -205,6 +207,13 @@ export default function CreateQuestionPage() {
             </ReactQuill>
           </Input.Wrapper> */}
 
+          <TextInput
+            label="Link to question (e.g. Leetcode)"
+            value={link}
+            onChange={(event) => setLink(event.currentTarget.value)}
+            required
+          />
+
           <Flex style={{ alignItems: "baseline", gap: 4 }}>
             <Text className={classes.testCaseHeader}>Test Cases</Text>
             <Text style={{ color: "red" }}>*</Text>
diff --git a/peer-prep/src/pages/Questions/EditQuestionPage/EditQuestionPage.tsx b/peer-prep/src/pages/Questions/EditQuestionPage/EditQuestionPage.tsx
index 1126dccc8b..4f818bbdb2 100644
--- a/peer-prep/src/pages/Questions/EditQuestionPage/EditQuestionPage.tsx
+++ b/peer-prep/src/pages/Questions/EditQuestionPage/EditQuestionPage.tsx
@@ -1,4 +1,4 @@
-import { useParams } from "react-router-dom";
+import { useNavigate, useParams } from "react-router-dom";
 import { useState, useEffect } from "react";
 import {
   TextInput,
@@ -20,8 +20,13 @@ import ReactQuill from "react-quill";
 import "react-quill/dist/quill.snow.css";
 
 import classes from "./EditQuestionPage.module.css";
-import { Question, QuestionOlsd, TestCase } from "../../../types/question";
-import useApi, { QuestionServerResponse, SERVICE } from "../../../hooks/useApi";
+import {
+  CategoryResponseData,
+  Question,
+  QuestionResponseData,
+  TestCase,
+} from "../../../types/question";
+import useApi, { SERVICE, ServerResponse } from "../../../hooks/useApi";
 import { notifications } from "@mantine/notifications";
 
 export default function EditQuestionPage() {
@@ -31,11 +36,15 @@ export default function EditQuestionPage() {
   const [categories, setCategories] = useState<string[]>([]);
   const [description, setDescription] = useState("");
   const [testCases, setTestCases] = useState<TestCase[]>([]);
+  const [solution, setSolution] = useState("");
+  const [link, setLink] = useState("");
 
   const [fetchedCategories, setFetchedCategories] = useState<
     { value: string; label: string }[]
   >([]);
 
+  const navigate = useNavigate();
+
   // Mapping for difficulty display
   const difficultyOptions = [
     { value: "EASY", label: "Easy" },
@@ -54,26 +63,19 @@ export default function EditQuestionPage() {
 
   const fetchQuestionDetails = async (questionId: string) => {
     try {
-      const response = await fetchData<QuestionServerResponse<Question>>(
+      const response = await fetchData<ServerResponse<QuestionResponseData>>(
         `/question-service/id/${questionId}`,
         SERVICE.QUESTION
       );
 
-      if (response.success) {
-        const question = response.data;
-        setName(question.title);
-        setDifficulty(question.difficulty);
-        setCategories(question.categories);
-        setDescription(question.description.testDescription);
-        setTestCases(question.testCases);
-      } else {
-        notifications.show({
-          message:
-            response.message ||
-            "Error fetching question details, please try again later.",
-          color: "red",
-        });
-      }
+      const question = response.data.question;
+      setName(question.title);
+      setDifficulty(question.difficulty);
+      setCategories(question.categories);
+      setDescription(question.description.testDescription);
+      setTestCases(question.testCases);
+      setSolution(question.solutionCode);
+      setLink(question.link);
     } catch (error: any) {
       console.error("Error fetching question details:", error);
       notifications.show({
@@ -85,27 +87,18 @@ export default function EditQuestionPage() {
 
   const fetchCategories = async () => {
     try {
-      const response = await fetchData<QuestionServerResponse<string[]>>(
+      const response = await fetchData<ServerResponse<CategoryResponseData>>(
         "/question-service/categories",
         SERVICE.QUESTION
       );
 
-      if (response.success) {
-        const categories = response.data;
-        const transformedCategories = categories.map((category: string) => ({
-          value: category.toUpperCase(),
-          label:
-            category.charAt(0).toUpperCase() + category.slice(1).toLowerCase(),
-        }));
-        setFetchedCategories(transformedCategories);
-      } else {
-        notifications.show({
-          message:
-            response.message ||
-            "Error fetching categories, please try again later.",
-          color: "red",
-        });
-      }
+      const categories = response.data.categories;
+      const transformedCategories = categories.map((category: string) => ({
+        value: category.toUpperCase(),
+        label:
+          category.charAt(0).toUpperCase() + category.slice(1).toLowerCase(),
+      }));
+      setFetchedCategories(transformedCategories);
     } catch (error: any) {
       console.error("Error fetching categories", error);
       notifications.show({
@@ -124,7 +117,7 @@ export default function EditQuestionPage() {
     }));
 
     try {
-      const response = await fetchData<QuestionServerResponse<Question>>(
+      const response = await fetchData<ServerResponse<QuestionResponseData>>(
         `/question-service/id/${id}`,
         SERVICE.QUESTION,
         {
@@ -138,23 +131,18 @@ export default function EditQuestionPage() {
             categories,
             difficulty,
             testCases: updatedTestCases,
+            solutionCode: solution,
+            link,
           }),
         }
       );
 
-      if (response.success) {
-        notifications.show({
-          message: "Question updated successfully!",
-          color: "green",
-        });
-      } else {
-        notifications.show({
-          message:
-            response.message ||
-            "Error updating question, please try again later.",
-          color: "red",
-        });
-      }
+      const createdQuestion = response.data.question;
+
+      notifications.show({
+        message: "Question updated successfully!",
+        color: "green",
+      });
     } catch (error: any) {
       console.error("Error updating question:", error);
       notifications.show({
@@ -166,7 +154,7 @@ export default function EditQuestionPage() {
 
   const handleDelete = async () => {
     try {
-      const response = await fetchData<QuestionServerResponse<Question>>(
+      const response = await fetchData<ServerResponse<Question>>(
         `/question-service/id/${id}`,
         SERVICE.QUESTION,
         {
@@ -174,20 +162,14 @@ export default function EditQuestionPage() {
         }
       );
 
-      if (response.success) {
-        notifications.show({
-          message: "Question deleted successfully!",
-          color: "green",
-        });
-        window.location.href = "/questions";
-      } else {
-        notifications.show({
-          message:
-            response.message ||
-            "Error deleting question, please try again later.",
-          color: "red",
-        });
-      }
+      notifications.show({
+        message: "Question deleted successfully!",
+        color: "green",
+      });
+
+      navigate("/questions", {
+        replace: true,
+      });
     } catch (error: any) {
       console.error("Error deleting question:", error);
       notifications.show({
@@ -251,7 +233,13 @@ export default function EditQuestionPage() {
           minRows={8}
           required
         />
-
+        <Textarea
+          label={"Solution"}
+          value={solution}
+          onChange={(event) => setSolution(event.currentTarget.value)}
+          minRows={8}
+          required
+        />
         {/* <Input.Wrapper label="Description" required>
           <ReactQuill
             theme="snow"
@@ -263,7 +251,12 @@ export default function EditQuestionPage() {
             <div className={classes.quillEditor} />
           </ReactQuill>
         </Input.Wrapper> */}
-
+        <TextInput
+          label="Link to question (e.g. Leetcode)"
+          value={link}
+          onChange={(event) => setLink(event.currentTarget.value)}
+          required
+        />
         <Flex style={{ alignItems: "baseline", gap: 4 }}>
           <Text className={classes.testCaseHeader}>Test Cases</Text>
           <Text style={{ color: "red" }}>*</Text>
diff --git a/peer-prep/src/pages/Questions/QuestionPage.tsx b/peer-prep/src/pages/Questions/QuestionPage.tsx
index ea5b988f33..a39213ed92 100644
--- a/peer-prep/src/pages/Questions/QuestionPage.tsx
+++ b/peer-prep/src/pages/Questions/QuestionPage.tsx
@@ -14,7 +14,7 @@ import {
 import { IconSearch } from "@tabler/icons-react";
 import { useEffect, useState } from "react";
 import { Question, SAMPLE_QUESTIONS } from "../../types/question";
-import useApi, { QuestionServerResponse } from "../../hooks/useApi";
+import useApi, { ServerResponse } from "../../hooks/useApi";
 import { Link, useLoaderData } from "react-router-dom";
 import QuestionCard from "../../components/Questions/QuestionCard/QuestionCard";
 
@@ -24,12 +24,16 @@ export default function QuestionPage() {
   const [searchValue, setSearchValue] = useState("");
   const [questions, setQuestions] = useState<Question[]>([]);
 
+  interface QuestionResponse {
+    questions: Question[];
+  }
+
   // const { isLoading, error, fetchData } = useApi();
-  const data = useLoaderData() as QuestionServerResponse<Question[]>;
+  const data = useLoaderData() as ServerResponse<QuestionResponse>;
   console.log({ data });
 
   useEffect(() => {
-    setQuestions(data.data);
+    if (data.data) setQuestions(data.data.questions);
   }, [data]);
 
   return (
diff --git a/peer-prep/src/pages/Session/Create/CreateSessionPage.tsx b/peer-prep/src/pages/Session/Create/CreateSessionPage.tsx
index 7b4de60d80..e8e5742771 100644
--- a/peer-prep/src/pages/Session/Create/CreateSessionPage.tsx
+++ b/peer-prep/src/pages/Session/Create/CreateSessionPage.tsx
@@ -14,7 +14,8 @@ import classes from "./CreateSessionPage.module.css";
 import { useEffect, useState } from "react";
 import { capitalizeFirstLetter } from "../../../utils/utils";
 import { Link, useLoaderData } from "react-router-dom";
-import useApi, { QuestionServerResponse, SERVICE } from "../../../hooks/useApi";
+import useApi, { ServerResponse, SERVICE } from "../../../hooks/useApi";
+import { CategoryResponseData } from "../../../types/question";
 
 // Arrays
 // Algorithms
@@ -29,15 +30,18 @@ export default function CreateSessionPage() {
   // TODO: query the question service to get a list of categories and difficulties
   const { fetchData } = useApi();
   useEffect(() => {
-    fetchData<QuestionServerResponse<string[]>>(
+    fetchData<ServerResponse<CategoryResponseData>>(
       `/question-service/categories`,
       SERVICE.QUESTION
     ).then((data) => {
-      if (data.success) {
-        setCategories(data.data);
+      const categories = data.data.categories;
+      const transformedCategories = categories.map((category: string) => ({
+        value: category.toUpperCase(),
+        label:
+          category.charAt(0).toUpperCase() + category.slice(1).toLowerCase(),
+      }));
 
-        console.log(data.data);
-      }
+      setCategories(transformedCategories.map((v) => v.value));
     });
   }, []);
 
diff --git a/peer-prep/src/types/question.ts b/peer-prep/src/types/question.ts
index 575b276a71..41e44fe3f5 100644
--- a/peer-prep/src/types/question.ts
+++ b/peer-prep/src/types/question.ts
@@ -5,7 +5,7 @@ export type TestCase = {
   testCode: string;
   isPublic: boolean;
   expectedOutput: string;
-  meta: { [key: string]: any }; 
+  meta: { [key: string]: any };
 };
 
 export type QuestionOlsd = {
@@ -19,16 +19,28 @@ export type QuestionOlsd = {
 }
 
 export type Question = {
-  _id: string; 
+  _id: string;
   title: string;
-  description: { [key: string]: any }; 
+  description: { [key: string]: any };
   categories: string[];
   difficulty: Complexity;
   isDeleted: boolean;
   testCases: TestCase[];
-  __v: number; 
+  solutionCode: string;
+  link: string;
+  __v: number;
 };
 
+export interface QuestionResponseData {
+  question?: Question;
+  questions?: Question[];
+  categories?: string[];
+}
+
+export interface CategoryResponseData {
+  categories: string[];
+}
+
 export const SAMPLE_QUESTIONS: any[] = [{
   id: 1,
   title: "Reverse a string",
diff --git a/peer-prep/src/types/user.ts b/peer-prep/src/types/user.ts
index 3490c776ba..4dcc66f0a3 100644
--- a/peer-prep/src/types/user.ts
+++ b/peer-prep/src/types/user.ts
@@ -4,4 +4,8 @@ export type User = {
   displayName: string,
   isAdmin: boolean,
   id: string,
+}
+
+export interface UserResponseData {
+  user: User;
 }
\ No newline at end of file