diff --git a/src/core/pdf-builder.js b/src/core/pdf-builder.js
index b5419df4f0..ad8a213092 100644
--- a/src/core/pdf-builder.js
+++ b/src/core/pdf-builder.js
@@ -78,8 +78,8 @@ export default class PdfBuilder {
             defaultStyle: {
                 fontSize: 10
             },
-            watermark: {...dataFormConfig.displayDoc.watermark},
-            content: [this.#creatTextElement(dataFormConfig?.displayDoc?.headerTitle), dataFormConfig.sections ? this.#transformData() : []]
+            watermark: {...dataFormConfig?.displayDoc.watermark},
+            content: [this.#creatTextElement(dataFormConfig?.displayDoc?.headerTitle), dataFormConfig?.sections ? this.#transformData() : []]
         };
     }
 
diff --git a/src/webcomponents/clinical/clinical-analysis-review.js b/src/webcomponents/clinical/clinical-analysis-review.js
index 2180fa5bf2..37e57eb5a7 100644
--- a/src/webcomponents/clinical/clinical-analysis-review.js
+++ b/src/webcomponents/clinical/clinical-analysis-review.js
@@ -21,7 +21,7 @@ import LitUtils from "../commons/utils/lit-utils.js";
 import ClinicalAnalysisManager from "./clinical-analysis-manager.js";
 import FormUtils from "../commons/forms/form-utils.js";
 import NotificationUtils from "../commons/utils/notification-utils.js";
-import {createPdf} from "../../core/pdf-builder.js";
+import PdfBuilder, {stylePdf} from "../../core/pdf-builder.js";
 import "./clinical-analysis-summary.js";
 import "../variant/interpretation/variant-interpreter-grid.js";
 import "../disease-panel/disease-panel-grid.js";
@@ -334,13 +334,13 @@ export default class ClinicalAnalysisReview extends LitElement {
     }
 
     onDownloadPdf() {
-        const pdfDocument = createPdf({
-            content: [
-                "First paragraph",
-                "Another paragraph, this time a little bit longer to make sure, this line will be divided into at least two lines"
-            ]
-        });
-        pdfDocument.open();
+        // const pdfDocument = new PdfBuilder({}, {
+        //     content: [
+        //         "First paragraph",
+        //         "Another paragraph, this time a little bit longer to make sure, this line will be divided into at least two lines"
+        //     ]
+        // });
+        // pdfDocument.exportToPdf();
     }
 
     render() {
diff --git a/src/webcomponents/individual/individual-view.js b/src/webcomponents/individual/individual-view.js
index 9d8c646813..cb4398bc76 100644
--- a/src/webcomponents/individual/individual-view.js
+++ b/src/webcomponents/individual/individual-view.js
@@ -184,7 +184,7 @@ export default class IndividualView extends LitElement {
                             title: "Individual ID",
                             type: "custom",
                             display: {
-                                render: data => html`
+                                render: data => `
                                     <span style="font-weight: bold">${data.id}</span> (UUID: ${data.uuid})
                                 `,
                             },
@@ -272,7 +272,7 @@ export default class IndividualView extends LitElement {
                             field: "internal.status",
                             type: "custom",
                             display: {
-                                render: field => field ? html`${field.name} (${UtilsNew.dateFormatter(field.date)})` : "-"
+                                render: field => field ? `${field.name} (${UtilsNew.dateFormatter(field.date)})` : "-"
                             },
                         },
                         {
@@ -280,7 +280,7 @@ export default class IndividualView extends LitElement {
                             field: "creationDate",
                             type: "custom",
                             display: {
-                                render: field => field ? html`${UtilsNew.dateFormatter(field)}` : "-"
+                                render: field => field ? UtilsNew.dateFormatter(field) : "-"
                             },
                         },
                         {
@@ -288,7 +288,7 @@ export default class IndividualView extends LitElement {
                             field: "modificationDate",
                             type: "custom",
                             display: {
-                                render: field => field ? html`${UtilsNew.dateFormatter(field)}` : "-"
+                                render: field => field ? UtilsNew.dateFormatter(field) : "-"
                             },
                         },
                         {