diff --git a/src/app/[slug]/page.tsx b/src/app/[slug]/page.tsx
index e1d174a..4a49ab6 100644
--- a/src/app/[slug]/page.tsx
+++ b/src/app/[slug]/page.tsx
@@ -1,4 +1,4 @@
-import MiniCreatePost from "@/components/MiniCreatePost"
+import CreatePost from "@/components/CreatePost"
 import PostFeed from "@/components/PostFeed"
 import { INFINITE_SCROLL_PAGINATION_RESULTS } from "@/config"
 import { getAuthSession } from "@/lib/auth"
@@ -23,7 +23,11 @@ const page = async ({ params }: PageProps) => {
         include: {
           author: true,
           votes: true,
-          comments: true,
+          comments: {
+            include: {
+              _count: true,
+            },
+          },
           subject: true,
         },
         orderBy: {
@@ -44,7 +48,7 @@ const page = async ({ params }: PageProps) => {
         {subject.name}
       </h1>
 
-      <MiniCreatePost session={session} />
+      <CreatePost session={session} />
 
       <PostFeed initialPosts={subject.posts} subjectAcronym={subject.acronym} />
     </>
diff --git a/src/app/[slug]/q/page.tsx b/src/app/[slug]/q/page.tsx
index e3cfb9a..16620e3 100644
--- a/src/app/[slug]/q/page.tsx
+++ b/src/app/[slug]/q/page.tsx
@@ -1,7 +1,7 @@
 import { INFINITE_SCROLL_PAGINATION_RESULTS } from "@/config"
 import { getAuthSession } from "@/lib/auth"
 import { db } from "@/lib/db"
-import MiniCreateQuestion from "@/components/MiniCreateQuestion"
+import CreateQuestion from "@/components/CreateQuestion"
 import QuestionFeed from "@/components/QuestionFeed"
 import { notFound } from "next/navigation"
 
@@ -41,7 +41,7 @@ const page = async ({ params }: PageProps) => {
         {subject.name} - Preguntes
       </h1>
 
-      <MiniCreateQuestion session={session} subjectId={subject.id} />
+      <CreateQuestion session={session} subjectId={subject.id} />
 
       <QuestionFeed
         initialQuestions={subject.questions}
diff --git a/src/app/api/subject/answer/create/route.ts b/src/app/api/subject/answer/create/route.ts
index c58ba95..b3c0b56 100644
--- a/src/app/api/subject/answer/create/route.ts
+++ b/src/app/api/subject/answer/create/route.ts
@@ -23,7 +23,7 @@ export async function POST(req: Request) {
         authorId: session.user.id,
       },
     })
-    return new Response("Answer created", { status: 201 })
+    return new Response(JSON.stringify(questionId), { status: 201 })
   } catch (error) {
     if (error instanceof z.ZodError) {
       return new Response(error.message, { status: 422 })
diff --git a/src/components/MiniCreateQuestion.tsx b/src/components/CreateAnswer.tsx
similarity index 61%
rename from src/components/MiniCreateQuestion.tsx
rename to src/components/CreateAnswer.tsx
index 16a82a9..1f85da7 100644
--- a/src/components/MiniCreateQuestion.tsx
+++ b/src/components/CreateAnswer.tsx
@@ -6,14 +6,12 @@ import { FC } from "react"
 import UserAvatar from "./UserAvatar"
 import Editor from "@/components/Editor"
 
-interface MiniCreateQuestionProps {
+interface CreateAnswer {
   session: Session | null
   subjectId: string
+  questionId: string
 }
-const MiniCreateQuestion: FC<MiniCreateQuestionProps> = ({
-  session,
-  subjectId,
-}) => {
+const CreateAnswer: FC<CreateAnswer> = ({ session, subjectId, questionId }) => {
   return (
     <div className="overflow-hidden rounded-md bg-white shadow">
       <div className="h-auto px-6 py-4 flex flex-col justify-between">
@@ -28,25 +26,16 @@ const MiniCreateQuestion: FC<MiniCreateQuestionProps> = ({
             <span className="absolute bottom-1 right-1 transform translate-x-1/2 translate-y-1/2 rounded-full w-3 h-3 bg-green-500 outline outline-2 outline-white" />
           </div>
           {/* form */}
-          <div className="flex-grow">
-            <div className="h-full">
-              <Editor subjectId={subjectId} contentType={"question"} />
-            </div>
-          </div>
-        </div>
-
-        <div className="flex justify-end">
-          <Button
-            type="submit"
-            className="w-full sm:w-auto mt-2"
-            form="subject-question-form"
-          >
-            Compartir
-          </Button>
+          <Editor
+            subjectId={subjectId}
+            contentType={"answer"}
+            questionId={questionId}
+            formId="question-answer-form"
+          />
         </div>
       </div>
     </div>
   )
 }
 
-export default MiniCreateQuestion
+export default CreateAnswer
diff --git a/src/components/MiniCreateComment.tsx b/src/components/CreateComment.tsx
similarity index 83%
rename from src/components/MiniCreateComment.tsx
rename to src/components/CreateComment.tsx
index 524a1a3..73f55af 100644
--- a/src/components/MiniCreateComment.tsx
+++ b/src/components/CreateComment.tsx
@@ -8,16 +8,16 @@ import axios from "axios"
 import { useMutation } from "@tanstack/react-query"
 import { toast } from "@/hooks/use-toast"
 
-interface MiniCreateComment {
+interface CreateComment {
   session: Session | null
   postId: string
 }
 
-const MiniCreateComment: FC<MiniCreateComment> = ({ session, postId }) => {
+const CreateComment: FC<CreateComment> = ({ session, postId }) => {
   const [content, setContent] = useState("")
 
   // Define the mutation function using useMutation hook
-  const { mutate: createComment } = useMutation({
+  const { mutate: createComment, isLoading } = useMutation({
     mutationFn: async () => {
       const { data } = await axios.post("/api/subject/comment/create", {
         content: content,
@@ -26,14 +26,18 @@ const MiniCreateComment: FC<MiniCreateComment> = ({ session, postId }) => {
       return data
     },
     onSuccess: ({}) => {
-      // Handle success and show toast
       toast({
         description: `Comment created successfully`,
       })
-      // You can add any additional handling specific to your needs here
+      setContent("")
+      window.location.reload()
     },
     onError: ({}) => {
-      // Handle error if needed
+      toast({
+        title: "Something went wrong",
+        description: `The comment could not be created. Please try again later.`,
+        variant: "destructive",
+      })
     },
   })
 
@@ -72,8 +76,8 @@ const MiniCreateComment: FC<MiniCreateComment> = ({ session, postId }) => {
           <Button
             type="submit"
             className="w-full sm:w-auto mt-2"
-            form="subject-question-form"
             onClick={handleSubmit}
+            isLoading={isLoading}
           >
             Compartir
           </Button>
@@ -83,4 +87,4 @@ const MiniCreateComment: FC<MiniCreateComment> = ({ session, postId }) => {
   )
 }
 
-export default MiniCreateComment
+export default CreateComment
diff --git a/src/components/MiniCreatePost.tsx b/src/components/CreatePost.tsx
similarity index 90%
rename from src/components/MiniCreatePost.tsx
rename to src/components/CreatePost.tsx
index cd9462d..63b8091 100644
--- a/src/components/MiniCreatePost.tsx
+++ b/src/components/CreatePost.tsx
@@ -7,11 +7,11 @@ import UserAvatar from "./UserAvatar"
 import Link from "next/link"
 import { buttonVariants } from "@/components/ui/Button"
 
-interface MiniCreatePostProps {
+interface CreatePostProps {
   session: Session | null
 }
 
-const MiniCreatePost: FC<MiniCreatePostProps> = ({ session }) => {
+const CreatePost: FC<CreatePostProps> = ({ session }) => {
   const router = useRouter()
   const pathname = usePathname()
 
@@ -51,4 +51,4 @@ const MiniCreatePost: FC<MiniCreatePostProps> = ({ session }) => {
   )
 }
 
-export default MiniCreatePost
+export default CreatePost
diff --git a/src/components/MiniCreateAnswer.tsx b/src/components/CreateQuestion.tsx
similarity index 54%
rename from src/components/MiniCreateAnswer.tsx
rename to src/components/CreateQuestion.tsx
index 190e25b..efd583b 100644
--- a/src/components/MiniCreateAnswer.tsx
+++ b/src/components/CreateQuestion.tsx
@@ -1,21 +1,15 @@
 "use client"
 
 import { Session } from "next-auth"
-import { Button } from "@/components/ui/Button"
 import { FC } from "react"
 import UserAvatar from "./UserAvatar"
 import Editor from "@/components/Editor"
 
-interface MiniCreateAnswer {
+interface CreateQuestionProps {
   session: Session | null
   subjectId: string
-  questionId: string
 }
-const MiniCreateAnswer: FC<MiniCreateAnswer> = ({
-  session,
-  subjectId,
-  questionId,
-}) => {
+const CreateQuestion: FC<CreateQuestionProps> = ({ session, subjectId }) => {
   return (
     <div className="overflow-hidden rounded-md bg-white shadow">
       <div className="h-auto px-6 py-4 flex flex-col justify-between">
@@ -30,29 +24,15 @@ const MiniCreateAnswer: FC<MiniCreateAnswer> = ({
             <span className="absolute bottom-1 right-1 transform translate-x-1/2 translate-y-1/2 rounded-full w-3 h-3 bg-green-500 outline outline-2 outline-white" />
           </div>
           {/* form */}
-          <div className="flex-grow">
-            <div className="h-full">
-              <Editor
-                subjectId={subjectId}
-                contentType={"answer"}
-                questionId={questionId}
-              />
-            </div>
-          </div>
-        </div>
-
-        <div className="flex justify-end">
-          <Button
-            type="submit"
-            className="w-full sm:w-auto mt-2"
-            form="subject-question-form"
-          >
-            Compartir
-          </Button>
+          <Editor
+            subjectId={subjectId}
+            contentType={"question"}
+            formId="subject-question-form"
+          />
         </div>
       </div>
     </div>
   )
 }
 
-export default MiniCreateAnswer
+export default CreateQuestion
diff --git a/src/components/Editor.tsx b/src/components/Editor.tsx
index c5a0a89..b0b648a 100644
--- a/src/components/Editor.tsx
+++ b/src/components/Editor.tsx
@@ -1,6 +1,13 @@
 "use client"
 
-import { FC, useCallback, useEffect, useRef, useState } from "react"
+import {
+  FC,
+  startTransition,
+  useCallback,
+  useEffect,
+  useRef,
+  useState,
+} from "react"
 import TextareaAutosize from "react-textarea-autosize"
 import { useForm } from "react-hook-form"
 import {
@@ -15,27 +22,34 @@ import { toast } from "@/hooks/use-toast"
 import { useMutation } from "@tanstack/react-query"
 import axios from "axios"
 import { usePathname, useRouter } from "next/navigation"
+import { Button } from "./ui/Button"
+
+type FormData = QuestionCreationRequest | AnswerCreationRequest
 
 interface EditorProps {
   subjectId: string
   contentType: "question" | "answer"
   questionId?: string
+  formId: string
 }
 
-const Editor: FC<EditorProps> = ({ subjectId, contentType, questionId }) => {
+const Editor: FC<EditorProps> = ({
+  subjectId,
+  contentType,
+  questionId,
+  formId,
+}) => {
   const {
     register,
     handleSubmit,
     formState: { errors },
-  } = useForm<QuestionCreationRequest | AnswerCreationRequest>({
+  } = useForm<FormData>({
     resolver: zodResolver(
       contentType === "question" ? QuestionValidator : AnswerValidator,
     ),
     defaultValues: {
       subjectId,
-      title: `${
-        contentType === "question" ? "Pregunta" : "Resposta"
-      } ${new Date().toLocaleDateString()}`,
+      title: "",
       content: null,
       questionId: questionId || "", // Add questionId as a value in the form
     },
@@ -61,6 +75,7 @@ const Editor: FC<EditorProps> = ({ subjectId, contentType, questionId }) => {
     if (!ref.current) {
       const editor = new EditorJS({
         holder: "editor",
+        minHeight: 200,
         onReady() {
           ref.current = editor
         },
@@ -124,13 +139,9 @@ const Editor: FC<EditorProps> = ({ subjectId, contentType, questionId }) => {
     }
   }, [isMounted, initializeEditor])
 
-  const { mutate: createContent } = useMutation({
-    mutationFn: async ({
-      title,
-      content,
-      subjectId,
-    }: QuestionCreationRequest | AnswerCreationRequest) => {
-      const payload: QuestionCreationRequest | AnswerCreationRequest = {
+  const { mutate: createContent, isLoading } = useMutation({
+    mutationFn: async ({ title, content, subjectId }: FormData) => {
+      const payload: FormData = {
         title,
         content,
         subjectId,
@@ -158,22 +169,26 @@ const Editor: FC<EditorProps> = ({ subjectId, contentType, questionId }) => {
         const questionId = data as string
         const newPathname = pathname.replace("/q", `/q/${questionId}`)
         router.push(newPathname)
+        router.refresh()
+      } else {
+        ref.current?.clear()
+        _titleRef.current!.value = ""
+        window.location.reload()
       }
-      router.refresh()
 
       return toast({
         description: `La teva ${
-          contentType === "question" ? "pregunta" : "reposta"
+          contentType === "question" ? "pregunta" : "resposta"
         } s'ha creat correctament`,
       })
     },
   })
 
-  async function onSubmit() {
+  async function onSubmit(data: FormData) {
     const blocks = await ref.current?.save()
-    const title = (await _titleRef.current?.value) as string
-    const payload: QuestionCreationRequest | AnswerCreationRequest = {
-      title: title,
+
+    const payload: FormData = {
+      title: data.title,
       content: blocks,
       subjectId: subjectId,
       ...(contentType === "answer" && { questionId: questionId }),
@@ -187,25 +202,38 @@ const Editor: FC<EditorProps> = ({ subjectId, contentType, questionId }) => {
 
   const { ref: titleRef, ...rest } = register("title")
   return (
-    <div className="w-full p-4 bg-zinc-50 rounded-lg border border-zinc-200 h-full">
-      <form
-        id="subject-question-form"
-        className="w-fit h-full"
-        onSubmit={handleSubmit(onSubmit)}
-      >
-        <div className="prose prose-stone dark:prose-invert h-full">
-          <TextareaAutosize
-            ref={(e) => {
-              titleRef(e)
-              // @ts-ignore
-              _titleRef.current = e
-            }}
-            placeholder="Títol"
-            className="w-full resize-none appearance-none overflow-hidden bg-transparent text-xl font-bold focus:outline-none h-12"
-          />
-          <div id="editor" className="min-h-[500px] h-full"></div>
-        </div>
-      </form>
+    <div className="flex-grow">
+      <div className="w-full p-4 bg-zinc-50 rounded-lg border border-zinc-200">
+        <form
+          id={formId}
+          className="w-full h-full"
+          onSubmit={handleSubmit(onSubmit)}
+        >
+          <div className="prose prose-stone dark:prose-invert h-full">
+            <TextareaAutosize
+              ref={(e) => {
+                titleRef(e)
+                // @ts-ignore
+                _titleRef.current = e
+              }}
+              {...rest}
+              placeholder="Títol"
+              className="w-full resize-none appearance-none overflow-hidden bg-transparent text-xl font-bold focus:outline-none h-12"
+            />
+            <div id="editor" className="min-h-[100px] h-full"></div>
+          </div>
+        </form>
+      </div>
+      <div className="flex justify-end">
+        <Button
+          type="submit"
+          className="w-full sm:w-auto mt-2"
+          form={formId}
+          isLoading={isLoading}
+        >
+          Compartir
+        </Button>
+      </div>
     </div>
   )
 }
diff --git a/src/components/PostView.tsx b/src/components/PostView.tsx
index 0755cad..9da30e5 100644
--- a/src/components/PostView.tsx
+++ b/src/components/PostView.tsx
@@ -2,7 +2,7 @@
 import { FC } from "react"
 import { ExtendedPost, ExtendedComment } from "@/types/db"
 import { useSession } from "next-auth/react"
-import MiniCreateComment from "@/components/MiniCreateComment"
+import CreateComment from "@/components/CreateComment"
 import CommentFeed from "@/components/CommentFeed"
 import Post from "@/components/Post"
 
@@ -29,7 +29,7 @@ export const PostView: FC<PostViewProps> = ({ post, comments }) => {
         />
       </div>
       <div className="mt-4">
-        <MiniCreateComment session={session} postId={post.id} />
+        <CreateComment session={session} postId={post.id} />
       </div>
       <div className="mt-4">
         <CommentFeed
diff --git a/src/components/QuestionView.tsx b/src/components/QuestionView.tsx
index a17195a..114cf75 100644
--- a/src/components/QuestionView.tsx
+++ b/src/components/QuestionView.tsx
@@ -3,7 +3,7 @@ import { FC } from "react"
 import QuestionComponent from "@/components/QuestionComponent"
 import { ExtendedQuestion, ExtendedAnswer } from "@/types/db"
 import { useSession } from "next-auth/react"
-import MiniCreateAnswer from "@/components/MiniCreateAnswer"
+import CreateAnswer from "@/components/CreateAnswer"
 import AnswerFeed from "@/components/AnswerFeed"
 
 interface AnswersViewProps {
@@ -33,7 +33,7 @@ export const AnswersView: FC<AnswersViewProps> = ({ question, answers }) => {
         />
       </div>
       <div className="mt-4">
-        <MiniCreateAnswer
+        <CreateAnswer
           session={session}
           subjectId={question.subject.id}
           questionId={question.id}
diff --git a/src/lib/validators/question.ts b/src/lib/validators/question.ts
index 835df5b..5cba920 100644
--- a/src/lib/validators/question.ts
+++ b/src/lib/validators/question.ts
@@ -11,8 +11,8 @@ export const QuestionValidator = z.object({
 export const AnswerValidator = z.object({
   title: z
     .string()
-    .min(3, { message: "Content must be at least 3 characters long" })
-    .max(128, { message: "Content must be at most 2048 characters long" }),
+    .min(3, { message: "Title must be at least 3 characters long" })
+    .max(128, { message: "Title must be at most 2048 characters long" }),
   subjectId: z.string(),
   content: z.any(),
   questionId: z.string(),