diff --git a/Configuration/Services.yaml b/Configuration/Services.yaml
index 1040552..56552b1 100644
--- a/Configuration/Services.yaml
+++ b/Configuration/Services.yaml
@@ -8,6 +8,8 @@ services:
     resource: '../Classes/*'
   B13\Backendpreviews\Hooks\BackendPreviewRenderer:
     public: true
+  B13\Backendpreviews\Service\DatabaseRowService:
+    public: true
   B13\Backendpreviews\Listener\PageContentPreviewRendering:
     tags:
       - name: event.listener
diff --git a/Configuration/Sets/b13/page.tsconfig b/Configuration/Sets/b13/page.tsconfig
index 58cfce4..244007a 100644
--- a/Configuration/Sets/b13/page.tsconfig
+++ b/Configuration/Sets/b13/page.tsconfig
@@ -3,3 +3,7 @@ mod.web_layout.tt_content.preview.view {
   partialRootPaths.0 = EXT:backendpreviews/Resources/Private/Partials
   templateRootPaths.0 = EXT:backendpreviews/Resources/Private/Templates
 }
+
+[typo3.version < 14]
+    mod.web_layout.tt_content.preview.view.partialRootPaths.1 = EXT:backendpreviews/Resources/Private/PartialsLegacy
+[END]
diff --git a/Resources/Private/Partials/Defaults/CTypeLabel.html b/Resources/Private/Partials/Defaults/CTypeLabel.html
index 7e8b253..e72d8c8 100644
--- a/Resources/Private/Partials/Defaults/CTypeLabel.html
+++ b/Resources/Private/Partials/Defaults/CTypeLabel.html
@@ -10,9 +10,12 @@
     <f:else if="{CType-label}">
         {CType-label}
     </f:else>
+    <f:else if="{record.CType}">
+			{f:translate(key: 'LLL:EXT:backendpreviews/Resources/Private/Language/locallang_db.xlf:CType.label')}: {record.CType -> f:format.case(mode: 'capital')}
+		</f:else>
     <f:else>
-        {f:translate(key: 'LLL:EXT:backendpreviews/Resources/Private/Language/locallang_db.xlf:CType.label')}: {CType -> f:format.case(mode: 'capital')}
+			{f:translate(key: 'LLL:EXT:backendpreviews/Resources/Private/Language/locallang_db.xlf:CType.label')}: {CType -> f:format.case(mode: 'capital')}
     </f:else>
 </f:if>
 
-</html>
\ No newline at end of file
+</html>
diff --git a/Resources/Private/Partials/Defaults/Header.html b/Resources/Private/Partials/Defaults/Header.html
index e1ec93a..8b2f19a 100644
--- a/Resources/Private/Partials/Defaults/Header.html
+++ b/Resources/Private/Partials/Defaults/Header.html
@@ -4,5 +4,6 @@
 >
 
 <f:if condition="{header}"><span class="b_header">{header}</span><br></f:if>
+<f:if condition="{record.header}"><span class="b_header">{record.header}</span><br></f:if>
 
-</html>
\ No newline at end of file
+</html>
diff --git a/Resources/Private/Partials/Defaults/Subheader.html b/Resources/Private/Partials/Defaults/Subheader.html
index d99ea86..f2d9e78 100644
--- a/Resources/Private/Partials/Defaults/Subheader.html
+++ b/Resources/Private/Partials/Defaults/Subheader.html
@@ -3,6 +3,7 @@
         data-namespace-typo3-fluid="true"
 >
 
+<f:if condition="{record.subheader}"><span class="b_subheader">{record.subheader}</span><br></f:if>
 <f:if condition="{subheader}"><span class="b_subheader">{subheader}</span><br></f:if>
 
-</html>
\ No newline at end of file
+</html>
diff --git a/Resources/Private/PartialsLegacy/Link.html b/Resources/Private/PartialsLegacy/Link.html
new file mode 100644
index 0000000..9c3109b
--- /dev/null
+++ b/Resources/Private/PartialsLegacy/Link.html
@@ -0,0 +1,16 @@
+<html
+	xmlns:f="http://typo3.org/ns/TYPO3/CMS/Fluid/ViewHelpers"
+	data-namespace-typo3-fluid="true"
+>
+
+<f:if condition="{link}">
+	<div class="b_link">
+		<span class="b_label">{f:translate(key: 'LLL:EXT:backendpreviews/Resources/Private/Language/locallang_db.xlf:link.label')}: </span>{linklabel}
+		({f:if(condition: '{f:uri.typolink(parameter: link, language: language)}', then: '{f:uri.typolink(parameter: link.url, language: language)}', else: link)})
+		<f:if condition="{config}">
+			[{f:translate(key: 'LLL:EXT:backendpreviews/Resources/Private/Language/locallang_db.xlf:link.config')}: {config}]
+		</f:if>
+	</div>
+</f:if>
+
+</html>
