diff --git a/apps/portal/src/components/resumes/CommentsSection.tsx b/apps/portal/src/components/resumes/CommentsSection.tsx
deleted file mode 100644
index d250e836..00000000
--- a/apps/portal/src/components/resumes/CommentsSection.tsx
+++ /dev/null
@@ -1,39 +0,0 @@
-import { useState } from 'react';
-import { Button, Tabs } from '@tih/ui';
-
-export default function CommentsSection() {
-  const [tab, setTab] = useState('general');
-
-  return (
-    <div>
-      <Button display="block" label="Add your review" variant="tertiary" />
-      <Tabs
-        label="comments"
-        tabs={[
-          {
-            label: 'General',
-            value: 'general',
-          },
-          {
-            label: 'Experience',
-            value: 'experience',
-          },
-          {
-            label: 'Education',
-            value: 'education',
-          },
-          {
-            label: 'Project',
-            value: 'project',
-          },
-          {
-            label: 'Skills',
-            value: 'skills',
-          },
-        ]}
-        value={tab}
-        onChange={(value) => setTab(value)}
-      />
-    </div>
-  );
-}
diff --git a/apps/portal/src/components/resumes/comments/CommentsForm.tsx b/apps/portal/src/components/resumes/comments/CommentsForm.tsx
new file mode 100644
index 00000000..7541dfb4
--- /dev/null
+++ b/apps/portal/src/components/resumes/comments/CommentsForm.tsx
@@ -0,0 +1,112 @@
+import type { FormEvent } from 'react';
+import { useRef, useState } from 'react';
+import { Button, Dialog, TextInput } from '@tih/ui';
+
+import { COMMENTS_SECTIONS } from './constants';
+
+type CommentsFormProps = Readonly<{
+  setShowCommentsForm: (show: boolean) => void;
+}>;
+
+export default function CommentsForm({
+  setShowCommentsForm,
+}: CommentsFormProps) {
+  const [showDialog, setShowDialog] = useState(false);
+  const formRef = useRef<HTMLFormElement | null>(null);
+
+  // TODO: Implement form validation. Disable Submit button until one input field is filled up
+  const onFormSubmit = async (event: FormEvent<HTMLFormElement>) => {
+    event.preventDefault();
+    if (!formRef.current) {
+      return;
+    }
+
+    const formData = new FormData(formRef.current);
+
+    COMMENTS_SECTIONS.forEach(({ value }) => {
+      const comment = (formData.get(value) as string | null)?.trim();
+
+      if (!comment) {
+        return;
+      }
+
+      // TODO: Store comment in database & handle errors
+      /* eslint-disable no-console */
+      console.log(`Storing ${value} comment ${comment} in database`);
+      /* eslint-enable no-console */
+    });
+
+    // TODO: Handle form submission success
+    // Show alert & goto CommentsList
+  };
+
+  // TODO: Form validation
+  // If form is empty, goto CommentsList
+  // If form not empty, show dialog
+  const onCancel = () => {
+    setShowDialog(true);
+  };
+
+  return (
+    <>
+      <h2 className="text-xl font-semibold text-gray-800">Add your review</h2>
+
+      <form
+        ref={formRef}
+        className="w-full space-y-8 divide-y divide-gray-200"
+        onSubmit={onFormSubmit}>
+        {/* TODO: Convert TextInput to TextArea */}
+        <div className="mt-4 space-y-4">
+          {COMMENTS_SECTIONS.map(({ label, value, placeholder }) => {
+            return (
+              <TextInput
+                key={value}
+                id={value}
+                label={label}
+                name={value}
+                placeholder={placeholder}
+                type="text"
+              />
+            );
+          })}
+        </div>
+
+        <div className="flex justify-end space-x-2 pt-4">
+          <Button
+            label="Cancel"
+            type="button"
+            variant="tertiary"
+            onClick={onCancel}
+          />
+
+          <Button label="Submit" type="submit" variant="primary" />
+        </div>
+      </form>
+
+      <Dialog
+        isShown={showDialog}
+        primaryButton={
+          <Button
+            display="block"
+            label="OK"
+            variant="primary"
+            onClick={() => setShowCommentsForm(false)}
+          />
+        }
+        secondaryButton={
+          <Button
+            display="block"
+            label="Cancel"
+            variant="tertiary"
+            onClick={() => setShowDialog(false)}
+          />
+        }
+        title="Are you sure you want to leave?"
+        onClose={() => {
+          setShowDialog(false);
+        }}>
+        <div>Note that your review will not be saved!</div>
+      </Dialog>
+    </>
+  );
+}
diff --git a/apps/portal/src/components/resumes/comments/CommentsList.tsx b/apps/portal/src/components/resumes/comments/CommentsList.tsx
new file mode 100644
index 00000000..397c9551
--- /dev/null
+++ b/apps/portal/src/components/resumes/comments/CommentsList.tsx
@@ -0,0 +1,32 @@
+import { useState } from 'react';
+import { Button, Tabs } from '@tih/ui';
+
+import { COMMENTS_SECTIONS } from './constants';
+
+type CommentsListProps = Readonly<{
+  setShowCommentsForm: (show: boolean) => void;
+}>;
+
+export default function CommentsList({
+  setShowCommentsForm,
+}: CommentsListProps) {
+  const [tab, setTab] = useState(COMMENTS_SECTIONS[0].value);
+
+  return (
+    <>
+      <Button
+        display="block"
+        label="Add your review"
+        variant="tertiary"
+        onClick={() => setShowCommentsForm(true)}
+      />
+      <Tabs
+        label="comments"
+        tabs={COMMENTS_SECTIONS}
+        value={tab}
+        onChange={(value) => setTab(value)}
+      />
+      {/* TODO: Add comments lists */}
+    </>
+  );
+}
diff --git a/apps/portal/src/components/resumes/comments/CommentsSection.tsx b/apps/portal/src/components/resumes/comments/CommentsSection.tsx
new file mode 100644
index 00000000..f032091e
--- /dev/null
+++ b/apps/portal/src/components/resumes/comments/CommentsSection.tsx
@@ -0,0 +1,14 @@
+import { useState } from 'react';
+
+import CommentsForm from './CommentsForm';
+import CommentsList from './CommentsList';
+
+export default function CommentsSection() {
+  const [showCommentsForm, setShowCommentsForm] = useState(false);
+
+  return showCommentsForm ? (
+    <CommentsForm setShowCommentsForm={setShowCommentsForm} />
+  ) : (
+    <CommentsList setShowCommentsForm={setShowCommentsForm} />
+  );
+}
diff --git a/apps/portal/src/components/resumes/comments/constants.ts b/apps/portal/src/components/resumes/comments/constants.ts
new file mode 100644
index 00000000..ebbe89d9
--- /dev/null
+++ b/apps/portal/src/components/resumes/comments/constants.ts
@@ -0,0 +1,28 @@
+// TODO: Move to a general enums/constants file? For resumes
+export const COMMENTS_SECTIONS = [
+  {
+    label: 'General',
+    placeholder: 'General comments about the resume',
+    value: 'general',
+  },
+  {
+    label: 'Education',
+    placeholder: 'Comments about the Education section',
+    value: 'education',
+  },
+  {
+    label: 'Experience',
+    placeholder: 'Comments about the Experience section',
+    value: 'experience',
+  },
+  {
+    label: 'Projects',
+    placeholder: 'Comments about the Projects section',
+    value: 'projects',
+  },
+  {
+    label: 'Skills',
+    placeholder: 'Comments about the Skills section',
+    value: 'skills',
+  },
+];