diff --git a/package-lock.json b/package-lock.json
index ba13a5f2..4f328779 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -7861,7 +7861,6 @@
       "version": "0.1.13",
       "resolved": "https://registry.npmjs.org/encoding/-/encoding-0.1.13.tgz",
       "integrity": "sha512-ETBauow1T35Y/WZMkio9jiM0Z5xjHHmJ4XmjZOq1l/dXz3lr2sRn87nJy20RupqSh1F2m3HHPSp8ShIPQJrJ3A==",
-      "dev": true,
       "optional": true,
       "dependencies": {
         "iconv-lite": "^0.6.2"
diff --git a/src/app/App.tsx b/src/app/App.tsx
index c09f1106..a17a6199 100644
--- a/src/app/App.tsx
+++ b/src/app/App.tsx
@@ -7,7 +7,7 @@ const Landing = lazy(() => import("../pages/landing"));
 const Home = lazy(() => import("../pages/home"));
 const Certification = lazy(() => import("../pages/certification/Certification"));
 const TestingHistory = lazy(() => import("../pages/testingHistory"));
-const ReportUpload = lazy(() => import("../pages/auditing/reportUpload/ReportUpload"))
+const ReportUpload = lazy(() => import("../pages/reportUpload"))
 const CertificationResult = lazy(() => import("../pages/certification/certification-result/CertificationResult"));
 
 const ComingSoon = () => (
diff --git a/src/components/CertificationMetadataForm/CertificationMetadataForm.tsx b/src/components/CertificationMetadataForm/CertificationMetadataForm.tsx
deleted file mode 100644
index 8c14c27b..00000000
--- a/src/components/CertificationMetadataForm/CertificationMetadataForm.tsx
+++ /dev/null
@@ -1,203 +0,0 @@
-import { useCallback, useEffect } from "react";
-
-import { Button } from "@mui/material";
-import AddCircleOutlineIcon from '@mui/icons-material/AddCircleOutline';
-
-import { Form } from "compositions/Form/Form";
-import { Input } from "compositions/Form/components/Input";
-import DAPPScript, { IInfo } from "components/DAPPScript/DAPPScript";
-import TextArea from "components/TextArea/TextArea";
-import { Option } from "components/Dropdown/Dropdown";
-import { useFieldArray } from "react-hook-form";
-import Dropdown from "components/Dropdown/Dropdown";
-
-export const fieldArrayName: string = "dAppScripts";
-
-interface IFieldInfo {
-  label: string;
-  type: string;
-  required: boolean;
-  id: string;
-  placeholder?: string;
-  minRows?: number;
-  maxRows?: number;
-  options?: Option[];
-  tooltipText?: string;
-}
-
-interface FieldConfig {
-  config: IFieldInfo;
-  componentType: string;
-  form: any;
-}
-
-export interface ICertificationMetadataForm {
-  commonField: FieldConfig[];
-  auditorInfo: FieldConfig[];
-  auditorReport: FieldConfig[];
-  addScripts: { scriptFields: IInfo[]; smartContractInfo: IInfo[] };
-}
-
-const Component = (props: FieldConfig) => {
-  const { id, ...rest } = props.config;
-
-  switch (props.componentType) {
-    case "text":
-      return (
-        <Input
-          id={props.config.id}
-          {...props.form.register(props.config.id)}
-          {...rest}
-        />
-      );
-    case "textarea":
-      return <TextArea {...props.form.register(props.config.id)} {...rest} />;
-    case "dropdown":
-      return (
-        <Dropdown
-          onOptionSelect={(option) =>
-            props.form.setValue(props.config.id, option.value, {
-              shouldValidate: true, // trigger on change validation manually
-            })
-          }
-          {...props.form.register(props.config.id)}
-          {...rest}
-        />
-      );
-    default:
-      return null;
-  }
-};
-
-const CertificationMetadataForm: React.FC<{
-  config: ICertificationMetadataForm;
-  submitting: boolean;
-  initData?: any;
-  form: any;
-  onSubmit: (data: any) => any;
-  onFormReset: () => void;
-}> = ({ config, submitting, initData = null, form, onSubmit, onFormReset }) => {
-  const { fields, append, remove } = useFieldArray({
-    control: form.control,
-    name: fieldArrayName,
-  });
-
-  const addNewDappScript = () => {
-    append(
-      {
-        scriptHash: "",
-        contractAddress: "",
-      },
-      { shouldFocus: true }
-    );
-  };
-
-  useEffect(() => {
-    // to be called only once initially
-    addNewDappScript();
-    // eslint-disable-next-line react-hooks/exhaustive-deps
-  }, []);
-
-  const initializeFormState = () => {
-    form.clearErrors(); // clear form errors
-    initData ? form.reset(initData) : form.reset();
-  };
-
-  useEffect(() => {
-    initializeFormState();
-    // initializeFormState() is to not to be triggered on every re-render of the dep-array below but whenever the form or userDetails is updated alone
-    // eslint-disable-next-line react-hooks/exhaustive-deps
-  }, [form, initData]);
-
-  const shouldDisableAddScriptButton = useCallback(() => {
-    return (
-      !!form?.formState.errors?.[fieldArrayName] || // disable button if errors associated with dynamic form exists
-      form
-        .getValues(fieldArrayName)
-        ?.some(
-          (field: { scriptHash: any; contractAddress: any }) =>
-            !field?.scriptHash || !field?.contractAddress
-        )
-    ); // prevent addition of new script boxes if the required field is empty
-  }, [form]);
-
-  return (
-    <Form form={form} onSubmit={onSubmit}>
-      {config.commonField.map((field, idx) => (
-        <Component
-          form={form}
-          componentType={field.componentType}
-          config={field.config}
-          key={`commonField-${idx}`}
-        />
-      ))}
-
-      {config.auditorInfo.length ? (
-        <div className="separator-label">Auditor Information</div>
-      ) : null}
-      {config.auditorInfo.map((field, idx) => (
-        <Component
-          form={form}
-          componentType={field.componentType}
-          config={field.config}
-          key={`auditorInfo-${idx}`}
-        />
-      ))}
-
-      {config.auditorReport.length ? (
-        <div className="separator-label">Audit Report</div>
-      ) : null}
-      {config.auditorReport.map((field, idx) => (
-        <Component
-          form={form}
-          componentType={field.componentType}
-          config={field.config}
-          key={`auditorReport-${idx}`}
-        />
-      ))}
-
-      <div className="separator-label">DApp Script</div>
-      <div className="relative">
-        <div className="absolute action-button addScript-btn">
-          <Button
-                type="button"
-                variant="contained" size="small"
-                onClick={addNewDappScript}
-                className="button text-sm"
-                startIcon={<AddCircleOutlineIcon />}
-                disabled={shouldDisableAddScriptButton()}
-            >Add Script</Button>
-        </div>
-
-        {fields.map((field, index) => (
-          <DAPPScript
-            key={field.id}
-            remove={remove}
-            value={field}
-            index={index}
-            fieldArrayName={fieldArrayName}
-            config={config.addScripts}
-          />
-        ))}
-      </div>
-
-      <div className="button-wrapper flex justify-center mt-[100px] mb-[20px] gap-[20px]">
-        <Button
-          type="button" 
-          variant="outlined" size="large"
-          className="button-outlined w-[200px]"
-          disabled={submitting}
-          onClick={onFormReset}
-        >Cancel</Button> 
-        <Button
-          type="submit" 
-          variant="contained" size="large"
-          className="button w-[200px]"
-          disabled={!form.formState.isValid}
-        >Submit</Button> 
-      </div>
-    </Form>
-  );
-};
-
-export default CertificationMetadataForm;
\ No newline at end of file
diff --git a/src/components/CertificationMetadataForm/components/AuditReportForm.tsx b/src/components/CertificationMetadataForm/components/AuditReportForm.tsx
new file mode 100644
index 00000000..c54efccf
--- /dev/null
+++ b/src/components/CertificationMetadataForm/components/AuditReportForm.tsx
@@ -0,0 +1,64 @@
+import React from "react";
+
+import { Box, Typography, Button, IconButton } from "@mui/material";
+import AddIcon from "@mui/icons-material/Add";
+import DeleteIcon from "@mui/icons-material/Delete";
+
+import Input from "compositions/InputGroup/components/Input";
+import Container from "compositions/InputGroup/components/Container";
+import { getReportField } from "../utils";
+
+import type { FormState, UseFormRegister, UseFormGetFieldState, FieldArrayWithId, UseFieldArrayAppend, UseFieldArrayRemove } from "react-hook-form";
+import type { ReportForm } from "../interface";
+
+import "../index.css";
+
+interface Props {
+  formState: FormState<ReportForm>;
+  register: UseFormRegister<ReportForm>;
+  getFieldState: UseFormGetFieldState<ReportForm>;
+  reportFields: FieldArrayWithId<ReportForm, "report", "id">[];
+  appendReport: UseFieldArrayAppend<ReportForm, "report">;
+  removeReport: UseFieldArrayRemove;
+  standalone?: boolean;
+}
+
+const AuditReportForm = (props: Props) => {
+  return (
+    <Container standalone={props.standalone}>
+      <Box className="flex flex-row pt-4">
+        <Typography variant="subtitle1" className="text-main flex-1">
+          Audit Report
+        </Typography>
+        <Button
+          variant="outlined" size="small" className="button-outlined-main"
+          startIcon={<AddIcon />} onClick={() => props.appendReport({ value: '' })}
+        >
+          Add URL
+        </Button>
+      </Box>
+      {props.reportFields.map((field, index) => (
+        <Box key={field.id} className="flex flex-row mt-4">
+          <Input
+            noGutter={true}
+            field={getReportField(index)}
+            formState={props.formState}
+            register={props.register}
+            getFieldState={props.getFieldState}
+          />
+          <Box className="ml-4 flex-0 pt-2">
+            <IconButton
+              color="error" className="border-solid border"
+              onClick={() => props.removeReport(index)}
+              disabled={index === 0}
+            >
+              <DeleteIcon />
+            </IconButton>
+          </Box>
+        </Box>
+      ))}
+    </Container>
+  );
+}
+
+export default AuditReportForm;
\ No newline at end of file
diff --git a/src/components/CertificationMetadataForm/components/FeedbackModal.tsx b/src/components/CertificationMetadataForm/components/FeedbackModal.tsx
new file mode 100644
index 00000000..0f828ed0
--- /dev/null
+++ b/src/components/CertificationMetadataForm/components/FeedbackModal.tsx
@@ -0,0 +1,44 @@
+import React from "react";
+
+import { Dialog, DialogTitle, DialogContent, DialogActions, Typography, CircularProgress, Button } from "@mui/material";
+
+import "../index.css";
+
+interface Props {
+  show: boolean;
+  loading: boolean;
+  success: boolean;
+  errorMessage: string|null;
+  onClose: () => void;
+}
+
+const FeedbackModal = (props: Props) => {
+  return (
+    <Dialog open={props.show} onClose={props.onClose}>
+      <DialogTitle>
+        {props.loading ? 'Submitting Auditor Report...' : null}
+        {props.success ? 'Successfully submitted Auditor Report' : null}
+        {props.errorMessage !== null ? 'Error submitting Auditor Report' : null}
+      </DialogTitle>
+      <DialogContent className="flex flex-col items-center">
+        {!props.loading ? (
+          <Typography>
+            {props.success ? 'Both off-chain and on-chain certificates will be downloaded at once now.' : null}
+            {props.errorMessage}
+          </Typography>
+        ) : (
+          <CircularProgress color="secondary" size={50} />
+        )}
+      </DialogContent>
+      {!props.loading && (
+        <DialogActions>
+          <Button variant="contained" className="button-contained-main" onClick={props.onClose}>
+            Close
+          </Button>
+        </DialogActions>
+      )}
+    </Dialog>
+  );
+}
+
+export default FeedbackModal;
\ No newline at end of file
diff --git a/src/components/CertificationMetadataForm/components/ReportScriptForm.tsx b/src/components/CertificationMetadataForm/components/ReportScriptForm.tsx
new file mode 100644
index 00000000..dbd146f3
--- /dev/null
+++ b/src/components/CertificationMetadataForm/components/ReportScriptForm.tsx
@@ -0,0 +1,120 @@
+import React from "react";
+
+import { Box, Grid, Paper, Typography, TextField, Button } from "@mui/material";
+import AddIcon from "@mui/icons-material/Add";
+import RemoveIcon from "@mui/icons-material/Remove";
+
+import InputGroup from "compositions/InputGroup";
+import Container from "compositions/InputGroup/components/Container";
+import { getScriptFields, getScriptContractFields } from "../utils";
+
+import type { FormState, UseFormRegister, UseFormGetFieldState, FieldArrayWithId, UseFieldArrayAppend, UseFieldArrayRemove } from "react-hook-form";
+import type { ReportForm } from "../interface";
+
+import "../index.css";
+
+interface Props {
+  formState: FormState<ReportForm>;
+  register: UseFormRegister<ReportForm>;
+  getFieldState: UseFormGetFieldState<ReportForm>;
+  scriptFields: FieldArrayWithId<ReportForm, "scripts", "id">[];
+  appendScript: UseFieldArrayAppend<ReportForm, "scripts">;
+  removeScript: UseFieldArrayRemove;
+  standalone?: boolean;
+}
+
+interface InstanceProps {
+  index: number;
+  formState: FormState<ReportForm>;
+  register: UseFormRegister<ReportForm>;
+  getFieldState: UseFormGetFieldState<ReportForm>;
+  onRemove: () => void;
+}
+
+const ReportScriptFormInstance = (props: InstanceProps) => {
+  return (
+    <Box className="p-4 mt-4 rounded-sm border-solid border-gray-inactive">
+      <Box className="flex flex-row items-center">
+        <Typography variant="subtitle2" className="text-main flex-1">
+          DAPP Script (#{props.index+1})
+        </Typography>
+        {props.index > 0 && (
+          <Button
+            variant="outlined" size="small" color="error" className="normal-case"
+            startIcon={<RemoveIcon />} onClick={props.onRemove}
+          >
+            Remove Script
+          </Button>
+        )}
+      </Box>
+      <Box className="mx-[-1em]">
+        <InputGroup
+          fields={getScriptFields(props.index)}
+          formState={props.formState}
+          register={props.register}
+          getFieldState={props.getFieldState}
+        />
+      </Box>
+      <Typography variant="subtitle2" className="text-main mt-2">
+        SmartContract Information
+      </Typography>
+      <Grid container spacing={2}>
+        <Grid item xs={6}>
+          <Box className="mx-[-1em]">
+            <InputGroup
+              fields={getScriptContractFields(props.index).slice(0,4)}
+              formState={props.formState}
+              register={props.register}
+              getFieldState={props.getFieldState}
+            />
+          </Box>
+        </Grid>
+        <Grid item xs={6}>
+          <Box className="mx-[-1em]">
+            <InputGroup
+              fields={getScriptContractFields(props.index).slice(4,7)}
+              formState={props.formState}
+              register={props.register}
+              getFieldState={props.getFieldState}
+            />
+          </Box>
+        </Grid>
+      </Grid>
+    </Box>
+  );
+}
+
+const ReportScriptForm = (props: Props) => (
+  <Container standalone={props.standalone}>
+    <Typography variant="subtitle1" className="text-main pt-4">
+      DAPP Scripts
+    </Typography>
+    {props.scriptFields.map((field, index) => (
+      <ReportScriptFormInstance
+        key={field.id}
+        index={index}
+        formState={props.formState}
+        register={props.register}
+        getFieldState={props.getFieldState}
+        onRemove={() => props.removeScript(index)}
+      />
+    ))}
+    <Box className="pt-4 text-right">
+      <Button
+        variant="outlined"
+        size="small"
+        className="button-outlined-main"
+        startIcon={<AddIcon />}
+        onClick={() => props.appendScript({
+          scriptHash: '',
+          contractAddress: '',
+          smartContractInfo: {}
+        })}
+      >
+        Add Script
+      </Button>
+    </Box>
+  </Container>
+);
+
+export default ReportScriptForm;
\ No newline at end of file
diff --git a/src/components/CertificationMetadataForm/index.css b/src/components/CertificationMetadataForm/index.css
new file mode 100644
index 00000000..431a4529
--- /dev/null
+++ b/src/components/CertificationMetadataForm/index.css
@@ -0,0 +1,5 @@
+@tailwind base;
+@tailwind components;
+@tailwind utilities;
+
+@layer components {}
\ No newline at end of file
diff --git a/src/components/CertificationMetadataForm/index.tsx b/src/components/CertificationMetadataForm/index.tsx
new file mode 100644
index 00000000..ce7aeefd
--- /dev/null
+++ b/src/components/CertificationMetadataForm/index.tsx
@@ -0,0 +1,159 @@
+import React, { useState, useEffect } from "react";
+import { useForm, useFieldArray } from "react-hook-form";
+
+import { Box, Grid, Paper, Button } from "@mui/material";
+import SendIcon from "@mui/icons-material/Send";
+
+import { sendReport } from "store/slices/reportUpload.slice";
+import { getResolver, getDefaultValues, getInformationFields, auditorFields } from "./utils";
+import { removeEmptyStringsDeep, exportObjectToJsonFile } from "utils/utils";
+import { useAppDispatch, useAppSelector } from "store/store";
+
+import InputGroup from "compositions/InputGroup";
+import Container from "compositions/InputGroup/components/Container";
+import AuditReportForm from "./components/AuditReportForm";
+import ReportScriptForm from "./components/ReportScriptForm";
+import FeedbackModal from "./components/FeedbackModal";
+
+import type { ReportForm } from "./interface";
+
+import "./index.css";
+
+interface Props {
+  uuid?: string;
+  standalone?: boolean;
+  isReviewCertification?: boolean;
+  onClose?: () => void;
+}
+
+const CertificationMetadataForm = (props: Props) => {
+  const dispatch = useAppDispatch();
+  const [showModal, setShowModal] = useState<boolean>(false);
+  const [submitted, setSubmitted] = useState<boolean>(false);
+  const { profile } = useAppSelector((state) => state.auth);
+  const { loading, success, errorMessage, onchain, offchain, subject, uuid } = useAppSelector((state) => state.reportUpload);
+
+  const { control, register, handleSubmit, getFieldState, formState } = useForm<ReportForm>({
+    defaultValues: getDefaultValues(profile), resolver: getResolver(props.isReviewCertification), mode: 'onBlur'
+  });
+  const { fields: scriptFields, append: appendScript, remove: removeScript } = useFieldArray({ name: 'scripts', control });
+  const { fields: reportFields, append: appendReport, remove: removeReport } = useFieldArray({ name: 'report', control });
+
+  useEffect(() => { if (submitted && success) setShowModal(true) }, [success, submitted]);
+  useEffect(() => { if (submitted && errorMessage !== null) setShowModal(true) }, [errorMessage, submitted]);
+
+  useEffect(() => {
+    if (onchain !== null && offchain !== null && submitted) {
+      exportObjectToJsonFile(offchain, `Off-Chain_${uuid ? uuid : subject}.json`);
+      exportObjectToJsonFile(onchain, `On-Chain_${uuid ? uuid : subject}.json`);
+      setSubmitted(false);
+    }
+  }, [onchain, offchain, subject, uuid, submitted]);
+
+  const onSubmit = (form: ReportForm) => {
+    setSubmitted(true);
+    const request = removeEmptyStringsDeep(form) as ReportForm;
+    dispatch(sendReport({
+      request: {
+        ...request,
+        certificationLevel: !props.isReviewCertification ? parseInt(request.certificationLevel) : undefined,
+        report: !props.isReviewCertification ? request.report.map(report => report.value) : undefined,
+      },
+      uuid: props.uuid
+    }));
+  }
+
+  const onCloseModal = () => {
+    if (!loading) {
+      setShowModal(false);
+      if (props.onClose) props.onClose();
+    }
+  }
+
+  return (
+    <>
+      <form onSubmit={handleSubmit(onSubmit)}>
+        <Grid container spacing={2}>
+          <Grid item md={12} lg={props.standalone ? 6 : 12}>
+            <InputGroup
+              title="Certification Information"
+              fields={getInformationFields(props.isReviewCertification)}
+              formState={formState}
+              register={register}
+              getFieldState={getFieldState}
+              standalone={props.standalone}
+            />
+            <Box className="mt-4">
+              <InputGroup
+                title="Auditor Information"
+                fields={auditorFields}
+                formState={formState}
+                register={register}
+                getFieldState={getFieldState}
+                standalone={props.standalone}
+              />
+            </Box>
+            {!props.isReviewCertification && (
+              <Box className="mt-4">
+                <AuditReportForm
+                  formState={formState}
+                  register={register}
+                  getFieldState={getFieldState}
+                  reportFields={reportFields}
+                  appendReport={appendReport}
+                  removeReport={removeReport}
+                  standalone={props.standalone}
+                />
+              </Box>
+            )}
+          </Grid>
+          <Grid item md={12} lg={props.standalone ? 6 : 12}>
+            <ReportScriptForm
+              formState={formState}
+              register={register}
+              getFieldState={getFieldState}
+              scriptFields={scriptFields}
+              appendScript={appendScript}
+              removeScript={removeScript}
+              standalone={props.standalone}
+            />
+            <Box className="mt-4">
+              <Container standalone={props.standalone}>
+                <Box className="pt-4 flex flex-row-reverse justify-between items-end">
+                  <Button
+                    variant="outlined" size="large"
+                    type="submit" className="button-outlined-highlighted"
+                    endIcon={<SendIcon />}
+                    disabled={loading}
+                  >
+                    Send Report
+                  </Button>
+                  {props.isReviewCertification && (
+                    <Button
+                      variant="outlined" size="large"
+                      className="normal-case" color="error"
+                      onClick={props.onClose}
+                      disabled={loading}
+                    >
+                      Cancel
+                    </Button>
+                  )}
+                </Box>
+              </Container>
+            </Box>
+          </Grid>
+        </Grid>
+      </form>
+
+      <FeedbackModal
+        show={loading||showModal}
+        success={success}
+        loading={loading}
+        errorMessage={errorMessage}
+        onClose={onCloseModal}
+      />
+    </>
+  );
+};
+
+export default CertificationMetadataForm;
\ No newline at end of file
diff --git a/src/components/CertificationMetadataForm/interface.ts b/src/components/CertificationMetadataForm/interface.ts
new file mode 100644
index 00000000..2a03feb9
--- /dev/null
+++ b/src/components/CertificationMetadataForm/interface.ts
@@ -0,0 +1,36 @@
+
+export interface ReportFormScript {
+  scriptHash: string;
+  contractAddress: string;
+  smartContractInfo: {
+    era?: string;
+    compiler?: string;
+    compilerVersion?: string;
+    optimizer?: string;
+    optimizerVersion?: string;
+    progLang?: string;
+    repository?: string;
+  };
+}
+
+export interface ReportForm {
+  certificationLevel: string;
+  summary: string;
+  disclaimer: string;
+  subject: string;
+  certificateIssuer: {
+    name: string;
+    logo?: string;
+    social: {
+      contact: string;
+      discord?: string;
+      twitter?: string;
+      github?: string;
+      website: string;
+    };
+  };
+  report: {
+    value: string;
+  }[];
+  scripts: ReportFormScript[];
+}
\ No newline at end of file
diff --git a/src/components/CertificationMetadataForm/utils/index.ts b/src/components/CertificationMetadataForm/utils/index.ts
new file mode 100644
index 00000000..2423f90f
--- /dev/null
+++ b/src/components/CertificationMetadataForm/utils/index.ts
@@ -0,0 +1,213 @@
+import { Field, FieldType } from "compositions/InputGroup/interface";
+import { buildFormResolver } from "compositions/InputGroup/utils";
+
+import type { ReportForm } from "../interface";
+import type { UserProfile } from "store/slices/auth.slice";
+import { Resolver } from "react-hook-form";
+
+const internalInformationFields: Field[] = [
+  {
+    label: 'Certification Level',
+    name: 'certificationLevel',
+    type: FieldType.Dropdown,
+    required: true,
+    options: [
+      { value: '0', label: 'L0 Audit' },
+      { value: '2', label: 'L2 Certification' },
+    ],
+  },
+  {
+    label: 'Summary',
+    name: 'summary',
+    type: FieldType.Text,
+    required: true,
+    textArea: true,
+  },
+  {
+    label: 'Disclaimer',
+    name: 'disclaimer',
+    type: FieldType.Text,
+    required: true,
+    textArea: true,
+  },
+  {
+    label: 'Subject',
+    name: 'subject',
+    type: FieldType.Subject,
+    required: true,
+    textArea: true,
+  },
+];
+
+const internalAuditorFields: Field[] = [
+  {
+    label: 'Name',
+    name: 'name',
+    type: FieldType.Subject,
+    required: true,
+  },
+  {
+    label: 'Logo',
+    name: 'logo',
+    type: FieldType.LogoUrl,
+  },
+];
+
+const internalAuditorSocialFields: Field[] = [
+  {
+    label: 'Email',
+    name: 'contact',
+    type: FieldType.Email,
+    required: true,
+  },
+  {
+    label: 'Website',
+    name: 'website',
+    type: FieldType.WebsiteUrl,
+    required: true,
+  },
+  {
+    label: 'GitHub',
+    name: 'github',
+    type: FieldType.GitHubUserName,
+  },
+  {
+    label: 'Discord',
+    name: 'discord',
+    type: FieldType.DiscordUrl,
+  },
+  {
+    label: 'Twitter',
+    name: 'twitter',
+    type: FieldType.TwitterHandle,
+  },
+];
+
+const internalReportField: Field = {
+  label: 'Report URL',
+  name: 'value',
+  type: FieldType.ReportUrl,
+  required: true,
+};
+
+const internalScriptFields: Field[] = [
+  {
+    label: 'Script Hash',
+    name: 'scriptHash',
+    type: FieldType.Hash,
+    required: true,
+  },
+  {
+    label: 'Contract Address',
+    name: 'contractAddress',
+    type: FieldType.ContractAddress,
+    required: true,
+  },
+];
+
+const internalScriptContractFields: Field[] = [
+  {
+    label: 'Era',
+    name: 'era',
+    type: FieldType.Text,
+  },
+  {
+    label: 'Compiler Version',
+    name: 'compilerVersion',
+    type: FieldType.Text,
+  },
+  {
+    label: 'Optimizer Version',
+    name: 'optimizerVersion',
+    type: FieldType.Text,
+  },
+  {
+    label: 'Repository URL',
+    name: 'repository',
+    type: FieldType.GitHubRepository,
+  },
+  {
+    label: 'Compiler',
+    name: 'compiler',
+    type: FieldType.Text,
+  },
+  {
+    label: 'Optimizer',
+    name: 'optimizer',
+    type: FieldType.Text,
+  },
+  {
+    label: 'Programming Language',
+    name: 'progLang',
+    type: FieldType.Text,
+  },
+];
+
+export const getResolver= (isReviewCertification?: boolean) => buildFormResolver<ReportForm>([
+  ...getInformationFields(isReviewCertification),
+  {
+    name: 'certificateIssuer',
+    type: FieldType.Object,
+    fields: [
+      ...internalAuditorFields,
+      {
+        name: 'social',
+        type: FieldType.Object,
+        fields: internalAuditorSocialFields,
+      },
+    ],
+  },
+  !isReviewCertification ? {
+    name: 'report',
+    type: FieldType.Array,
+    fields: [internalReportField],
+  } : null,
+  {
+    name: 'scripts',
+    type: FieldType.Array,
+    fields: [
+      ...internalScriptFields,
+      {
+        name: 'smartContractInfo',
+        type: FieldType.Object,
+        fields: internalScriptContractFields,
+      },
+    ],
+  },
+].filter(field => field !== null) as Field[]);
+
+export const getDefaultValues = (profile: UserProfile | null): ReportForm => ({
+  certificationLevel: '0',
+  summary: '',
+  disclaimer: '',
+  subject: '',
+  certificateIssuer: {
+    name: profile?.fullName || '',
+    social: {
+      contact: profile?.contactEmail || '',
+      website: profile?.website || '',
+      twitter: profile?.twitter || undefined
+    }
+  },
+  report: [{ value: '' }],
+  scripts: [{
+    scriptHash: '',
+    contractAddress: '',
+    smartContractInfo: {}
+  }]
+});
+
+export const getInformationFields = (isReviewCertification?: boolean) =>
+  !isReviewCertification ? internalInformationFields : internalInformationFields.filter(
+    field => field.name !== 'subject' && field.name !== 'certificationLevel')
+
+export const auditorFields = [
+  ...internalAuditorFields.map(f => ({ ...f, name: `certificateIssuer.${f.name}` })),
+  ...internalAuditorSocialFields.map(f => ({ ...f, name: `certificateIssuer.social.${f.name}` }))
+];
+
+export const getReportField = (index: number) => ({ ...internalReportField, name: `report.${index}.value` });
+
+export const getScriptFields = (index: number) => internalScriptFields.map(f => ({ ...f, name: `scripts.${index}.${f.name}` }));
+
+export const getScriptContractFields = (index: number) => internalScriptContractFields.map(f => ({ ...f, name: `scripts.${index}.smartContractInfo.${f.name}` }));
\ No newline at end of file
diff --git a/src/components/CreateCertificate/CreateCertificate.tsx b/src/components/CreateCertificate/CreateCertificate.tsx
index 056d6c63..58e0f1b8 100644
--- a/src/components/CreateCertificate/CreateCertificate.tsx
+++ b/src/components/CreateCertificate/CreateCertificate.tsx
@@ -10,7 +10,7 @@ import { useAppSelector } from "store/store";
 import { payFromWallet } from "store/slices/walletTransaction.slice";
 
 import Modal from "components/Modal/Modal";
-import CertificationMetadata from "pages/certification/components/CertificationMetadata/CertificationMetadata";
+import CertificationMetadataForm from "components/CertificationMetadataForm";
 
 import "./CreateCertificate.scss";
 
@@ -190,7 +190,11 @@ const CreateCertificate: React.FC<{ uuid: string; }> = ({ uuid }) => {
                 onCloseModal={()=> {}}
                 fullWidth
             >
-                <CertificationMetadata uuid={uuid} onCloseForm={onCloseMetadataForm}/>
+                <CertificationMetadataForm
+                    uuid={uuid}
+                    isReviewCertification={true}
+                    onClose={onCloseMetadataForm}
+                />
             </Modal>
         );
     }
diff --git a/src/components/DAPPScript/DAPPScript.scss b/src/components/DAPPScript/DAPPScript.scss
deleted file mode 100644
index bc761a53..00000000
--- a/src/components/DAPPScript/DAPPScript.scss
+++ /dev/null
@@ -1,49 +0,0 @@
-@import "styles/colors.scss";
-@import "styles/constants.scss";
-
-.script-item {
-  flex-direction: column;
-}
-
-.action-button {
-  top: -68px;
-  right: 20px;
-  background-color: $white;
-}
-
-.input-wrapper {
-  width: 100%;
-}
-
-.card-layout {
-  border-radius: $border-radius;
-  border: $border;
-  padding: 50px 20px 20px;
-  margin-top: 35px;
-}
-
-.addScript-btn {
-  bottom: -40px;
-  top: auto;
-}
-
-.card-padding {
-  padding-bottom: 20px;
-  padding-top: 50px;
-}
-
-.inner-separator-label {
-  margin: 20px 0 15px;
-  width: 100%;
-  color: #757575;
-}
-
-.smartcontract-info-section {
-  display: flex;
-  flex-wrap: wrap;
-  justify-content: space-between;
-
-  .input-wrapper {
-    width: 48%;
-  }
-}
diff --git a/src/components/DAPPScript/DAPPScript.tsx b/src/components/DAPPScript/DAPPScript.tsx
deleted file mode 100644
index 8107f63e..00000000
--- a/src/components/DAPPScript/DAPPScript.tsx
+++ /dev/null
@@ -1,93 +0,0 @@
-import { useEffect, useState } from "react";
-import { useFormContext } from "react-hook-form";
-import { Button } from "@mui/material";
-import RemoveCircleOutlineIcon from '@mui/icons-material/RemoveCircleOutline';
-
-// import Button from "components/Button/Button";
-import { Input } from "compositions/Form/components/Input";
-
-import "./DAPPScript.scss";
-
-export interface IInfo {
-  label: string;
-  type: string;
-  required: boolean;
-  id: string;
-}
-
-interface DAPPScriptProps {
-  remove: (index: number, options?: { shouldFocus: boolean }) => void;
-  value: { id: string };
-  index: number;
-  fieldArrayName: string;
-  config: { scriptFields: IInfo[]; smartContractInfo: IInfo[] };
-}
-
-const DAPPScript = ({
-  remove,
-  value,
-  index,
-  fieldArrayName,
-  config,
-}: DAPPScriptProps) => {
-  const { register, watch, formState: { errors } } = useFormContext();
-  const allScripts = watch(fieldArrayName);
-  const length = !allScripts ? 1 : allScripts.length;
-  const [error, setError] = useState<any>([]);
-
-  // Deeply nested errors to be captured on every component change
-  useEffect(() => {
-    if (errors?.[fieldArrayName]) {
-      setError(errors?.[fieldArrayName]);
-    } 
-  // eslint-disable-next-line react-hooks/exhaustive-deps
-  }, [errors?.[fieldArrayName]]);
-
-  return (
-    <div className="bordered card-layout card-padding" key={value.id}>
-      <div className="bordered script-item relative">
-        <div className="absolute action-button" style={{ right: 0 }}>
-          {length > 1 && (
-            <Button
-                type="button"
-                variant="outlined" size="small"
-                onClick={() => remove(index, { shouldFocus: true })}
-                className="button-outlined text-sm"
-                startIcon={<RemoveCircleOutlineIcon />}
-            >Remove Script</Button>
-          )}
-        </div>
-
-        {config.scriptFields.map((field, idx) => (
-          <Input
-            label={field.label}
-            type={field.type}
-            required={field.required}
-            id={`${field.id}-${value.id}`}
-            {...register(`${fieldArrayName}.${index}.${field.id}`)}
-            key={`scriptFields-${value.id}-${idx}`}
-            error={error?.[index]?.[field.id]?.message}
-          />
-        ))}
-
-        <div className="inner-separator-label">SmartContract Information</div>
-
-        <div className="smartcontract-info-section input-wrapper">
-          {config.smartContractInfo.map((field, idx) => (
-            <Input
-              label={field.label}
-              type={field.type}
-              required={field.required}
-              id={`${field.id}-${value.id}`}
-              {...register(`${fieldArrayName}.${index}.${field.id}`)}
-              key={`smartContractInfo-${value.id}-${idx}`}
-              error={error?.[index]?.[field.id]?.message}
-            />
-          ))}
-        </div>
-      </div>
-    </div>
-  );
-};
-
-export default DAPPScript;
\ No newline at end of file
diff --git a/src/components/NotAuthorized/NotAuthorized.scss b/src/components/NotAuthorized/NotAuthorized.scss
deleted file mode 100644
index 05ed511d..00000000
--- a/src/components/NotAuthorized/NotAuthorized.scss
+++ /dev/null
@@ -1,46 +0,0 @@
-.text-wrapper {
-    height: 100%;
-    display: flex;
-    flex-direction: column;
-    align-items: center;
-    justify-content: center;
-    text-align: center;
-    margin: 10rem;
-  }
-  
-  .title {
-    font-size: 5em;
-    font-weight: 700;
-    color: #ee4b5e;
-  }
-  
-  .subtitle {
-    font-size: 40px;
-    font-weight: 700;
-    color: #1fa9d6;
-  }
-  .isi {
-    font-size: 18px;
-    text-align: center;
-    margin: 30px;
-    padding: 20px;
-    color: white;
-  }
-  .buttons {
-    margin: 30px;
-    font-weight: 700;
-    border: 2px solid #ee4b5e;
-    text-decoration: none;
-    padding: 15px;
-    text-transform: uppercase;
-    color: #ee4b5e;
-    border-radius: 26px;
-    transition: all 0.2s ease-in-out;
-    display: inline-block;
-  
-    .buttons:hover {
-      background-color: #ee4b5e;
-      color: white;
-      transition: all 0.2s ease-in-out;
-    }
-  }
\ No newline at end of file
diff --git a/src/components/NotAuthorized/NotAuthorized.test.tsx b/src/components/NotAuthorized/NotAuthorized.test.tsx
deleted file mode 100644
index 9124cb08..00000000
--- a/src/components/NotAuthorized/NotAuthorized.test.tsx
+++ /dev/null
@@ -1,29 +0,0 @@
-import React from "react";
-import { render, screen } from "@testing-library/react";
-import { MemoryRouter } from "react-router-dom";
-import NotAuthorized from "./NotAuthorized";
-
-describe("NotAuthorized", () => {
-  test("renders the component with the correct content", () => {
-    render(
-      <MemoryRouter>
-        <NotAuthorized />
-      </MemoryRouter>
-    );
-
-    // Verify the presence of the title
-    const titleElement = screen.getByText(/403 - ACCESS DENIED/i);
-    expect(titleElement).toBeInTheDocument();
-
-    // Verify the presence of the subtitle
-    const subtitleElement = screen.getByText(
-      /Oops, You don't have permission/i
-    );
-    expect(subtitleElement).toBeInTheDocument();
-
-    // Verify the presence of the "Go to homepage" link
-    const linkElement = screen.getByRole("link", { name: /go to homepage/i });
-    expect(linkElement).toBeInTheDocument();
-    expect(linkElement).toHaveAttribute("href", "/");
-  });
-});
\ No newline at end of file
diff --git a/src/components/NotAuthorized/NotAuthorized.tsx b/src/components/NotAuthorized/NotAuthorized.tsx
deleted file mode 100644
index effbd75e..00000000
--- a/src/components/NotAuthorized/NotAuthorized.tsx
+++ /dev/null
@@ -1,23 +0,0 @@
-import React from "react";
-import { Link } from "react-router-dom";
-import "./NotAuthorized.scss";
-
-function NotAuthorized() {
-  return (
-    <div className="text-wrapper">
-      <div className="title" data-content="404">
-        403 - ACCESS DENIED
-      </div>
-
-      <div className="subtitle">
-        Oops, You don't have permission to access this page.
-      </div>
-
-      <div className="buttons">
-        <Link to="">Go to homepage</Link>
-      </div>
-    </div>
-  );
-}
-
-export default NotAuthorized;
\ No newline at end of file
diff --git a/src/components/Table/Table.tsx b/src/components/Table/Table.tsx
index a715d812..8ae1316b 100644
--- a/src/components/Table/Table.tsx
+++ b/src/components/Table/Table.tsx
@@ -127,7 +127,7 @@ const TableComponent: FC<any> = ({
         {showColViz && (
           <>
             <IconButton
-              className="absolute top-[-35px] right-0"
+              className="absolute top-[-48px] right-0"
               onClick={handleShowColVizMenu}
             >
               <GridViewIcon />
diff --git a/src/compositions/InputGroup/components/Container.tsx b/src/compositions/InputGroup/components/Container.tsx
new file mode 100644
index 00000000..e76fa601
--- /dev/null
+++ b/src/compositions/InputGroup/components/Container.tsx
@@ -0,0 +1,19 @@
+import React, { ReactNode } from "react";
+
+import { Box, Paper } from "@mui/material";
+
+import "../index.css";
+
+const Container = (props: {children: ReactNode, standalone?: boolean}) => {
+  return props.standalone ? (
+    <Paper elevation={0} className="shadow rounded-none px-4 pb-4">
+      {props.children}
+    </Paper>
+  ) : (
+    <Box className="px-4 pb-4">
+      {props.children}
+    </Box>
+  );
+}
+
+export default Container;
\ No newline at end of file
diff --git a/src/compositions/InputGroup/components/Input.tsx b/src/compositions/InputGroup/components/Input.tsx
new file mode 100644
index 00000000..a505983c
--- /dev/null
+++ b/src/compositions/InputGroup/components/Input.tsx
@@ -0,0 +1,32 @@
+import React from "react";
+
+import { TextField, MenuItem } from "@mui/material";
+
+import { FieldType } from '../interface';
+
+import type { InputProps } from '../interface';
+
+import "../index.css";
+
+const Input = (props: InputProps) => (
+  <TextField
+    fullWidth
+    type="text"
+    variant="outlined"
+    className={props.noGutter ? undefined : 'mt-4'}
+    label={`${props.field.label}${props.field.required ? ' *' : ''}`}
+    placeholder={props.field.placeholder}
+    select={props.field.type === FieldType.Dropdown}
+    multiline={props.field.textArea}
+    rows={props.field.textArea ? 4 : undefined}
+    error={props.getFieldState(props.field.name, props.formState).error !== undefined}
+    helperText={props.getFieldState(props.field.name, props.formState).error?.message}
+    { ...props.register(props.field.name, { required: props.field.required }) }
+  >
+    {(props.field.options || []).map(option =>
+      <MenuItem key={option.value} value={option.value}>{option.label}</MenuItem>
+    )}
+  </TextField>
+);
+
+export default Input;
\ No newline at end of file
diff --git a/src/compositions/InputGroup/index.css b/src/compositions/InputGroup/index.css
new file mode 100644
index 00000000..431a4529
--- /dev/null
+++ b/src/compositions/InputGroup/index.css
@@ -0,0 +1,5 @@
+@tailwind base;
+@tailwind components;
+@tailwind utilities;
+
+@layer components {}
\ No newline at end of file
diff --git a/src/compositions/InputGroup/index.tsx b/src/compositions/InputGroup/index.tsx
new file mode 100644
index 00000000..3d803f42
--- /dev/null
+++ b/src/compositions/InputGroup/index.tsx
@@ -0,0 +1,33 @@
+import React from "react";
+
+import { Typography } from "@mui/material";
+
+import Input from "./components/Input";
+import Container from "./components/Container";
+
+import type { InputGroupProps } from './interface';
+
+import "./index.css";
+
+const InputGroup = (props: InputGroupProps) => {
+  return (
+    <Container standalone={props.standalone}>
+      {props.title && (
+        <Typography variant="subtitle1" className="text-main pt-4">
+          {props.title}
+        </Typography>
+      )}
+      {props.fields.map((field, index) => (
+        <Input
+          key={index}
+          field={field}
+          formState={props.formState}
+          register={props.register}
+          getFieldState={props.getFieldState}
+        />
+      ))}
+    </Container>
+  );
+};
+
+export default InputGroup;
\ No newline at end of file
diff --git a/src/compositions/InputGroup/interface.ts b/src/compositions/InputGroup/interface.ts
new file mode 100644
index 00000000..97c4f412
--- /dev/null
+++ b/src/compositions/InputGroup/interface.ts
@@ -0,0 +1,51 @@
+import type { UseFormRegister, UseFormGetFieldState, FormState, FieldValues } from "react-hook-form";
+
+export enum FieldType {
+  Text,
+  Email,
+  Subject,
+  Hash,
+  CommitHash,
+  ContractAddress,
+  DiscordUrl,
+  WebsiteUrl,
+  ReportUrl,
+  LogoUrl,
+  TwitterHandle,
+  GitHubUserName,
+  GitHubRepository,
+  Dropdown,
+  Object,
+  Array,
+}
+
+export interface Field {
+  name: string;
+  type: FieldType;
+  label?: string;
+  placeholder?: string;
+  required?: boolean;
+  textArea?: boolean;
+  options?: {
+    label: string;
+    value: string;
+  }[];
+  fields?: Field[];
+}
+
+export interface InputGroupProps<T extends FieldValues = any> {
+  title?: string;
+  fields: Field[];
+  formState: FormState<T>;
+  register: UseFormRegister<T>;
+  getFieldState: UseFormGetFieldState<T>;
+  standalone?: boolean;
+}
+
+export interface InputProps<T extends FieldValues = any> {
+  field: Field;
+  formState: FormState<T>;
+  register: UseFormRegister<T>;
+  getFieldState: UseFormGetFieldState<T>;
+  noGutter?: boolean;
+}
\ No newline at end of file
diff --git a/src/compositions/InputGroup/utils/index.ts b/src/compositions/InputGroup/utils/index.ts
new file mode 100644
index 00000000..a0308131
--- /dev/null
+++ b/src/compositions/InputGroup/utils/index.ts
@@ -0,0 +1,46 @@
+import * as yup from "yup";
+import { yupResolver } from "@hookform/resolvers/yup";
+
+import { FieldType, Field } from "../interface";
+import * as Schema from "./schemas";
+
+import type { AnySchema, AnyObjectSchema } from "yup";
+import { FieldValues, Resolver } from "react-hook-form";
+
+const getFieldSchema = (fieldType: FieldType, required: boolean): AnySchema => {
+  let schema = Schema.Text;
+  switch (fieldType) {
+    case FieldType.Email: schema = Schema.Email; break;
+    case FieldType.Subject: schema = Schema.Subject; break;
+    case FieldType.Hash: schema = Schema.Hash; break;
+    case FieldType.CommitHash: schema = Schema.CommitHash; break;
+    case FieldType.ContractAddress: schema = Schema.ContractAddress; break;
+    case FieldType.DiscordUrl: schema = Schema.DiscordUrl; break;
+    case FieldType.WebsiteUrl: schema = Schema.WebsiteUrl; break;
+    case FieldType.ReportUrl: schema = Schema.ReportUrl; break;
+    case FieldType.LogoUrl: schema = Schema.LogoUrl; break;
+    case FieldType.TwitterHandle: schema = Schema.TwitterHandle; break;
+    case FieldType.GitHubUserName: schema = Schema.GitHubUserName; break;
+    case FieldType.GitHubRepository: schema = Schema.GitHubRepository; break;
+    case FieldType.Dropdown: schema = Schema.Dropdown; break;
+  }
+  return !required ? schema : schema.required('The field is required');
+};
+
+const buildSchema = (fields: Field[]): AnyObjectSchema => {
+  const schema = {} as {[key: string]: AnySchema};
+  for (const field of fields) {
+    if (field.type === FieldType.Object) {
+      schema[field.name] = buildSchema(field.fields || []);
+    } else if (field.type === FieldType.Array) {
+      schema[field.name] = yup.array().of(buildSchema(field.fields || []));
+    } else {
+      schema[field.name] = getFieldSchema(field.type, field.required !== undefined ? field.required : false);
+    }
+  }
+  return yup.object().shape(schema);
+};
+
+export function buildFormResolver<T extends FieldValues = any>(fields: Field[]): Resolver<T> {
+  return yupResolver(buildSchema(fields)) as Resolver<T>;
+}
\ No newline at end of file
diff --git a/src/compositions/InputGroup/utils/schemas.ts b/src/compositions/InputGroup/utils/schemas.ts
new file mode 100644
index 00000000..f45aa372
--- /dev/null
+++ b/src/compositions/InputGroup/utils/schemas.ts
@@ -0,0 +1,78 @@
+import * as yup from "yup";
+
+export const Text = yup.string();
+
+export const Email = yup.string()
+  .email('The field value must be a valid email address');
+
+export const Subject = yup.string()
+  .max(64, 'The field value must be up to 64 characters')
+  .matches(/^[A-Za-z0-9_]{0,64}$/, {
+    message: 'The field value can only contains alphabetical and numeric characters',
+    excludeEmptyString: true
+  });
+
+export const Hash = yup.string()
+  .length(64, 'The field value must be a valid hash with 64 characters')
+  .matches(/[0-9a-fA-F]{1,64}/, {
+    message: 'The field value must be a valid hash with 64 characters',
+    excludeEmptyString: true
+  });
+
+export const CommitHash = yup.string()
+  .min(7, 'The field value must be at least 7 characters of the commit hash')
+  .max(40, 'The field value must has more than 40 characters')
+  .matches(/^[a-f0-9]{7,40}$/, {
+    message: 'The field value must be a valid commit hash',
+    excludeEmptyString: true
+  });
+
+export const ContractAddress = yup.string()
+  .matches(/^(addr_test1|addr1)[a-zA-Z0-9]{53,}$/, {
+    message: 'The field value must be a valid contract address',
+    excludeEmptyString: true
+  });
+
+export const DiscordUrl = yup.string()
+  .matches(/^(?:https?:\/\/)?discord(?:\.gg|app\.com\/invite|\.com\/invite)\/[\w-]+$/, {
+    message: 'The field value must be a valid Discord URL',
+    excludeEmptyString: true 
+  });
+
+export const WebsiteUrl = yup.string()
+  .matches(/^(https?:\/\/)?(www\.)?[-a-zA-Z0-9@:%._\+~#=]{1,255}\.[a-z]{2,6}(\b([-a-zA-Z0-9@:%_\+.~#()?&\/\/=]*))?$/, {
+    message: 'The field value must be a valid URL',
+    excludeEmptyString: true 
+  });
+
+export const ReportUrl = yup.string()
+  .matches(/^((^(?!,)|(?!^),\s?)((ipfs:\/\/(Qm[1-9A-HJ-NP-Za-km-z]{44,}|b[A-Za-z2-7]{58,}|B[A-Z2-7]{58,}|z[1-9A-HJ-NP-Za-km-z]{48,}|F[0-9A-F]{50,})([\/?#][-a-zA-Z0-9@:%_+.~#?&\/=]*)*)|((https?:\/\/(?:www\.|(?!www))[a-zA-Z0-9][a-zA-Z0-9-]+[a-zA-Z0-9]\.[^\s]{2,}|www\.[a-zA-Z0-9][a-zA-Z0-9-]+[a-zA-Z0-9]\.[^\s]{2,}|https?:\/\/(?:www\.|(?!www))[a-zA-Z0-9]+\.[^\s]{2,}|www\.[a-zA-Z0-9]+\.[^\s]{2,})(\.(?:json|pdf))?)))+$/, {
+    message: 'The field value must be a website link to JSON/PDF file and/or the ipfs:// link to the report',
+    excludeEmptyString: true 
+  });
+
+export const LogoUrl = yup.string()
+  .matches(/^(https?:\/\/)?(www\.)?[-a-zA-Z0-9@:%._\+~#=]{1,255}\.[a-z]{2,6}(\b([-a-zA-Z0-9@:%_\+.~#()?&\/\/=]*))?\.(?:jpg|jpeg|png|gif|bmp|svg|webp|tiff|tif)$/, {
+    message: 'The field value must be a valid URL to a jpg/jpeg/png/gif/bmp/svg/webp/tiff/tif file',
+    excludeEmptyString: true 
+  });
+
+export const TwitterHandle = yup.string()
+  .matches(/^\w{1,15}$/, {
+    message: 'The field value must be a valid Twitter handle',
+    excludeEmptyString: true 
+  });
+
+export const GitHubUserName = yup.string()
+  .matches(/^(?=.{1,39}$)[a-zA-Z0-9]+(-[a-zA-Z0-9]+)*$/, {
+    message: 'The field value must be a valid GitHub username',
+    excludeEmptyString: true 
+  });
+
+export const GitHubRepository = yup.string()
+  .matches(/^https:\/\/github\.com\/[a-zA-Z0-9-]+\/[a-zA-Z0-9-]+(?:\/)?$/, {
+    message: 'The field value must be a valid GitHub repository URL',
+    excludeEmptyString: true 
+  });
+
+export const Dropdown = yup.string();
\ No newline at end of file
diff --git a/src/pages/auditing/Auditing.tsx b/src/pages/auditing/Auditing.tsx
deleted file mode 100644
index 7cf21ccf..00000000
--- a/src/pages/auditing/Auditing.tsx
+++ /dev/null
@@ -1,6 +0,0 @@
-import ReportUpload from "./reportUpload/ReportUpload";
-
-const Auditing = () => {
-    return <ReportUpload />
-}
-export default Auditing;
\ No newline at end of file
diff --git a/src/pages/auditing/reportUpload/ReportUpload.scss b/src/pages/auditing/reportUpload/ReportUpload.scss
deleted file mode 100644
index 503c1937..00000000
--- a/src/pages/auditing/reportUpload/ReportUpload.scss
+++ /dev/null
@@ -1,11 +0,0 @@
-#auditReportUploadContainer {
-  max-width: 760px;
-  margin: 50px auto 0;
-  .separator-label {
-    margin: 50px 0 20px;
-  }
-
-  .bordered {
-    max-width: 100%;
-  }
-}
diff --git a/src/pages/auditing/reportUpload/ReportUpload.tsx b/src/pages/auditing/reportUpload/ReportUpload.tsx
deleted file mode 100644
index df09f803..00000000
--- a/src/pages/auditing/reportUpload/ReportUpload.tsx
+++ /dev/null
@@ -1,186 +0,0 @@
-import { useEffect, useState } from "react";
-import { useForm } from "hooks/useForm";
-import { useNavigate } from "react-router-dom";
-
-import Toast from "components/Toast/Toast";
-import { reportUploadSchema } from "./reportUpload.schema";
-
-import { useAppDispatch, useAppSelector } from "store/store";
-import { IScriptObject, OffChainMetadataSchema } from "./reportUpload.interface";
-import { fetchData } from "api/api";
-import Modal from "components/Modal/Modal";
-import { exportObjectToJsonFile, transformEmptyStringToNullInObj } from "utils/utils";
-import { RootState } from "store/rootReducer";
-import { fetchProfile } from "store/slices/auth.slice";
-
-import "./ReportUpload.scss";
-import CertificationMetadataForm from "components/CertificationMetadataForm/CertificationMetadataForm";
-import { REPORT_UPLOAD_FIELDS } from "./config";
-
-export const fieldArrayName: string = "dAppScripts";
-
-const ReportUpload = () => {
-  const navigate = useNavigate();
-  const dispatch = useAppDispatch();
-  const { profile }  = useAppSelector((state: RootState) => state.auth);
-  const [openModal, setOpenModal] = useState(false);
-  const [submitting, setSubmitting] = useState(false);
-
-  useEffect(() => {
-    // to be called only once initially
-    dispatch(fetchProfile({}));
-  // eslint-disable-next-line react-hooks/exhaustive-deps
-  }, [])
-
-  // eslint-disable-next-line
-  const [showError, setShowError] = useState("");
-
-  const form = useForm({
-    schema: reportUploadSchema,
-    mode: "all", // trigger validation for onBlur and onChange events
-  });
-
-  const onCloseModal = () => {
-    setOpenModal(false);
-    navigate(-1);
-  };
-
-  const transformDappScripts = (scripts: []) => {
-    const formattedScripts: IScriptObject[] = [];
-    scripts.forEach((script: any) => {
-      const { scriptHash, contractAddress, ...rest } = script;
-      formattedScripts.push({
-        scriptHash: scriptHash,
-        ...(contractAddress && { contractAddress: contractAddress }),
-        smartContractInfo: {
-          ...transformEmptyStringToNullInObj(rest),
-        },
-      });
-    });
-    return formattedScripts;
-  };
-
-  const formHandler = async (formData: any) => {
-    const {
-      subject,
-      certificationLevel,
-      name,
-      logo,
-      email,
-      discord,
-      github,
-      website,
-      twitter,
-      reportURL,
-      summary,
-      disclaimer,
-      dAppScripts,
-    } = formData;
-
-    const formattedDappScripts: IScriptObject[] =
-      transformDappScripts(dAppScripts);
-
-    const payload: OffChainMetadataSchema = {
-      subject: subject,
-      schemaVersion: 1,
-      certificationLevel: parseInt(certificationLevel),
-      certificateIssuer: {
-        name: name,
-        ...(logo && { logo: logo }),
-        social: {
-          contact: email,
-          website: website,
-          ...(discord && { discord: discord }),
-          ...(twitter && { twitter: twitter }),
-          ...(github && { github: github })
-        },
-      },
-      report: reportURL.replace(/\s+/g, "").split(","),
-      summary: summary,
-      disclaimer: disclaimer,
-      scripts: formattedDappScripts,
-    };
-
-    setSubmitting(true);
-
-    await fetchData
-      .post("/auditor/reports", payload)
-      .then(response => {
-        if (response.status === 204) {
-          throw Error()
-        }
-        if (response?.data) {
-          setShowError("");
-          setOpenModal(true);
-          exportObjectToJsonFile(response.data.offchain, "Off-Chain_" + subject + ".json");
-          exportObjectToJsonFile(response.data.onchain, "On-Chain_" + subject + ".json");
-        }
-        setSubmitting(false);
-      })
-      .catch((errorObj) => {
-        let errorMsg = "Something went wrong. Please try again.";
-        if (errorObj?.response?.data) {
-          errorMsg =
-            (errorObj.response.statusText || 'Error') + " - " + errorObj.response.data;
-        }
-        setShowError(errorMsg);
-        const timeout = setTimeout(() => { clearTimeout(timeout); setShowError("") }, 5000)
-        setSubmitting(false)
-    })
-  };
-
-  const initializeFormState = () => {
-    form.clearErrors(); // clear form errors
-    
-    const { twitter, website } = profile!; // TBD - subject, name, contact
-    let formData: any = { twitter, website }
-    setSubmitting(false)
-    form.reset(formData)
-  }
-
-  useEffect(() => {
-    if (profile !== null) initializeFormState()
-    // initializeFormState() is to not to be triggered on every re-render of the dep-array below but whenever the form or userDetails is updated alone
-  // eslint-disable-next-line react-hooks/exhaustive-deps
-  }, [profile, form]);
-
-
-  return (
-    <>
-      <h2>Upload an Audit Report</h2>
-      <div id="auditReportUploadContainer" className="certificate-metadata-form">
-        <CertificationMetadataForm
-          config={REPORT_UPLOAD_FIELDS as any}
-          submitting={submitting}
-          // initData={{
-          //   twitter: profile?.twitter,
-          //   website: profile?.website,
-          // }}
-          form={form}
-          onSubmit={formHandler}
-          onFormReset={() => {
-            form.reset();
-          }}
-        />
-      </div>
-
-      {showError ? <Toast message={showError} /> : null}
-
-      <Modal
-        open={openModal}
-        title="Auditor Report Uploaded"
-        onCloseModal={onCloseModal}
-        modalId="subscriptionSuccessModal"
-      >
-        <p style={{ marginBottom: "2rem" }}>
-          Successfully submitted Auditor Report. <br />
-          <br />
-          Both off-chain and on-chain certificates will be downloaded at once
-          now.
-        </p>
-      </Modal>
-    </>
-  );
-};
-
-export default ReportUpload;
\ No newline at end of file
diff --git a/src/pages/auditing/reportUpload/config.ts b/src/pages/auditing/reportUpload/config.ts
deleted file mode 100644
index d459ce5a..00000000
--- a/src/pages/auditing/reportUpload/config.ts
+++ /dev/null
@@ -1,185 +0,0 @@
-export const REPORT_UPLOAD_FIELDS = {
-    commonField: [
-      {
-        config: {
-          options: [
-            {
-              label: "L0 Audit",
-              value: 0,
-            },
-            {
-              label: "L2 Certification",
-              value: 2,
-            },
-          ],
-          placeholder: "Certification Level",
-          required: true,
-          id: "certificationLevel",
-        },
-        componentType: "dropdown",
-      },
-      {
-        config: {
-          placeholder: "Summary",
-          required: true,
-          minRows: 4,
-          maxRows: 4,
-          id: "summary",
-        },
-        componentType: "textarea",
-      },
-      {
-        config: {
-          placeholder: "Disclaimer",
-          required: true,
-          minRows: 4,
-          maxRows: 4,
-          id: "disclaimer",
-        },
-        componentType: "textarea",
-      },
-      {
-        config: {
-          placeholder: "Subject",
-          required: true,
-          maxRows: 2,
-          id: "subject",
-        },
-        componentType: "textarea",
-      },
-    ],
-    auditorInfo: [
-      {
-        config: {
-          label: "Name",
-          type: "text",
-          id: "name",
-          required: true,
-        },
-        componentType: "text",
-      },
-      {
-        config: {
-          label: "Email",
-          type: "text",
-          id: "email",
-          required: true,
-        },
-        componentType: "text",
-      },
-      {
-        config: {
-          label: "Website",
-          type: "text",
-          id: "website",
-          required: true,
-        },
-        componentType: "text",
-      },
-      {
-        config: {
-          label: "Logo",
-          type: "text",
-          id: "logo",
-        },
-        componentType: "text",
-      },
-      {
-        config: {
-          label: "Github",
-          type: "text",
-          id: "github",
-        },
-        componentType: "text",
-      },
-      {
-        config: {
-          label: "Discord",
-          type: "text",
-          id: "discord",
-        },
-        componentType: "text",
-      },
-      {
-        config: {
-          label: "Twitter",
-          type: "text",
-          id: "twitter",
-        },
-        componentType: "text",
-      },
-    ],
-    auditorReport: [
-      {
-        config: {
-          placeholder: "Report URLs",
-          required: true,
-          maxRows: 2,
-          id: "reportURL",
-          tooltipText:
-            "Enter comma(,) separatated JSON/PDF URLs or IPFS link corresponding to the report",
-        },
-        componentType: "textarea",
-      },
-    ],
-    addScripts: {
-      scriptFields: [
-        {
-          label: "Script Hash",
-          type: "text",
-          required: true,
-          id: "scriptHash",
-        },
-        {
-          label: "Contract Address",
-          type: "text",
-          required: false,
-          id: "contractAddress",
-        },
-      ],
-      smartContractInfo: [
-        {
-          label: "Era",
-          type: "text",
-          required: false,
-          id: "era",
-        },
-        {
-          label: "Complier",
-          type: "text",
-          required: false,
-          id: "compiler",
-        },
-        {
-          label: "Compiler Version",
-          type: "text",
-          required: false,
-          id: "compilerVersion",
-        },
-        {
-          label: "Optimizer",
-          type: "text",
-          required: false,
-          id: "optimizer",
-        },
-        {
-          label: "Optimizer Version",
-          type: "text",
-          required: false,
-          id: "optimizerVersion",
-        },
-        {
-          label: "Programming Language",
-          type: "text",
-          required: false,
-          id: "progLang",
-        },
-        {
-          label: "Repository URL",
-          type: "text",
-          required: false,
-          id: "repoUrl",
-        },
-      ],
-    },
-  };
\ No newline at end of file
diff --git a/src/pages/auditing/reportUpload/reportUpload.interface.ts b/src/pages/auditing/reportUpload/reportUpload.interface.ts
deleted file mode 100644
index 1ad6ba48..00000000
--- a/src/pages/auditing/reportUpload/reportUpload.interface.ts
+++ /dev/null
@@ -1,40 +0,0 @@
-export interface IAuditReport {
-    name: string
-}
-
-export interface IScriptObject {
-    smartContractInfo: {
-      era?: string;
-      compiler?: string;
-      compilerVersion?: string;
-      optimizer?: string;
-      optimizerVersion?: string;
-      progLang?: string;
-      repository?: string;
-    },
-    scriptHash: string;
-    contractAddress?: string;
-  }
-
-export interface OffChainMetadataSchema {
-    subject: any;
-    schemaVersion: number;
-    certificationLevel: number;
-    certificateIssuer: {
-        name: any;
-        logo?: any;
-        social: {
-            contact: any;
-            discord?: any;
-            twitter?: any;
-            github?: any;
-            website: any;
-        };
-    };
-    report: {
-        reportURLs: any;
-    };
-    summary: any;
-    disclaimer: any;
-    scripts: IScriptObject[];
-}
\ No newline at end of file
diff --git a/src/pages/auditing/reportUpload/reportUpload.schema.tsx b/src/pages/auditing/reportUpload/reportUpload.schema.tsx
deleted file mode 100644
index a7a25212..00000000
--- a/src/pages/auditing/reportUpload/reportUpload.schema.tsx
+++ /dev/null
@@ -1,96 +0,0 @@
-import * as yup from "yup";
-
-export const FILE_SIZE = 5;
-export const SUPPORTED_FORMATS = [".pdf"];
-export const allowedTypes = ["application/pdf"];
-
-export const reportUploadSchema = yup.object().shape({
-  certificationLevel: yup.string().required("This field is required"),
-  summary: yup
-    .string()
-    .required("This field is required"),
-  disclaimer: yup
-    .string()
-    .required("This field is required"),
-  subject: yup
-    .string()
-    .required("This field is required")
-    .max(64, "Please enter a valid subject with upto 64 characters")
-    .matches(/^[A-Za-z0-9_]+$/, "Please enter a valid subject (that has a-z, A-Z, 0-9 or _ characters only)."),
-  name: yup.string().required("This field is required")
-    .max(64, "Please enter a valid name with upto 64 characters"),
-  email: yup
-    .string()
-    .required("This field is required")
-    .email("Please enter a valid email address"),
-  discord: yup
-    .string()
-    .matches(
-      /^(?:https?:\/\/)?discord(?:\.gg|app\.com\/invite|\.com\/invite)\/[\w-]+$/, {
-        message: "Please enter a valid discord URL",
-        excludeEmptyString: true 
-      }
-    ),
-  logo: yup
-    .string()
-    .matches(
-      /^(https?:\/\/)?(www\.)?[-a-zA-Z0-9@:%._\+~#=]{1,255}\.[a-z]{2,6}(\b([-a-zA-Z0-9@:%_\+.~#()?&\/\/=]*))?\.(?:jpg|jpeg|png|gif|bmp|svg|webp|tiff|tif)$/, {
-        message: "Please enter a valid URL to a jpg/jpeg/png/gif/bmp/svg/webp/tiff/tif file",
-        excludeEmptyString: true 
-      }
-    ),
-  twitter: yup
-    .string().when("twitter", (value) => {
-      if (value) {
-        return yup.string().matches(/^\w{1,15}$/, {
-          message: "Please enter a valid twitter handle",
-          excludeEmptyString: true 
-        })
-      } else {
-        return yup.string().transform((val, originalVal) => !val ? null : originalVal).nullable().optional()
-      }
-    }),
-  website: yup
-    .string()
-    .required("This field is required")
-    .matches(
-      /^(https?:\/\/)?(www\.)?[-a-zA-Z0-9@:%._\+~#=]{1,255}\.[a-z]{2,6}(\b([-a-zA-Z0-9@:%_\+.~#()?&\/\/=]*))?$/,
-      "Please enter a valid URL."
-    ),
-  github: yup
-    .string()
-    .matches(/^(?=.{1,39}$)[a-zA-Z0-9]+(-[a-zA-Z0-9]+)*$/, {
-      message: "Please enter a valid GitHub username",
-      excludeEmptyString: true,
-    }),
-  reportURL: yup.string().required("This field is required")
-    .matches(/^((^(?!,)|(?!^),\s?)((ipfs:\/\/(Qm[1-9A-HJ-NP-Za-km-z]{44,}|b[A-Za-z2-7]{58,}|B[A-Z2-7]{58,}|z[1-9A-HJ-NP-Za-km-z]{48,}|F[0-9A-F]{50,})([\/?#][-a-zA-Z0-9@:%_+.~#?&\/=]*)*)|((https?:\/\/(?:www\.|(?!www))[a-zA-Z0-9][a-zA-Z0-9-]+[a-zA-Z0-9]\.[^\s]{2,}|www\.[a-zA-Z0-9][a-zA-Z0-9-]+[a-zA-Z0-9]\.[^\s]{2,}|https?:\/\/(?:www\.|(?!www))[a-zA-Z0-9]+\.[^\s]{2,}|www\.[a-zA-Z0-9]+\.[^\s]{2,})(\.(?:json|pdf))?)))+$/, "Please enter website links to JSON/PDF file and/or the ipfs:// link to the report"),
-  dAppScripts: yup.array().of(
-    yup.object({
-      scriptHash: yup
-        .string()
-        .required("This field is required")
-        .max(64, "Please enter a valid script hash with 64 characters.")
-        .matches(/[0-9a-fA-F]{64}/, "Please enter a valid script hash with 64 characters"),
-      contractAddress: yup
-        .string()
-        .matches(/^(addr_test1|addr1)[a-zA-Z0-9]{53,}$/, {
-          message: "Please enter a valid script address",
-          excludeEmptyString: true
-        }),
-      era: yup.string(),
-      compiler: yup.string(),
-      compilerVersion: yup.string(),
-      optimizer: yup.string(),
-      optimizerVersion: yup.string(),
-      progLang: yup.string(),
-      repoUrl: yup.string()
-        .matches(
-          /^(?:https?:\/\/)?(?:www\.)?github\.com\/[\w-]+\/[\w.-]+$/, {
-            message: "Please enter a valid GitHub repository URL",
-            excludeEmptyString: true 
-          }
-        )
-    })
-  ),
-}, [["twitter", "twitter"]]);
diff --git a/src/pages/certification/components/AuditorRunTestForm/AuditorRunTestForm.tsx b/src/pages/certification/components/AuditorRunTestForm/AuditorRunTestForm.tsx
index e9dd8cfa..369772d3 100644
--- a/src/pages/certification/components/AuditorRunTestForm/AuditorRunTestForm.tsx
+++ b/src/pages/certification/components/AuditorRunTestForm/AuditorRunTestForm.tsx
@@ -191,6 +191,8 @@ const AuditorRunTestForm: React.FC<IAuditorRunTestForm> = ({
               repo: username + "/" + repoName
             });
           }
+        } else {
+          handleError(response)
         }
       } catch (e) {
         handleError(e);
diff --git a/src/pages/certification/components/CertificationMetadata/CertificationMetadata.scss b/src/pages/certification/components/CertificationMetadata/CertificationMetadata.scss
deleted file mode 100644
index 6531cf2d..00000000
--- a/src/pages/certification/components/CertificationMetadata/CertificationMetadata.scss
+++ /dev/null
@@ -1,18 +0,0 @@
-.certificate-metadata-form {
-    max-width: 760px;
-  
-    .separator-label {
-      margin: 50px 0 20px;
-    }
-  
-    .bordered {
-      max-width: 100%;
-    }
-  
-    .button-wrapper {
-      margin-top: 65px;
-      display: flex;
-      justify-content: center;
-      gap: 20px;
-    }
-  }
\ No newline at end of file
diff --git a/src/pages/certification/components/CertificationMetadata/CertificationMetadata.tsx b/src/pages/certification/components/CertificationMetadata/CertificationMetadata.tsx
deleted file mode 100644
index ce38b4a3..00000000
--- a/src/pages/certification/components/CertificationMetadata/CertificationMetadata.tsx
+++ /dev/null
@@ -1,160 +0,0 @@
-import { useState } from "react";
-import { useForm } from "hooks/useForm";
-
-import Toast from "components/Toast/Toast";
-import { certificationMetadataSchema } from "./certificationMetadata.schema";
-import "./CertificationMetadata.scss";
-import { useAppSelector } from "store/store";
-import {
-  IScriptObject,
-  OffChainMetadataSchema,
-} from "./certificationMetadata.interface";
-import { fetchData } from "api/api";
-import Modal from "components/Modal/Modal";
-import { exportObjectToJsonFile, transformEmptyStringToNullInObj } from "utils/utils";
-import { CERTIFICATION_METADATA_FIELDS } from "./config";
-import CertificationMetadataForm from "components/CertificationMetadataForm/CertificationMetadataForm";
-
-export const fieldArrayName: string = "dAppScripts";
-
-const CertificationMetadata: React.FC<{
-    uuid: string,
-    onCloseForm: () => void
-}> = ({uuid = "", onCloseForm}) => {
-  const { profile } = useAppSelector((state: any) => state.auth);
-  const [openModal, setOpenModal] = useState(false);
-  const [submitting, setSubmitting] = useState(false);
-
-  // eslint-disable-next-line
-  const [showError, setShowError] = useState("");
-
-  const form = useForm({
-    schema: certificationMetadataSchema,
-    mode: "all", // trigger validation for onBlur and onChange events
-  });
-
-  const onCloseModal = () => {
-    setOpenModal(false);
-    onCloseForm()
-  };
-
-  const transformDappScripts = (scripts: IScriptObject[]) => {
-    return scripts.map((script: any) => {
-      const { scriptHash, contractAddress, ...rest } = script;
-      return({
-        scriptHash: scriptHash,
-        ...(contractAddress && { contractAddress: contractAddress }),
-        smartContractInfo: {
-          ...transformEmptyStringToNullInObj(rest),
-        },
-      });
-    });
-  };
-
-  const formHandler = async (formData: any) => {
-    const {
-      subject,
-      name,
-      logo,
-      email,
-      website,
-      twitter,
-      summary,
-      disclaimer,
-      dAppScripts,
-      discord,
-      github,
-    } = formData;
-
-    const formattedDappScripts: IScriptObject[] =
-      transformDappScripts(dAppScripts);
-
-    const payload: OffChainMetadataSchema = {
-      certificateIssuer: {
-        name: name,
-        ...(logo && { logo: logo }),
-        social: {
-          contact: email,
-          website: website,
-          ...(discord && { discord: discord }),
-          ...(twitter && { twitter: twitter }),
-          ...(github && { github: github })
-        },
-      },
-      disclaimer: disclaimer,
-      scripts: formattedDappScripts,
-      summary: summary,
-    };
-
-    setSubmitting(true);
-
-    await fetchData
-      .post("/run/" + uuid + "/certificate", payload)
-      .then(response => {
-        if (response.status === 204) {
-          throw Error()
-        }
-        if (response?.data) {
-          setShowError("");
-          setOpenModal(true);
-          exportObjectToJsonFile(response.data.offchain, "Off-Chain_" + uuid + ".json");
-          exportObjectToJsonFile(response.data.onchain, "On-Chain_" + uuid + ".json");
-        }
-        setSubmitting(false);
-      })
-      .catch((errorObj) => {
-        let errorMsg = "Something went wrong. Please try again.";
-        if (errorObj?.response?.data) {
-          errorMsg =
-            errorObj.response.statusText + " - " + errorObj.response.data;
-        }
-        setShowError(errorMsg);
-        const timeout = setTimeout(() => {
-          clearTimeout(timeout);
-          setShowError("");
-        }, 5000);
-        setSubmitting(false);
-      });
-  };
-
-  return (
-    <>
-      <div id="certificationMetadataFormContainer" className="certificate-metadata-form">
-        <CertificationMetadataForm
-          config={CERTIFICATION_METADATA_FIELDS as any}
-          submitting={submitting}
-          // initData={profile ? {
-          //   name: profile.fullName || profile.companyName || "",
-          //   email: profile.contactEmail || profile.email || "",
-          //   twitter: profile.twitter || "",
-          //   website: profile.website || ""
-          // } : null}
-          form={form}
-          onSubmit={formHandler}
-          onFormReset={() => {
-            form.reset();
-            onCloseModal();
-          }}
-        />
-      </div>
-
-      {showError ? <Toast message={showError} /> : null}
-
-      <Modal
-        open={openModal}
-        title="Certification Metadata Uploaded"
-        onCloseModal={onCloseModal}
-        modalId="verificationSuccessModal"
-      >
-        <p style={{ marginBottom: "2rem" }}>
-          Successfully submitted Certification Metadata. <br />
-          <br />
-          Both off-chain and on-chain certificates will be downloaded at once
-          now.
-        </p>
-      </Modal>
-    </>
-  );
-};
-
-export default CertificationMetadata;
\ No newline at end of file
diff --git a/src/pages/certification/components/CertificationMetadata/certificationMetadata.interface.tsx b/src/pages/certification/components/CertificationMetadata/certificationMetadata.interface.tsx
deleted file mode 100644
index ba59ed9a..00000000
--- a/src/pages/certification/components/CertificationMetadata/certificationMetadata.interface.tsx
+++ /dev/null
@@ -1,35 +0,0 @@
-export interface IAuditReport {
-    name: string;
-  }
-  
-  export interface IScriptObject {
-    smartContractInfo: {
-      era?: string;
-      compiler?: string;
-      compilerVersion?: string;
-      optimizer?: string;
-      optimizerVersion?: string;
-      progLang?: string;
-      repository?: string;
-    };
-    scriptHash: string;
-    contractAddress?: string;
-  }
-  
-  export interface OffChainMetadataSchema {
-    certificateIssuer: {
-      logo?: string;
-      name: string;
-      social: {
-        contact: string;
-        discord?: string;
-        github?: string;
-        twitter?: string;
-        website: string;
-      };
-    };
-    disclaimer: string;
-    scripts: IScriptObject[];
-    subject?: string;
-    summary: string;
-  }
\ No newline at end of file
diff --git a/src/pages/certification/components/CertificationMetadata/certificationMetadata.schema.tsx b/src/pages/certification/components/CertificationMetadata/certificationMetadata.schema.tsx
deleted file mode 100644
index 380903f7..00000000
--- a/src/pages/certification/components/CertificationMetadata/certificationMetadata.schema.tsx
+++ /dev/null
@@ -1,86 +0,0 @@
-import * as yup from "yup";
-
-export const certificationMetadataSchema = yup.object().shape(
-  {
-    summary: yup.string().required("This field is required"),
-    disclaimer: yup.string().required("This field is required"),
-    name: yup.string().required("This field is required")
-      .max(64, "Please enter a valid name with upto 64 characters"),
-    email: yup
-      .string()
-      .required("This field is required")
-      .email("Please enter a valid email address"),
-    discord: yup
-      .string()
-      .matches(
-        /^(?:https?:\/\/)?discord(?:\.gg|app\.com\/invite|\.com\/invite)\/[\w-]+$/,
-        {
-          message: "Please enter a valid discord URL",
-          excludeEmptyString: true,
-        }
-      ),
-    github: yup
-      .string()
-      .matches(/^(?=.{1,39}$)[a-zA-Z0-9]+(-[a-zA-Z0-9]+)*$/, {
-        message: "Please enter a valid GitHub username",
-        excludeEmptyString: true,
-      }),
-    logo: yup
-      .string()
-      .matches(
-        /^(https?:\/\/)?(www\.)?[-a-zA-Z0-9@:%._\+~#=]{1,255}\.[a-z]{2,6}(\b([-a-zA-Z0-9@:%_\+.~#()?&\/\/=]*))?\.(?:jpg|jpeg|png|gif|bmp|svg|webp|tiff|tif)$/,
-        {
-          message: "Please enter a valid URL to a jpg/jpeg/png/gif/bmp/svg/webp/tiff/tif file",
-          excludeEmptyString: true,
-        }
-      ),
-    twitter: yup.string().when("twitter", (value) => {
-      if (value) {
-        return yup.string().matches(/^\w{1,15}$/, {
-          message: "Please enter a valid twitter handle",
-          excludeEmptyString: true,
-        });
-      } else {
-        return yup
-          .string()
-          .transform((val, originalVal) => (!val ? null : originalVal))
-          .nullable()
-          .optional();
-      }
-    }),
-    website: yup
-      .string()
-      .required("This field is required")
-      .matches(
-        /^(https?:\/\/)?(www\.)?[-a-zA-Z0-9@:%._\+~#=]{1,255}\.[a-z]{2,6}(\b([-a-zA-Z0-9@:%_\+.~#()?&\/\/=]*))?$/,
-        "Please enter a valid URL"
-      ),
-    dAppScripts: yup.array().of(
-      yup.object({
-        scriptHash: yup
-          .string()
-          .required("This field is required")
-          .max(64, "Please enter a valid script hash with 64 characters.")
-          .matches(/[0-9a-fA-F]{64}/, "Please enter a valid script hash with 64 characters"),
-        contractAddress: yup.string()
-        .matches(/^(addr_test1|addr1)[a-zA-Z0-9]{53,}$/, {
-          message: "Please enter a valid script address",
-          excludeEmptyString: true
-        }),
-      era: yup.string(),
-        compiler: yup.string(),
-        compilerVersion: yup.string(),
-        optimizer: yup.string(),
-        optimizerVersion: yup.string(),
-        progLang: yup.string(),
-        repoUrl: yup
-          .string()
-          .matches(/^(?:https?:\/\/)?(?:www\.)?github\.com\/[\w-]+\/[\w.-]+$/, {
-            message: "Please enter a valid github repo URL",
-            excludeEmptyString: true,
-          }),
-      })
-    ),
-  },
-  [["twitter", "twitter"]]
-);
\ No newline at end of file
diff --git a/src/pages/certification/components/CertificationMetadata/config.ts b/src/pages/certification/components/CertificationMetadata/config.ts
deleted file mode 100644
index 97abbf5b..00000000
--- a/src/pages/certification/components/CertificationMetadata/config.ts
+++ /dev/null
@@ -1,146 +0,0 @@
-export const CERTIFICATION_METADATA_FIELDS = {
-    commonField: [
-      {
-        config: {
-          placeholder: "Summary",
-          required: true,
-          minRows: 4,
-          maxRows: 4,
-          id: "summary",
-        },
-        componentType: "textarea",
-      },
-      {
-        config: {
-          placeholder: "Disclaimer",
-          required: true,
-          minRows: 4,
-          maxRows: 4,
-          id: "disclaimer",
-        },
-        componentType: "textarea",
-      }
-    ],
-    auditorInfo: [
-      {
-        config: {
-          label: "Name",
-          type: "text",
-          id: "name",
-          required: true,
-        },
-        componentType: "text",
-      },
-      {
-        config: {
-          label: "Email",
-          type: "text",
-          id: "email",
-          required: true,
-        },
-        componentType: "text",
-      },
-      {
-        config: {
-          label: "Website",
-          type: "text",
-          id: "website",
-          required: true,
-        },
-        componentType: "text",
-      },
-      {
-        config: {
-          label: "Logo",
-          type: "text",
-          id: "logo",
-        },
-        componentType: "text",
-      },
-      {
-        config: {
-          label: "Discord",
-          type: "text",
-          id: "discord",
-        },
-        componentType: "text",
-      },
-      {
-        config: {
-          label: "Github",
-          type: "text",
-          id: "github",
-        },
-        componentType: "text",
-      },
-      {
-        config: {
-          label: "Twitter",
-          type: "text",
-          id: "twitter",
-        },
-        componentType: "text",
-      },
-    ],
-    auditorReport: [],
-    addScripts: {
-      scriptFields: [
-        {
-          label: "Script Hash",
-          type: "text",
-          required: true,
-          id: "scriptHash",
-        },
-        {
-          label: "Contract Address",
-          type: "text",
-          required: false,
-          id: "contractAddress",
-        },
-      ],
-      smartContractInfo: [
-        {
-          label: "Era",
-          type: "text",
-          required: false,
-          id: "era",
-        },
-        {
-          label: "Complier",
-          type: "text",
-          required: false,
-          id: "compiler",
-        },
-        {
-          label: "Compiler Version",
-          type: "text",
-          required: false,
-          id: "compilerVersion",
-        },
-        {
-          label: "Optimizer",
-          type: "text",
-          required: false,
-          id: "optimizer",
-        },
-        {
-          label: "Optimizer Version",
-          type: "text",
-          required: false,
-          id: "optimizerVersion",
-        },
-        {
-          label: "Programming Language",
-          type: "text",
-          required: false,
-          id: "progLang",
-        },
-        {
-          label: "Repository URL",
-          type: "text",
-          required: false,
-          id: "repoUrl",
-        },
-      ],
-    },
-  };
\ No newline at end of file
diff --git a/src/pages/home/index.tsx b/src/pages/home/index.tsx
index 11a55f09..3454826b 100644
--- a/src/pages/home/index.tsx
+++ b/src/pages/home/index.tsx
@@ -50,7 +50,7 @@ const Home = () => {
 
   return (
     <Container maxWidth="xl" className="pt-8">
-      <Typography className="text-center font-bold tracking-[.2em] text-main text-4xl mb-16">
+      <Typography className="text-center font-bold tracking-[.2em] text-main text-4xl mb-12">
         Plutus Testing Tool
       </Typography>
       <div id="homeContentWrapper" className="flex justify-evenly gap-[10px]">
diff --git a/src/pages/reportUpload/index.css b/src/pages/reportUpload/index.css
new file mode 100644
index 00000000..431a4529
--- /dev/null
+++ b/src/pages/reportUpload/index.css
@@ -0,0 +1,5 @@
+@tailwind base;
+@tailwind components;
+@tailwind utilities;
+
+@layer components {}
\ No newline at end of file
diff --git a/src/pages/reportUpload/index.tsx b/src/pages/reportUpload/index.tsx
new file mode 100644
index 00000000..d87e8ecb
--- /dev/null
+++ b/src/pages/reportUpload/index.tsx
@@ -0,0 +1,19 @@
+import React from "react";
+
+import { Container, Typography } from "@mui/material";
+import CertificationMetadataForm from "components/CertificationMetadataForm";
+
+import "./index.css";
+
+const ReportUpload = () => {
+  return (
+    <Container className="py-4" maxWidth="xl">
+      <Typography variant="h5" className="font-medium text-main mb-6">
+        Upload an Audit Report
+      </Typography>
+      <CertificationMetadataForm standalone={true} />
+    </Container>
+  );
+};
+
+export default ReportUpload;
\ No newline at end of file
diff --git a/src/pages/session/components/AppLayout.tsx b/src/pages/session/components/AppLayout.tsx
index 8a0218b1..45ff3290 100644
--- a/src/pages/session/components/AppLayout.tsx
+++ b/src/pages/session/components/AppLayout.tsx
@@ -1,9 +1,6 @@
-import React, { useEffect } from 'react';
+import React from 'react';
 import { Outlet } from "react-router-dom";
 
-import { useAppDispatch } from "store/store";
-import { fetchProfile } from 'store/slices/auth.slice';
-
 import { LocalStorageKeys } from "constants/constants";
 
 import { Box, Alert } from "@mui/material";
@@ -31,27 +28,17 @@ const Banner = () => {
   ) : null;
 }
 
-const AppLayout = () => {
-
-  const dispatch = useAppDispatch();
-  
-  useEffect(() => {
-    dispatch(fetchProfile({}))
-  // eslint-disable-next-line react-hooks/exhaustive-deps
-  }, [])
-
-  return (
-    <Box className="flex flex-row h-screen bg-slate-app overflow-hidden">
-      <NavBar />
-      <Box className="flex-1 flex flex-col relative overflow-y-auto">
-        <AppBar />
-        <Banner />
-        <Box className="flex-1 flex flex-col p-4">
-          <Outlet />
-        </Box>
+const AppLayout = () => (
+  <Box className="flex flex-row h-screen bg-slate-app overflow-hidden">
+    <NavBar />
+    <Box className="flex-1 flex flex-col relative overflow-y-auto">
+      <AppBar />
+      <Banner />
+      <Box className="flex-1 flex flex-col p-4">
+        <Outlet />
       </Box>
     </Box>
-  );
-}
+  </Box>
+);
 
 export default AppLayout;
\ No newline at end of file
diff --git a/src/pages/session/index.tsx b/src/pages/session/index.tsx
index d8e8233c..9ca3e74c 100644
--- a/src/pages/session/index.tsx
+++ b/src/pages/session/index.tsx
@@ -3,7 +3,7 @@ import { Outlet, useLocation, useNavigate } from "react-router-dom";
 import { Box, CircularProgress } from "@mui/material";
 
 import { useAppDispatch, useAppSelector } from "store/store";
-import { fetchSession } from "store/slices/auth.slice";
+import { fetchSession, fetchProfile } from "store/slices/auth.slice";
 
 import AppLayout from './components/AppLayout';
 
@@ -14,10 +14,14 @@ export default () => {
   const navigate = useNavigate();
   const location = useLocation();
 
-  const { hasAnActiveSubscription, isSessionFetched } = useAppSelector((state) => state.auth);
+  const { hasAnActiveSubscription, isSessionFetched, profile } = useAppSelector((state) => state.auth);
 
   useEffect(() => { dispatch(fetchSession({})); }, []);
 
+  useEffect(() => {
+    if (hasAnActiveSubscription) dispatch(fetchProfile({}));
+  }, [hasAnActiveSubscription]);
+
   useEffect(() => {
     if (location.pathname === '/' && hasAnActiveSubscription) {
       navigate('/home');
@@ -27,7 +31,8 @@ export default () => {
     }
   }, [hasAnActiveSubscription, isSessionFetched, location.pathname]);
 
-  if (!isSessionFetched) {
+  // If the session is being fetched or if the user has an active subscription and the profile is being fetched, a loading will be displayed
+  if (!isSessionFetched || (hasAnActiveSubscription && profile === null)) {
     return (
       <Box className="w-screen h-screen flex items-center justify-center bg-slate-app">
         <CircularProgress color="secondary" size={100} />
diff --git a/src/pages/testingHistory/index.tsx b/src/pages/testingHistory/index.tsx
index 8377de6d..695a21cf 100644
--- a/src/pages/testingHistory/index.tsx
+++ b/src/pages/testingHistory/index.tsx
@@ -6,7 +6,7 @@ import { useNavigate } from "react-router";
 
 import { fetchData } from "api/api";
 
-import { Container, Box, Button, IconButton } from "@mui/material";
+import { Container, Box, Button, IconButton, Typography } from "@mui/material";
 import DeleteIcon from '@mui/icons-material/Delete';
 import RefreshIcon from '@mui/icons-material/Refresh';
 
@@ -380,8 +380,10 @@ const TestHistory = () => {
   };
   
   return (
-    <Container className="pt-4" maxWidth="xl">
-      <h2>Testing history</h2>
+    <Container className="pt-4" maxWidth={false}>
+      <Typography variant="h5" className="font-medium text-main mb-6">
+        Testing history
+      </Typography>
 
       <Box>
         <TableComponent
diff --git a/src/store/rootReducer.ts b/src/store/rootReducer.ts
index d902ae4d..f99ca102 100644
--- a/src/store/rootReducer.ts
+++ b/src/store/rootReducer.ts
@@ -9,6 +9,7 @@ import logRunTimeSlice from "pages/certification/slices/logRunTime.slice";
 import priceSlice from "pages/landing/slices/price.slice";
 import tiersSlice from "pages/landing/slices/tiers.slice";
 import repoAccessSlice from "./slices/repositoryAccess.slice";
+import reportUploadSlice from "./slices/reportUpload.slice";
 
 const rootReducer = combineReducers({
   auth: authSlice,
@@ -20,6 +21,7 @@ const rootReducer = combineReducers({
   runTime: logRunTimeSlice,
   price: priceSlice,
   tiers: tiersSlice,
+  reportUpload: reportUploadSlice,
 });
 
 export type RootState = ReturnType<typeof rootReducer>;
diff --git a/src/store/slices/auth.slice.ts b/src/store/slices/auth.slice.ts
index 98625e6f..a5d817c2 100644
--- a/src/store/slices/auth.slice.ts
+++ b/src/store/slices/auth.slice.ts
@@ -7,22 +7,22 @@ import { fetchData } from "api/api";
 import type { RootState } from "../rootReducer";
 
 export interface UserProfile {
-  address?: string,
-  companyName?: string,
-  contactEmail?: string,
+  address?: string;
+  email?: string;
+  fullName?: string;
+  companyName?: string;
+  contactEmail?: string;
+  linkedin?: string | null;
+  twitter?: string | null;
+  website?: string | null;
   dapp: {
-    githubToken?: string | null,
-    name: string,
-    owner: string,
-    repo: string,
-    subject?: string,
-    version: string
-  } | null,
-  email?: string,
-  fullName?: string,
-  linkedin?: string,
-  twitter?: string,
-  website?: string
+    name: string;
+    owner: string;
+    repo: string;
+    version: string;
+    githubToken?: string | null;
+    subject?: string;
+  } | null;
 }
 
 interface AuthState {
diff --git a/src/store/slices/reportUpload.slice.ts b/src/store/slices/reportUpload.slice.ts
new file mode 100644
index 00000000..1d1311c3
--- /dev/null
+++ b/src/store/slices/reportUpload.slice.ts
@@ -0,0 +1,106 @@
+import { createSlice, createAsyncThunk } from "@reduxjs/toolkit";
+import { fetchData } from "api/api";
+
+export interface ReportUploadRequest {
+  certificationLevel?: number;
+  summary: string;
+  disclaimer: string;
+  subject?: string;
+  report?: string[];
+  certificateIssuer: {
+    name: string;
+    logo?: string;
+    social: {
+      contact: string;
+      discord?: string;
+      twitter?: string;
+      github?: string;
+      website: string;
+    };
+  };
+  scripts: {
+    scriptHash: string;
+    contractAddress: string;
+    smartContractInfo: {
+      era?: string;
+      compiler?: string;
+      compilerVersion?: string;
+      optimizer?: string;
+      optimizerVersion?: string;
+      progLang?: string;
+      repository?: string;
+    };
+  }[];
+}
+
+interface ReportUploadState {
+  loading: boolean;
+  success: boolean;
+  errorMessage: string|null;
+  onchain: any|null;
+  offchain: any|null;
+  subject: string|null;
+  uuid: string|null;
+}
+
+const initialState: ReportUploadState = {
+  loading: false,
+  success: false,
+  errorMessage: null,
+  onchain: null,
+  offchain: null,
+  subject: null,
+  uuid: null,
+};
+
+export const sendReport = createAsyncThunk("sendReport", async (payload: { request: ReportUploadRequest, uuid?: string }, { rejectWithValue }) => {
+  try {
+    const response = await fetchData.post(payload.uuid ? `/run/${payload.uuid}/certificate` : '/auditor/reports', payload.request);
+    if (response.status !== 200) throw { response };
+    return {
+      onchain: response.data.onchain,
+      offchain: response.data.offchain,
+      subject: payload.request.subject,
+      uuid: payload.uuid || null
+    };
+  } catch (error: any) {
+    let errorMessage = 'Something went wrong. Please try again.';
+    if (error?.response?.data) {
+      errorMessage = `${error.response.statusText} - ${error.response.data}`;
+    }
+    return rejectWithValue(errorMessage);
+  }
+});
+
+export const reportUploadSlice = createSlice({
+  name: "reportUpload",
+  initialState,
+  reducers: {},
+  extraReducers: (builder) => {
+    builder
+      .addCase(sendReport.pending, (state) => {
+        state.loading = true;
+        state.success = false;
+        state.errorMessage = null;
+        state.onchain = null;
+        state.offchain = null;
+        state.subject = null;
+        state.uuid = null;
+      })
+      .addCase(sendReport.fulfilled, (state, actions) => {
+        state.loading = false;
+        state.success = true;
+        state.onchain = actions.payload.onchain;
+        state.offchain = actions.payload.offchain;
+        state.subject = actions.payload.subject || null;
+        state.uuid = actions.payload.uuid;
+      })
+      .addCase(sendReport.rejected, (state, actions) => {
+        state.loading = false;
+        state.success = false;
+        state.errorMessage = actions.payload as string;
+      })
+  },
+});
+
+export default reportUploadSlice.reducer;
\ No newline at end of file
diff --git a/src/utils/utils.ts b/src/utils/utils.ts
index 5b806b8c..0dd060fc 100644
--- a/src/utils/utils.ts
+++ b/src/utils/utils.ts
@@ -56,11 +56,6 @@ export const formatTimeToReadable = (duration: number) => {
     return timeStr
 }
 
-// unused now
-// export const convertAdaToLovelace = (fee_ada: number) => {
-//   return BigNum.from_str((fee_ada * 1000000).toString())
-// }
-
 export const getObjectByPath = (object: { [x: string]: any }, path: string): any => {
   path = path.replace(/\[(\w+)\]/g, ".$1"); // convert indexes to properties
   path = path.replace(/^\./, ""); // strip a leading dot
@@ -86,6 +81,15 @@ export const transformEmptyStringToNullInObj = (obj: any) => {
   return obj;
 }
 
+// Deletes all the keys with empty strings from an object
+export const removeEmptyStringsDeep = (obj: any) => {
+  Object.keys(obj).forEach(key =>
+    (obj[key] && typeof obj[key] === 'object' && removeEmptyStringsDeep(obj[key])) ||
+    (obj[key] === '' && delete obj[key])
+  );
+  return obj;
+};
+
 export const getErrorMessage = (errorObj: any) => {
   let errorMsg = "Something wrong occurred. Please try again later.";
     if (typeof errorObj === "string") {