diff --git a/project/frontend/src/components/KennzahlenTable.tsx b/project/frontend/src/components/KennzahlenTable.tsx
index e01e98e..4ad51f0 100644
--- a/project/frontend/src/components/KennzahlenTable.tsx
+++ b/project/frontend/src/components/KennzahlenTable.tsx
@@ -143,7 +143,9 @@ export default function KennzahlenTable({
 
 	const handlePageSave = async (index: string) => {
 		const pageNumber = parseInt(editPageValue);
-		if (!isNaN(pageNumber) && pageNumber > 0) {
+		if (editPageValue === "" || pageNumber === 0) {
+			mutate({ id: index, newPage: 0 });
+		} else if (!isNaN(pageNumber) && pageNumber > 0) {
 			mutate({ id: index, newPage: pageNumber });
 		}
 		setEditingPageIndex("");
@@ -370,7 +372,7 @@ export default function KennzahlenTable({
 												value={editPageValue}
 												onChange={(e) => {
 													const value = e.target.value;
-													if (value === '' || /^\d+$/.test(value) && parseInt(value) > 0) {
+													if (value === '' || /^\d+$/.test(value)) {
 														setEditPageValue(value);
 													}
 												}}
@@ -399,14 +401,11 @@ export default function KennzahlenTable({
 															alignItems: "center",
 															justifyContent: "center",
 															position: "relative",
-															cursor: canEditPage ? "pointer" : "default",
+															cursor: "pointer",
 															borderRadius: "4px",
 															minHeight: "32px",
 															minWidth: "100px",
-															transition: "all 0.2s ease",
 														}}
-														onMouseEnter={() => canEditPage && setHoveredPageIndex(row.setting.name)}
-														onMouseLeave={() => setHoveredPageIndex("")}
 														onClick={() => {
 															if (canEditPage) {
 																startPageEditing(currentPage, row.setting.name);
@@ -426,19 +425,6 @@ export default function KennzahlenTable({
 														>
 															{currentPage}
 														</Link>
-
-														{isPageHovered && canEditPage && (
-															<EditIcon
-																fontSize="small"
-																sx={{
-																	position: "absolute",
-																	left: "70px",
-																	color: "#666",
-																	opacity: 0.7,
-																	transition: "opacity 0.2s ease",
-																}}
-															/>
-														)}
 													</Box>
 												) : canEditPage ? (
 													<Box
@@ -463,7 +449,7 @@ export default function KennzahlenTable({
 															sx={{
 																position: "absolute",
 																left: "70px",
-																color: "#555",
+																color: "black",
 																cursor: "pointer",
 																opacity: 0.7,
 																transition: "opacity 0.2s ease",
diff --git a/project/frontend/src/routes/extractedResult_.$pitchBook.$kpi.tsx b/project/frontend/src/routes/extractedResult_.$pitchBook.$kpi.tsx
index 1e98430..e1c3bbf 100644
--- a/project/frontend/src/routes/extractedResult_.$pitchBook.$kpi.tsx
+++ b/project/frontend/src/routes/extractedResult_.$pitchBook.$kpi.tsx
@@ -397,7 +397,7 @@ function ExtractedResultsPage() {
 												<EditIcon
 													fontSize="small"
 													sx={{
-														color: "#666",
+														color: "black",
 														opacity: 0.7,
 														transition: "opacity 0.2s ease",
 														ml: 1