diff --git a/src/components/admin/GeneralInfo.jsx b/src/components/admin/GeneralInfo.jsx
index 161b35f6..18de3981 100644
--- a/src/components/admin/GeneralInfo.jsx
+++ b/src/components/admin/GeneralInfo.jsx
@@ -111,52 +111,50 @@ function GeneralInfo({ theNext, setCollectedChapter }) {
               </span>
             )}
           </div>
-          {/* eslint-disable-next-line jsx-a11y/control-has-associated-label */}
-          <div
-            className="w-full pl-4 py-2  mt-4 border-dashed border-2 border-gray-300  rounded-tl rounded-tr justify-start items-center inline-flex"
-            onClick={(e) => handleUploadImageClick(e, "banner")}
-            onKeyDown={(e) => handleUploadImageKeyDown(e, "banner")}
-            tabIndex="0"
-            role="button"
-          >
-            <Controller
-              name="banner"
-              control={control}
-              render={({ field }) => (
-                <>
-                  <input
-                    type="file"
-                    id="banner"
-                    {...field}
-                    accept=".png,.jpg,.jpeg,.jfif"
-                    onChange={(e) => {
-                      field.onChange(e);
-                      handleImageChange(e);
-                    }}
-                    style={{ display: "none" }}
-                  />
-                  <div className="grow shrink basis-0 h-[87px] flex-col justify-center items-center gap-2 inline-flex">
+
+          <Controller
+            name="banner"
+            control={control}
+            render={({ field }) => (
+              <div
+                className="w-full pl-4 py-2  mt-4 border-dashed border-2 border-gray-300  rounded-tl rounded-tr justify-start items-center inline-flex"
+                onClick={(e) => handleUploadImageClick(e, "banner")}
+                onKeyDown={(e) => handleUploadImageKeyDown(e, "banner")}
+                tabIndex="0"
+                role="button"
+              >
+                <input
+                  type="file"
+                  id="banner"
+                  {...field}
+                  accept=".png,.jpg,.jpeg,.jfif"
+                  onChange={(e) => {
+                    field.onChange(e);
+                    handleImageChange(e);
+                  }}
+                  style={{ display: "none" }}
+                />
+                <div className="grow shrink basis-0 h-[87px] flex-col justify-center items-center gap-2 inline-flex">
+                  <div className="justify-start items-center inline-flex">
+                    <div className="text-zinc-700 text-base font-normal">
+                      Upload Chapter&apos;s Banner
+                    </div>
+                  </div>
+                  {banner ? (
+                    <div className="mt-4 rounded">
+                      <p>{banner.name}</p>
+                    </div>
+                  ) : (
                     <div className="justify-start items-center inline-flex">
-                      <div className="text-zinc-700 text-base font-normal">
-                        Upload Chapter&apos;s Banner
+                      <div className="text-zinc-700 text-xs font-normal leading-[18px] tracking-tight">
+                        PNG, JPG, JFIF
                       </div>
                     </div>
-                    {banner ? (
-                      <div className="mt-4 rounded">
-                        <p>{banner.name}</p>
-                      </div>
-                    ) : (
-                      <div className="justify-start items-center inline-flex">
-                        <div className="text-zinc-700 text-xs font-normal leading-[18px] tracking-tight">
-                          PNG, JPG, JFIF
-                        </div>
-                      </div>
-                    )}
-                  </div>
-                </>
-              )}
-            />
-          </div>
+                  )}
+                </div>
+              </div>
+            )}
+          />
           {errors.banner && (
             <span className="text-xs text-red-500">
               {errors.banner.message}
diff --git a/src/components/admin/Organizers.jsx b/src/components/admin/Organizers.jsx
index 96840315..3420c8f6 100644
--- a/src/components/admin/Organizers.jsx
+++ b/src/components/admin/Organizers.jsx
@@ -118,52 +118,57 @@ function Organizers({ thePrevious, collectedChapter, formComplete }) {
                   </span>
                 )}
               </div>
-              {/* eslint-disable-next-line jsx-a11y/control-has-associated-label, jsx-a11y/click-events-have-key-events */}
-              <div
-                className="w-full pl-4 py-2 mt-4 border-dashed border-2 border-gray-300 rounded-tl rounded-tr justify-start items-center inline-flex"
-                tabIndex="0"
-                role="button"
-                onClick={() =>
-                  document.getElementById(`organizers.${index}.image`).click()
-                }
-              >
-                <Controller
-                  name={`organizers.${index}.image`}
-                  control={control}
-                  render={({ field }) => (
-                    <>
-                      <input
-                        type="file"
-                        id={`organizers.${index}.image`}
-                        accept=".png,.jpg,.jpeg,.jfif"
-                        style={{ display: "none" }}
-                        onChange={(e) => {
-                          field.onChange(e);
-                          handleImageChange(e, index);
-                        }}
-                      />
-                      <div className="grow shrink basis-0 h-[87px] flex-col justify-center items-center gap-2 inline-flex">
+
+              <Controller
+                name={`organizers.${index}.image`}
+                control={control}
+                render={({ field }) => (
+                  <div
+                    className="w-full pl-4 py-2 mt-4 border-dashed border-2 border-gray-300 rounded-tl rounded-tr justify-start items-center inline-flex"
+                    tabIndex="0"
+                    role="button"
+                    onClick={() =>
+                      document
+                        .getElementById(`organizers.${index}.image`)
+                        .click()
+                    }
+                    onKeyDown={() =>
+                      document
+                        .getElementById(`organizers.${index}.image`)
+                        .click()
+                    }
+                  >
+                    <input
+                      type="file"
+                      id={`organizers.${index}.image`}
+                      accept=".png,.jpg,.jpeg,.jfif"
+                      style={{ display: "none" }}
+                      onChange={(e) => {
+                        field.onChange(e);
+                        handleImageChange(e, index);
+                      }}
+                    />
+                    <div className="grow shrink basis-0 h-[87px] flex-col justify-center items-center gap-2 inline-flex">
+                      <div className="justify-start items-center inline-flex">
+                        <div className="text-zinc-700 text-base font-normal">
+                          Upload Organizer’s Image
+                        </div>
+                      </div>
+                      {fileNames && fileNames[`organizer${index}`] ? (
+                        <div className="mt-4 rounded">
+                          <p>{fileNames[`organizer${index}`]}</p>
+                        </div>
+                      ) : (
                         <div className="justify-start items-center inline-flex">
-                          <div className="text-zinc-700 text-base font-normal">
-                            Upload Organizer’s Image
+                          <div className="text-zinc-700 text-xs font-normal leading-[18px] tracking-tight">
+                            PNG, JPG, JFIF
                           </div>
                         </div>
-                        {fileNames && fileNames[`organizer${index}`] ? (
-                          <div className="mt-4 rounded">
-                            <p>{fileNames[`organizer${index}`]}</p>
-                          </div>
-                        ) : (
-                          <div className="justify-start items-center inline-flex">
-                            <div className="text-zinc-700 text-xs font-normal leading-[18px] tracking-tight">
-                              PNG, JPG, JFIF
-                            </div>
-                          </div>
-                        )}
-                      </div>
-                    </>
-                  )}
-                />
-              </div>
+                      )}
+                    </div>
+                  </div>
+                )}
+              />
               {errors.organizers && (
                 <span className="text-xs text-red-500">
                   {errors.organizers[index]?.image?.message || ""}
diff --git a/src/components/admin/shop/inventory/Modal.jsx b/src/components/admin/shop/inventory/Modal.jsx
index 4f9df2d8..7b08e1c6 100644
--- a/src/components/admin/shop/inventory/Modal.jsx
+++ b/src/components/admin/shop/inventory/Modal.jsx
@@ -1,4 +1,3 @@
-/* eslint-disable jsx-a11y/control-has-associated-label */
 /* eslint-disable react/jsx-props-no-spreading */
 /* eslint-disable jsx-a11y/label-has-associated-control */
 import { yupResolver } from "@hookform/resolvers/yup";
@@ -78,7 +77,11 @@ export default function Modal({ showModal, onClose }) {
                       <h3 className="text-xl font-poppins font-medium text-[#353535]">
                         Add Item
                       </h3>
-                      <button type="button" onClick={onClose}>
+                      <button
+                        type="button"
+                        onClick={onClose}
+                        aria-label="Close"
+                      >
                         <IoMdClose className="size-10 text-[#353535]" />
                       </button>
                     </div>
diff --git a/src/pages/admin/events/AddEventPage.jsx b/src/pages/admin/events/AddEventPage.jsx
index 9f984f80..0f8c261d 100644
--- a/src/pages/admin/events/AddEventPage.jsx
+++ b/src/pages/admin/events/AddEventPage.jsx
@@ -507,52 +507,49 @@ function AddEventPage() {
                       )}
                     </div>
                   </div>
-                  {/* eslint-disable-next-line jsx-a11y/control-has-associated-label */}
-                  <div
-                    className="w-full pl-4 py-2  mt-4 border-dashed border-2 border-gray-300  rounded-tl rounded-tr justify-start items-center inline-flex"
-                    onClick={(e) => handleUploadImageClick(e, "poster")}
-                    onKeyDown={(e) => handleUploadImageClick(e, "poster")}
-                    tabIndex="0"
-                    role="button"
-                  >
-                    <Controller
-                      name="poster"
-                      control={control}
-                      render={({ field }) => (
-                        <>
-                          <input
-                            type="file"
-                            id="poster"
-                            {...field}
-                            accept=".png,.jpg,.jpeg,.jfif"
-                            onChange={(e) => {
-                              field.onChange(e);
-                              setPoster(e.target.files[0]);
-                            }}
-                            style={{ display: "none" }}
-                          />
-                          <div className="grow shrink basis-0 h-[87px] flex-col justify-center items-center gap-2 inline-flex">
+                  <Controller
+                    name="poster"
+                    control={control}
+                    render={({ field }) => (
+                      <div
+                        className="w-full pl-4 py-2  mt-4 border-dashed border-2 border-gray-300  rounded-tl rounded-tr justify-start items-center inline-flex"
+                        onClick={(e) => handleUploadImageClick(e, "poster")}
+                        onKeyDown={(e) => handleUploadImageClick(e, "poster")}
+                        tabIndex="0"
+                        role="button"
+                      >
+                        <input
+                          type="file"
+                          id="poster"
+                          {...field}
+                          accept=".png,.jpg,.jpeg,.jfif"
+                          onChange={(e) => {
+                            field.onChange(e);
+                            setPoster(e.target.files[0]);
+                          }}
+                          style={{ display: "none" }}
+                        />
+                        <div className="grow shrink basis-0 h-[87px] flex-col justify-center items-center gap-2 inline-flex">
+                          <div className="justify-start items-center inline-flex">
+                            <div className="text-zinc-700 text-base font-normal">
+                              Upload Event Poster
+                            </div>
+                          </div>
+                          {poster ? (
+                            <div className="mt-4 rounded">
+                              <p>{poster.name}</p>
+                            </div>
+                          ) : (
                             <div className="justify-start items-center inline-flex">
-                              <div className="text-zinc-700 text-base font-normal">
-                                Upload Event Poster
+                              <div className="text-zinc-700 text-xs font-normal leading-[18px] tracking-tight">
+                                PNG, JPG, JFIF
                               </div>
                             </div>
-                            {poster ? (
-                              <div className="mt-4 rounded">
-                                <p>{poster.name}</p>
-                              </div>
-                            ) : (
-                              <div className="justify-start items-center inline-flex">
-                                <div className="text-zinc-700 text-xs font-normal leading-[18px] tracking-tight">
-                                  PNG, JPG, JFIF
-                                </div>
-                              </div>
-                            )}
-                          </div>
-                        </>
-                      )}
-                    />
-                  </div>
+                          )}
+                        </div>
+                      </div>
+                    )}
+                  />
                   {errors.poster && (
                     <span className="text-xs text-red-500 mt-1">
                       {errors.poster.message}