diff --git a/src/components/CustomHeaders.tsx b/src/components/CustomHeaders.tsx
new file mode 100644
index 0000000..822c903
--- /dev/null
+++ b/src/components/CustomHeaders.tsx
@@ -0,0 +1,27 @@
+import FormField from "#/components/FormField.tsx";
+
+const CustomHeaders = () => {
+	return (
+		<div className="my-4 w-full">
+			<details className="bg-(--neutral-content)/20 p-4 rounded-lg">
+				<summary>
+					Custom Headers (PDF)
+					<p className="text-sm font-normal">
+						Text in these fields will overwrite the PGN headers in the generated
+						PDF
+					</p>
+				</summary>
+				<div>
+					<form className="grid place-items-center gap-4 sm:grid-cols-2 mt-2">
+						<FormField fieldName="title" type="text" />
+						<FormField fieldName="subtitle" type="text" />
+						<FormField fieldName="date" type="text" />
+						<FormField fieldName="author" type="text" />
+					</form>
+				</div>
+			</details>
+		</div>
+	);
+};
+
+export default CustomHeaders;
diff --git a/src/components/FormField.tsx b/src/components/FormField.tsx
new file mode 100644
index 0000000..8ec4c31
--- /dev/null
+++ b/src/components/FormField.tsx
@@ -0,0 +1,22 @@
+export interface IFormField {
+	fieldName: string;
+	type: string;
+}
+
+const FormField = ({ fieldName, type }: IFormField) => {
+	return (
+		<div className="flex flex-col gap-2">
+			<label htmlFor={fieldName} className="text-sm capitalize">
+				{fieldName}
+			</label>
+			<input
+				className="headers__input"
+				type={type}
+				id={fieldName}
+				name={fieldName}
+			/>
+		</div>
+	);
+};
+
+export default FormField;
diff --git a/src/components/HeaderFields.tsx b/src/components/HeaderFields.tsx
new file mode 100644
index 0000000..843f012
--- /dev/null
+++ b/src/components/HeaderFields.tsx
@@ -0,0 +1,33 @@
+import FormField from "#/components/FormField.tsx";
+
+const HeaderFields = () => {
+	return (
+		<div className="my-4 w-full">
+			<details className="bg-(--neutral-content)/20 p-4 rounded-lg">
+				<summary>
+					Headers
+					<p className="text-sm font-normal">Edit the game PGN headers</p>
+				</summary>
+				<div>
+					<form className="grid place-items-center gap-4 sm:grid-cols-2 mt-2">
+						<FormField fieldName="event" type="text" />
+						<FormField fieldName="site" type="text" />
+						<FormField fieldName="date" type="text" />
+						<FormField fieldName="round" type="text" />
+						<FormField fieldName="white" type="text" />
+						<FormField fieldName="black" type="text" />
+						<FormField fieldName="result" type="text" />
+						<FormField fieldName="eco" type="text" />
+						<FormField fieldName="whiteElo" type="text" />
+						<FormField fieldName="blackElo" type="text" />
+						<FormField fieldName="plyCount" type="text" />
+						<FormField fieldName="eventDate" type="text" />
+						<FormField fieldName="source" type="text" />
+					</form>
+				</div>
+			</details>
+		</div>
+	);
+};
+
+export default HeaderFields;
diff --git a/src/pages/Chessboard.tsx b/src/pages/Chessboard.tsx
index 6fc0396..ec77d95 100644
--- a/src/pages/Chessboard.tsx
+++ b/src/pages/Chessboard.tsx
@@ -1,3 +1,5 @@
+import CustomHeaders from "#/components/CustomHeaders.tsx";
+import HeaderFields from "#/components/HeaderFields.tsx";
 import LichessButton from "#/components/LichessButton.tsx";
 import PgnViewer from "#/components/PgnViewer.tsx";
 import Section from "#/components/Section.tsx";
@@ -78,32 +80,29 @@ const Chessboard = () => {
 					</div>
 				</div>
 
-				<div className="flex gap-4">
-					{/*<button*/}
-					{/*	className="btn btn-primary"*/}
-					{/*	type="button"*/}
-					{/*	onClick={handleClearGame}*/}
-					{/*>*/}
-					{/*	Clear Game*/}
-					{/*</button>*/}
+				<div className="flex flex-col gap-4 items-center">
+					<div className="flex justify-center gap-4">
+						<button
+							className="btn btn-secondary"
+							type="button"
+							onClick={handleSavePgn}
+							disabled={!gameState.pgn}
+						>
+							Save PGN
+						</button>
 
-					<button
-						className="btn btn-secondary"
-						type="button"
-						onClick={handleSavePgn}
-						disabled={!gameState.pgn}
-					>
-						Save PGN
-					</button>
+						<button
+							className="btn btn-secondary"
+							type="button"
+							onClick={handleSavePdf}
+							disabled={!gameState.pgn || generatingPdf}
+						>
+							Save PDF
+						</button>
+					</div>
 
-					<button
-						className="btn btn-secondary"
-						type="button"
-						onClick={handleSavePdf}
-						disabled={!gameState.pgn || generatingPdf}
-					>
-						Save PDF
-					</button>
+					<HeaderFields />
+					<CustomHeaders />
 				</div>
 			</div>
 		</main>
diff --git a/src/styles/_input.css b/src/styles/_input.css
index 9a13b90..39f978a 100644
--- a/src/styles/_input.css
+++ b/src/styles/_input.css
@@ -1,9 +1,23 @@
+/* Headers */
+.headers__input {
+	height: 3rem;
+	padding: 0 1rem;
+	line-height: 1.5rem;
+	border-radius: 0.5rem;
+	border: 1px solid var(--neutral-content);
+
+	&:focus {
+		outline: none;
+		border-color: var(--accent);
+	}
+}
+
 /* Checkbox */
 .checkbox-accent {
-  accent-color: var(--accent);
-  width: 18px;
-  height: 18px;
-  cursor: pointer;
+	accent-color: var(--accent);
+	width: 18px;
+	height: 18px;
+	cursor: pointer;
 }
 
 /* Toggle */