diff --git a/packages/concept-engine/src/scraper.ts b/packages/concept-engine/src/scraper.ts
index fce2261..ab49c9c 100644
--- a/packages/concept-engine/src/scraper.ts
+++ b/packages/concept-engine/src/scraper.ts
@@ -1,9 +1,8 @@
 // ============================================================================
 // Scraper — Zyte API + Local Persistence
 // Crawls all pages of a website, stores them locally for reuse.
+// Crawls all pages of a website, stores them locally for reuse.
 // ============================================================================
-
-import axios from "axios";
 import * as cheerio from "cheerio";
 import * as fs from "node:fs/promises";
 import * as path from "node:path";
@@ -171,32 +170,39 @@ function extractServices(text: string): string[] {
  */
 async function fetchWithZyte(url: string, apiKey: string): Promise<string> {
     try {
-        const resp = await axios.post(
-            "https://api.zyte.com/v1/extract",
-            {
+        const auth = Buffer.from(`${apiKey}:`).toString("base64");
+        const resp = await fetch("https://api.zyte.com/v1/extract", {
+            method: "POST",
+            headers: {
+                "Authorization": `Basic ${auth}`,
+                "Content-Type": "application/json",
+            },
+            body: JSON.stringify({
                 url,
                 browserHtml: true,
-            },
-            {
-                auth: { username: apiKey, password: "" },
-                timeout: 60000,
-            },
-        );
-        const html = resp.data.browserHtml || "";
+            }),
+            signal: AbortSignal.timeout(60000),
+        });
+
+        if (!resp.ok) {
+            const errorText = await resp.text();
+            console.error(`  ❌ Zyte API error ${resp.status} for ${url}: ${errorText}`);
+            // Rate limited — wait and retry once
+            if (resp.status === 429) {
+                console.log("  ⏳ Rate limited, waiting 5s and retrying...");
+                await new Promise((r) => setTimeout(r, 5000));
+                return fetchWithZyte(url, apiKey);
+            }
+            throw new Error(`HTTP ${resp.status}: ${errorText}`);
+        }
+
+        const data = await resp.json();
+        const html = data.browserHtml || "";
         if (!html) {
             console.warn(`  ⚠️ Zyte returned empty browserHtml for ${url}`);
         }
         return html;
     } catch (err: any) {
-        if (err.response) {
-            console.error(`  ❌ Zyte API error ${err.response.status} for ${url}: ${err.response.data?.detail || err.response.statusText}`);
-            // Rate limited — wait and retry once
-            if (err.response.status === 429) {
-                console.log("  ⏳ Rate limited, waiting 5s and retrying...");
-                await new Promise((r) => setTimeout(r, 5000));
-                return fetchWithZyte(url, apiKey);
-            }
-        }
         throw err;
     }
 }
@@ -205,14 +211,19 @@ async function fetchWithZyte(url: string, apiKey: string): Promise<string> {
  * Fetch a page via simple HTTP GET (fallback).
  */
 async function fetchDirect(url: string): Promise<string> {
-    const resp = await axios.get(url, {
-        timeout: 30000,
-        headers: {
-            "User-Agent":
-                "Mozilla/5.0 (Macintosh; Intel Mac OS X 10_15_7) AppleWebKit/537.36",
-        },
-    });
-    return typeof resp.data === "string" ? resp.data : "";
+    try {
+        const resp = await fetch(url, {
+            headers: {
+                "User-Agent":
+                    "Mozilla/5.0 (Macintosh; Intel Mac OS X 10_15_7) AppleWebKit/537.36",
+            },
+            signal: AbortSignal.timeout(30000),
+        });
+        if (!resp.ok) return "";
+        return await resp.text();
+    } catch {
+        return "";
+    }
 }
 
 /**
diff --git a/packages/page-audit/src/dataforseo.ts b/packages/page-audit/src/dataforseo.ts
index 1ffd44d..d8cac21 100644
--- a/packages/page-audit/src/dataforseo.ts
+++ b/packages/page-audit/src/dataforseo.ts
@@ -83,24 +83,31 @@ export class DataForSeoClient {
         let delay = 15_000;
         let pollCount = 0;
 
-        while (Date.now() - start < timeoutMs) {
-            await this.sleep(delay);
-            pollCount++;
+        // Force Node event loop active
+        const keepAlive = setInterval(() => { }, 1000);
 
-            const ready = await this.isTaskReady(taskId);
-            const elapsed = Math.round((Date.now() - start) / 1000);
-            console.log(`  📊 Poll #${pollCount}: ${ready ? "READY ✅" : "not ready"} (${elapsed}s elapsed)`);
+        try {
+            while (Date.now() - start < timeoutMs) {
+                await this.sleep(delay);
+                pollCount++;
 
-            if (ready) {
-                // Short grace period so the pages endpoint settles
-                await this.sleep(5_000);
-                return;
+                const ready = await this.isTaskReady(taskId);
+                const elapsed = Math.round((Date.now() - start) / 1000);
+                console.log(`  📊 Poll #${pollCount}: ${ready ? "READY ✅" : "not ready"} (${elapsed}s elapsed)`);
+
+                if (ready) {
+                    // Short grace period so the pages endpoint settles
+                    await this.sleep(5_000);
+                    return;
+                }
+
+                delay = Math.min(delay * 1.3, 30_000);
             }
 
-            delay = Math.min(delay * 1.3, 30_000);
+            throw new Error(`DataForSEO task ${taskId} timed out after ${timeoutMs / 1000}s`);
+        } finally {
+            clearInterval(keepAlive);
         }
-
-        throw new Error(`DataForSEO task ${taskId} timed out after ${timeoutMs / 1000}s`);
     }
 
     /**
diff --git a/packages/pdf-library/src/components/AgbsPDF.tsx b/packages/pdf-library/src/components/AgbsPDF.tsx
index df6b14c..f970ade 100644
--- a/packages/pdf-library/src/components/AgbsPDF.tsx
+++ b/packages/pdf-library/src/components/AgbsPDF.tsx
@@ -6,6 +6,7 @@ import {
   Text as PDFText,
   View as PDFView,
   StyleSheet as PDFStyleSheet,
+  Document as PDFDocument,
 } from "@react-pdf/renderer";
 import {
   pdfStyles,
@@ -213,30 +214,34 @@ export const AgbsPDF = ({
 
   if (mode === "full") {
     return (
-      <SimpleLayout
-        companyData={companyData}
-        bankData={bankData}
-        headerIcon={headerIcon}
-        footerLogo={footerLogo}
-        showPageNumber={false}
-      >
-        {content}
-      </SimpleLayout>
+      <PDFDocument title="Allgemeine Geschäftsbedingungen">
+        <SimpleLayout
+          companyData={companyData}
+          bankData={bankData}
+          headerIcon={headerIcon}
+          footerLogo={footerLogo}
+          showPageNumber={false}
+        >
+          {content}
+        </SimpleLayout>
+      </PDFDocument>
     );
   }
 
   return (
-    <PDFPage size="A4" style={pdfStyles.page}>
-      <FoldingMarks />
-      <Header icon={headerIcon} showAddress={false} />
-      {content}
-      <Footer
-        logo={footerLogo}
-        companyData={companyData}
-        _bankData={bankData}
-        showDetails={false}
-        showPageNumber={false}
-      />
-    </PDFPage>
+    <PDFDocument title="Allgemeine Geschäftsbedingungen">
+      <PDFPage size="A4" style={pdfStyles.page}>
+        <FoldingMarks />
+        <Header icon={headerIcon} showAddress={false} />
+        {content}
+        <Footer
+          logo={footerLogo}
+          companyData={companyData}
+          bankData={bankData}
+          showDetails={false}
+          showPageNumber={false}
+        />
+      </PDFPage>
+    </PDFDocument>
   );
 };
diff --git a/packages/pdf-library/src/components/ClosingPDF.tsx b/packages/pdf-library/src/components/ClosingPDF.tsx
new file mode 100644
index 0000000..546dce2
--- /dev/null
+++ b/packages/pdf-library/src/components/ClosingPDF.tsx
@@ -0,0 +1,36 @@
+"use client";
+
+import * as React from "react";
+import { Document as PDFDocument } from "@react-pdf/renderer";
+import { SimpleLayout } from "./pdf/SimpleLayout.js";
+import { ClosingModule } from "./pdf/modules/CommonModules.js";
+
+export const ClosingPDF = ({ headerIcon, footerLogo }: any) => {
+    const date = new Date().toLocaleDateString("de-DE", {
+        year: "numeric",
+        month: "long",
+        day: "numeric",
+    });
+
+    const companyData = {
+        name: "Marc Mintel",
+        address1: "Georg-Meistermann-Straße 7",
+        address2: "54586 Schüller",
+        ustId: "DE367588065",
+    };
+
+    const commonProps = {
+        date,
+        headerIcon,
+        footerLogo,
+        companyData,
+    };
+
+    return (
+        <PDFDocument title="Abschluss">
+            <SimpleLayout {...commonProps}>
+                <ClosingModule />
+            </SimpleLayout>
+        </PDFDocument>
+    );
+};
diff --git a/packages/pdf-library/src/components/ConceptPDF.tsx b/packages/pdf-library/src/components/ConceptPDF.tsx
index 54b5033..c5d5836 100644
--- a/packages/pdf-library/src/components/ConceptPDF.tsx
+++ b/packages/pdf-library/src/components/ConceptPDF.tsx
@@ -5,17 +5,12 @@ import { Page as PDFPage, Document as PDFDocument } from "@react-pdf/renderer";
 import { pdfStyles } from "./pdf/SharedUI.js";
 import { SimpleLayout } from "./pdf/SimpleLayout.js";
 
-// Modules
-import { FrontPageModule } from "./pdf/modules/FrontPageModule.js";
 import { BriefingModule } from "./pdf/modules/BriefingModule.js";
 import { SitemapModule } from "./pdf/modules/SitemapModule.js";
-import { ClosingModule } from "./pdf/modules/CommonModules.js";
 
-export const ConceptPDF = ({
-    concept,
-    headerIcon,
-    footerLogo,
-}: any) => {
+export const ConceptPDF = (props: any) => {
+    const { concept, headerIcon, footerLogo } = props;
+
     const date = new Date().toLocaleDateString("de-DE", {
         year: "numeric",
         month: "long",
@@ -48,10 +43,6 @@ export const ConceptPDF = ({
 
     return (
         <PDFDocument title={`Projektkonzept - ${flatState.companyName || "Projekt"}`}>
-            <PDFPage size="A4" style={pdfStyles.titlePage}>
-                <FrontPageModule state={flatState} headerIcon={headerIcon} date={date} />
-            </PDFPage>
-
             <SimpleLayout {...commonProps}>
                 <BriefingModule state={flatState} />
             </SimpleLayout>
@@ -61,10 +52,6 @@ export const ConceptPDF = ({
                     <SitemapModule state={flatState} />
                 </SimpleLayout>
             )}
-
-            <SimpleLayout {...commonProps}>
-                <ClosingModule />
-            </SimpleLayout>
         </PDFDocument>
     );
 };
diff --git a/packages/pdf-library/src/components/EstimationPDF.tsx b/packages/pdf-library/src/components/EstimationPDF.tsx
index 52f2724..3136284 100644
--- a/packages/pdf-library/src/components/EstimationPDF.tsx
+++ b/packages/pdf-library/src/components/EstimationPDF.tsx
@@ -6,10 +6,7 @@ import { pdfStyles } from "./pdf/SharedUI.js";
 import { SimpleLayout } from "./pdf/SimpleLayout.js";
 
 // Modules
-import { FrontPageModule } from "./pdf/modules/FrontPageModule.js";
 import { EstimationModule } from "./pdf/modules/EstimationModule.js";
-import { TransparenzModule } from "./pdf/modules/TransparenzModule.js";
-import { ClosingModule } from "./pdf/modules/CommonModules.js";
 
 import { calculatePositions } from "../logic/pricing/calculator.js";
 
@@ -58,10 +55,6 @@ export const EstimationPDF = ({
 
     return (
         <PDFDocument title={`Angebot - ${state.companyName || "Projekt"}`}>
-            <PDFPage size="A4" style={pdfStyles.titlePage}>
-                <FrontPageModule state={state} headerIcon={headerIcon} date={date} />
-            </PDFPage>
-
             <SimpleLayout {...commonProps}>
                 <EstimationModule
                     state={state}
@@ -70,14 +63,6 @@ export const EstimationPDF = ({
                     date={date}
                 />
             </SimpleLayout>
-
-            <SimpleLayout {...commonProps}>
-                <TransparenzModule pricing={pricing} />
-            </SimpleLayout>
-
-            <SimpleLayout {...commonProps}>
-                <ClosingModule />
-            </SimpleLayout>
         </PDFDocument>
     );
 };
diff --git a/packages/pdf-library/src/components/FrontPagePDF.tsx b/packages/pdf-library/src/components/FrontPagePDF.tsx
new file mode 100644
index 0000000..4c93ea1
--- /dev/null
+++ b/packages/pdf-library/src/components/FrontPagePDF.tsx
@@ -0,0 +1,22 @@
+"use client";
+
+import * as React from "react";
+import { Page as PDFPage, Document as PDFDocument } from "@react-pdf/renderer";
+import { pdfStyles } from "./pdf/SharedUI.js";
+import { FrontPageModule } from "./pdf/modules/FrontPageModule.js";
+
+export const FrontPagePDF = ({ state, headerIcon }: any) => {
+    const date = new Date().toLocaleDateString("de-DE", {
+        year: "numeric",
+        month: "long",
+        day: "numeric",
+    });
+
+    return (
+        <PDFDocument title={`Deckblatt - ${state?.companyName || "Projekt"}`}>
+            <PDFPage size="A4" style={pdfStyles.titlePage}>
+                <FrontPageModule state={state} headerIcon={headerIcon} date={date} />
+            </PDFPage>
+        </PDFDocument>
+    );
+};
diff --git a/packages/pdf-library/src/components/InfoPDF.tsx b/packages/pdf-library/src/components/InfoPDF.tsx
index 486e2fd..43df3d7 100644
--- a/packages/pdf-library/src/components/InfoPDF.tsx
+++ b/packages/pdf-library/src/components/InfoPDF.tsx
@@ -16,6 +16,7 @@ import {
     Divider,
 } from "./pdf/SharedUI.js";
 import { SimpleLayout } from "./pdf/SimpleLayout.js";
+import { TransparenzModule } from "./pdf/modules/TransparenzModule.js";
 
 const styles = PDFStyleSheet.create({
     section: {
@@ -74,7 +75,7 @@ const styles = PDFStyleSheet.create({
     },
 });
 
-export const InfoPDF = ({ headerIcon, footerLogo }: { headerIcon?: string; footerLogo?: string }) => {
+export const InfoPDF = ({ headerIcon, footerLogo, pricing }: { headerIcon?: string; footerLogo?: string; pricing?: any }) => {
     const companyData = {
         name: "Marc Mintel",
         address1: "Georg-Meistermann-Straße 7",
@@ -153,6 +154,12 @@ export const InfoPDF = ({ headerIcon, footerLogo }: { headerIcon?: string; foote
             <PDFText style={[styles.textRegular, { fontSize: FONT_SIZES.SMALL, textAlign: 'center', color: COLORS.TEXT_LIGHT }]}>
                 Marc Mintel — Digital Architect & Senior Software Developer
             </PDFText>
+
+            {pricing && (
+                <PDFView break>
+                    <TransparenzModule pricing={pricing} />
+                </PDFView>
+            )}
         </PDFView>
     );
 
diff --git a/packages/pdf-library/src/components/pdf/SharedUI.tsx b/packages/pdf-library/src/components/pdf/SharedUI.tsx
index 90aeb3b..e5df20d 100644
--- a/packages/pdf-library/src/components/pdf/SharedUI.tsx
+++ b/packages/pdf-library/src/components/pdf/SharedUI.tsx
@@ -525,13 +525,13 @@ export const FoldingMarks = () => (
 export const Footer = ({
     logo,
     companyData,
-    _bankData,
+    bankData,
     showDetails = true,
     showPageNumber = true,
 }: {
     logo?: string;
     companyData: any;
-    _bankData?: any;
+    bankData?: any;
     showDetails?: boolean;
     showPageNumber?: boolean;
 }) => (
diff --git a/packages/pdf-library/src/components/pdf/SimpleLayout.tsx b/packages/pdf-library/src/components/pdf/SimpleLayout.tsx
index 5db6dde..b323c94 100644
--- a/packages/pdf-library/src/components/pdf/SimpleLayout.tsx
+++ b/packages/pdf-library/src/components/pdf/SimpleLayout.tsx
@@ -48,7 +48,7 @@ export const SimpleLayout: React.FC<SimpleLayoutProps> = ({
             <Footer
                 logo={footerLogo}
                 companyData={companyData}
-                _bankData={bankData}
+                bankData={bankData}
                 showDetails={showDetails}
                 showPageNumber={showPageNumber}
             />
diff --git a/packages/pdf-library/src/components/pdf/modules/SitemapModule.tsx b/packages/pdf-library/src/components/pdf/modules/SitemapModule.tsx
index 7f66c0a..3e7999e 100644
--- a/packages/pdf-library/src/components/pdf/modules/SitemapModule.tsx
+++ b/packages/pdf-library/src/components/pdf/modules/SitemapModule.tsx
@@ -9,7 +9,7 @@ import {
 import { DocumentTitle, COLORS, FONT_SIZES } from "../SharedUI";
 
 const styles = StyleSheet.create({
-  section: { marginBottom: 32 },
+  section: { paddingBottom: 16 },
   intro: {
     fontSize: FONT_SIZES.BODY,
     color: COLORS.TEXT_DIM,
diff --git a/packages/pdf-library/src/services/PdfEngine.ts b/packages/pdf-library/src/services/PdfEngine.ts
index 527e858..53ec3ee 100644
--- a/packages/pdf-library/src/services/PdfEngine.ts
+++ b/packages/pdf-library/src/services/PdfEngine.ts
@@ -22,13 +22,15 @@ import { EstimationPDF } from "../components/EstimationPDF.js";
 import { ConceptPDF } from "../components/ConceptPDF.js";
 import { InfoPDF } from "../components/InfoPDF.js";
 import { AgbsPDF } from "../components/AgbsPDF.js";
+import { FrontPagePDF } from "../components/FrontPagePDF.js";
+import { ClosingPDF } from "../components/ClosingPDF.js";
 import { PRICING } from "../logic/pricing/constants.js";
 import { calculateTotals } from "../logic/pricing/calculator.js";
 
 export class PdfEngine {
     constructor() { }
 
-    async generateEstimatePdf(state: any, outputPath: string): Promise<string> {
+    async generateEstimatePdf(state: any, outputPath: string, options: { headerIcon?: string; footerLogo?: string } = {}): Promise<string> {
         const totals = calculateTotals(state, PRICING);
 
         await renderToFile(
@@ -36,6 +38,7 @@ export class PdfEngine {
                 state,
                 totalPrice: totals.totalPrice,
                 pricing: PRICING,
+                ...options
             } as any) as any,
             outputPath
         );
@@ -43,10 +46,11 @@ export class PdfEngine {
         return outputPath;
     }
 
-    async generateConceptPdf(concept: any, outputPath: string): Promise<string> {
+    async generateConceptPdf(concept: any, outputPath: string, options: { headerIcon?: string; footerLogo?: string } = {}): Promise<string> {
         await renderToFile(
             createElement(ConceptPDF as any, {
                 concept,
+                ...options
             } as any) as any,
             outputPath
         );
@@ -56,7 +60,7 @@ export class PdfEngine {
 
     async generateInfoPdf(outputPath: string, options: { headerIcon?: string; footerLogo?: string } = {}): Promise<string> {
         await renderToFile(
-            createElement(InfoPDF as any, options as any) as any,
+            createElement(InfoPDF as any, { ...options, pricing: PRICING } as any) as any,
             outputPath
         );
 
@@ -71,4 +75,25 @@ export class PdfEngine {
 
         return outputPath;
     }
+
+    async generateFrontPagePdf(state: any, outputPath: string, options: { headerIcon?: string } = {}): Promise<string> {
+        await renderToFile(
+            createElement(FrontPagePDF as any, {
+                state,
+                ...options
+            } as any) as any,
+            outputPath
+        );
+
+        return outputPath;
+    }
+
+    async generateClosingPdf(outputPath: string, options: { headerIcon?: string; footerLogo?: string } = {}): Promise<string> {
+        await renderToFile(
+            createElement(ClosingPDF as any, options as any) as any,
+            outputPath
+        );
+
+        return outputPath;
+    }
 }