diff --git a/Resources/Private/Partials/PageLayout/ActionControls.html b/Resources/Private/Partials/PageLayout/ActionControls.html
index 53f2fe2..150ccc7 100644
--- a/Resources/Private/Partials/PageLayout/ActionControls.html
+++ b/Resources/Private/Partials/PageLayout/ActionControls.html
@@ -4,17 +4,15 @@
 <div class="t3-page-ce-actions t3js-page-new-ce" id="colpos-{column.columnNumber}-page-{column.context.pageId}-{column.uniqueId}">
     <f:if condition="{column.newContentElementWizardShouldBeSkipped}">
         <f:then>
-            <a href="{column.newContentUrl}" title="{newContentTitle}" class="btn btn-default btn-sm">
+            <a class="btn btn-default btn-sm" href="{column.newContentUrl}" title="{f:translate(key: 'LLL:EXT:backend/Resources/Private/Language/locallang_layout.xlf:newContentElement')}">
                 <core:icon identifier="actions-add" />
                 <f:translate key="LLL:EXT:backend/Resources/Private/Language/locallang_layout.xlf:createNewContent" />
             </a>
         </f:then>
         <f:else>
-            <typo3-backend-new-content-element-wizard-button  class="btn btn-default btn-sm" url="{column.newContentUrl}" subject="{newContentTitle}">
-                <button type="button" class="btn btn-default btn-sm">
-                    <core:icon identifier="actions-add" />
-                    <f:translate key="LLL:EXT:backend/Resources/Private/Language/locallang_layout.xlf:createNewContent" />
-                </button>
+            <typo3-backend-new-content-element-wizard-button  class="btn btn-default btn-sm" url="{column.newContentUrl}" subject="{f:translate(key: 'LLL:EXT:backend/Resources/Private/Language/locallang_layout.xlf:newContentElement')}">
+                <core:icon identifier="actions-add" />
+                <f:translate key="LLL:EXT:backend/Resources/Private/Language/locallang_layout.xlf:createNewContent" />
             </typo3-backend-new-content-element-wizard-button>
         </f:else>
     </f:if>
diff --git a/Resources/Private/Partials/PageLayout/Grid/Column.html b/Resources/Private/Partials/PageLayout/Grid/Column.html
index caebd1d..bef2cc1 100644
--- a/Resources/Private/Partials/PageLayout/Grid/Column.html
+++ b/Resources/Private/Partials/PageLayout/Grid/Column.html
@@ -7,6 +7,8 @@
     {f:if(condition: column.unassigned, then: 't3-grid-cell-unassigned')}
     {f:if(condition: '!{column.active} && !{column.unused}', then: 't3-grid-cell-restricted')}
     {f:if(condition: '!{column.active} && {hideRestrictedColumns} && !{column.unused}', then: 't3-grid-cell-hidden')}
+    t3-gridCell-width{column.colSpan}
+    t3-gridCell-height{column.rowSpan}
     {f:if(condition: column.definition.collapsed, then: 'collapsed')}
 </f:variable>
 
@@ -18,7 +20,8 @@
     <f:if condition="{column.active} || {column.unused}">
         <div data-colpos="{column.columnNumber}" data-language-uid="{column.context.siteLanguage.languageId}"
              data-collapse-colpos="{column.containerUid}-{column.columnNumber}"
-             class="t3-page-ce-wrapper {f:if(condition: column.items, else: 't3-page-ce-empty')}">
+             class="t3js-sortable t3js-sortable-lang t3js-sortable-lang-{column.context.siteLanguage.languageId} t3-page-ce-wrapper
+            {f:if(condition: column.items, else: 't3-page-ce-empty')}">
             <f:for each="{column.items}" as="item">
                 <f:render partial="PageLayout/Record" arguments="{_all}" />
             </f:for>
diff --git a/Resources/Private/Partials/PageLayout/Grid/ColumnHeader.html b/Resources/Private/Partials/PageLayout/Grid/ColumnHeader.html
index 529b6e9..4e167b1 100644
--- a/Resources/Private/Partials/PageLayout/Grid/ColumnHeader.html
+++ b/Resources/Private/Partials/PageLayout/Grid/ColumnHeader.html
@@ -6,42 +6,16 @@
     <f:if condition="{column.active}">
         <f:then>
             <div class="t3-page-column-header-icons">
-                <f:if condition="{collapsable}">
-                    <a href="#"
-                       class="btn btn-sm btn-default btn-borderless t3js-toggle-container-column"
-                       title="{f:translate(key: 'LLL:EXT:ew_collapsible_container/Resources/Private/Language/locallang.xlf:expandcontent')}"
-                       data-toggle-title="{f:translate(key: 'LLL:EXT:ew_collapsible_container/Resources/Private/Language/locallang.xlf:collapsecontent')}"
-                       data-collapse-state="collapsed">
-                        <core:icon identifier="actions-view-list-expand" />
-                    </a>
-                    <a href="#"
-                       class="btn btn-sm btn-default btn-borderless t3js-toggle-container-column"
-                       title="{f:translate(key: 'LLL:EXT:ew_collapsible_container/Resources/Private/Language/locallang.xlf:collapsecontent')}"
-                       data-toggle-title="{f:translate(key: 'LLL:EXT:ew_collapsible_container/Resources/Private/Language/locallang.xlf:expandcontent')}"
-                       data-collapse-state="expanded">
-                        <core:icon identifier="actions-view-list-collapse" />
-                    </a>
-                </f:if>
-
+                <f:render section="collapsibleToggleIcon" arguments="{_all}"/>
                 <f:if condition="{allowEditContent} && {column.editUrl}">
-                    <a href="{column.editUrl}"
-                       class="btn btn-sm btn-default btn-borderless"
-                       title="{f:translate(key: 'LLL:EXT:backend/Resources/Private/Language/locallang_layout.xlf:editColumn')}">
+                    <a href="{column.editUrl}" title="{f:translate(key: 'LLL:EXT:backend/Resources/Private/Language/locallang_layout.xlf:editColumn')}"
+                       class="btn btn-sm btn-default btn-borderless">
                         <core:icon identifier="actions-document-open" />
                     </a>
                 </f:if>
             </div>
             <span id="{columnIdentifier}">{column.title}</span>
-            <f:if condition="{column.definition.showMinItemsWarning}"><span class="fw-bold link-danger">
-                <f:if condition="{column.definition.countOfHiddenItems}">
-                    <f:then>
-                        <f:translate id="LLL:EXT:ew_collapsible_container/Resources/Private/Language/locallang.xlf:minimum-item-count-not-reached-with-hidden" arguments="{1: column.definition.minitems, 2: column.definition.countOfHiddenItems}"/>
-                    </f:then>
-                    <f:else>
-                        <f:translate id="LLL:EXT:ew_collapsible_container/Resources/Private/Language/locallang.xlf:minimum-item-count-not-reached" arguments="{1: column.definition.minitems}"/>
-                    </f:else>
-                </f:if>
-            </span></f:if>
+            <f:render section="collapsibleMinitemWarning" arguments="{_all}"/>
         </f:then>
         <f:else if="{column.unused}">
             <span id="{columnIdentifier}"><f:translate key="LLL:EXT:backend/Resources/Private/Language/locallang_layout.xlf:unusedColPos"/></span>
@@ -57,18 +31,56 @@
 <f:format.raw>{column.beforeSectionMarkup}</f:format.raw>
 <f:if condition="{allowEditContent} && {column.contentEditable} && {column.context.allowNewContent} && {column.active}">
     <div class="t3-page-ce t3js-page-ce" data-page="{column.context.pageId}" id="{column.uniqueId}">
-        <f:render partial="PageLayout/ActionControls" arguments="{column: column, newContentTitle: newContentTitle, allowEditContent: allowEditContent, url: column.newContentUrl}" />
+        <f:render partial="PageLayout/ActionControls" arguments="{column: column, allowEditContent: allowEditContent, url: column.newContentUrl}" />
         <div class="t3-page-ce-dropzone t3js-page-ce-dropzone-available"></div>
     </div>
 </f:if>
 
-<f:if condition="{collapsable}">
-    <div class="m-3 container-collapsed-column-marker t3js-expand-column">
-        <button type="button" class="btn btn-default btn-sm me-2">
-            <core:icon identifier="actions-view-list-expand"/>
-        </button>
-        {f:translate(key: 'LLL:EXT:ew_collapsible_container/Resources/Private/Language/locallang.xlf:contentcollapsed')}
-    </div>
-</f:if>
+<f:render section="collapsibleExpandIcon" arguments="{_all}"/>
+
+<f:section name="collapsibleToggleIcon">
+    <f:if condition="{collapsable}">
+        <a href="#"
+           class="btn btn-sm btn-default btn-borderless t3js-toggle-container-column"
+           title="{f:translate(key: 'LLL:EXT:ew_collapsible_container/Resources/Private/Language/locallang.xlf:expandcontent')}"
+           data-toggle-title="{f:translate(key: 'LLL:EXT:ew_collapsible_container/Resources/Private/Language/locallang.xlf:collapsecontent')}"
+           data-collapse-state="collapsed">
+            <core:icon identifier="actions-view-list-expand" />
+        </a>
+        <a href="#"
+           class="btn btn-sm btn-default btn-borderless t3js-toggle-container-column"
+           title="{f:translate(key: 'LLL:EXT:ew_collapsible_container/Resources/Private/Language/locallang.xlf:collapsecontent')}"
+           data-toggle-title="{f:translate(key: 'LLL:EXT:ew_collapsible_container/Resources/Private/Language/locallang.xlf:expandcontent')}"
+           data-collapse-state="expanded">
+            <core:icon identifier="actions-view-list-collapse" />
+        </a>
+    </f:if>
+</f:section>
+
+<f:section name="collapsibleMinitemWarning">
+    <f:if condition="{column.definition.showMinItemsWarning}">
+        <div class="fw-bold link-danger">
+            <f:if condition="{column.definition.countOfHiddenItems}">
+                <f:then>
+                    <f:translate id="LLL:EXT:ew_collapsible_container/Resources/Private/Language/locallang.xlf:minimum-item-count-not-reached-with-hidden" arguments="{1: column.definition.minitems, 2: column.definition.countOfHiddenItems}"/>
+                </f:then>
+                <f:else>
+                    <f:translate id="LLL:EXT:ew_collapsible_container/Resources/Private/Language/locallang.xlf:minimum-item-count-not-reached" arguments="{1: column.definition.minitems}"/>
+                </f:else>
+            </f:if>
+        </div>
+    </f:if>
+</f:section>
+
+<f:section name="collapsibleExpandIcon">
+    <f:if condition="{collapsable}">
+        <div class="m-3 container-collapsed-column-marker t3js-expand-column">
+            <button type="button" class="btn btn-default btn-sm me-2">
+                <core:icon identifier="actions-view-list-expand"/>
+            </button>
+            {f:translate(key: 'LLL:EXT:ew_collapsible_container/Resources/Private/Language/locallang.xlf:contentcollapsed')}
+        </div>
+    </f:if>
+</f:section>
 
 </html>
diff --git a/Resources/Private/Partials/PageLayout/Record.html b/Resources/Private/Partials/PageLayout/Record.html
deleted file mode 100644
index 3ba3260..0000000
--- a/Resources/Private/Partials/PageLayout/Record.html
+++ /dev/null
@@ -1,27 +0,0 @@
-<html xmlns:f="http://typo3.org/ns/TYPO3/CMS/Fluid/ViewHelpers" data-namespace-typo3-fluid="true">
-{f:if(condition: '{item.disabled} && {item.context.drawingConfiguration.showHidden} == 0', then: 'display: none;') -> f:variable(name: 'style')}
-<div class="t3-page-ce {item.wrapperClassName} t3js-page-ce t3js-page-ce-sortable" id="element-tt_content-{item.record.uid}" data-table="tt_content" data-uid="{item.record.uid}" data-language-uid="{item.record.sys_language_uid}" style="{style}">
-    <div class="t3-page-ce-element t3-page-ce-dragitem" id="{item.uniqueId}">
-        <f:render partial="PageLayout/Record/{item.record.CType}/Header" arguments="{_all}" optional="1">
-            <f:render partial="PageLayout/RecordDefault/Header" arguments="{_all}" />
-        </f:render>
-        <f:spaceless>
-            <div class="t3-page-ce-body">
-                <f:render partial="PageLayout/RecordDefault/Preview" arguments="{_all}" />
-            </div>
-        </f:spaceless>
-        <f:render partial="PageLayout/Record/{item.record.CType}/Footer" arguments="{_all}" optional="1">
-            <f:render partial="PageLayout/RecordDefault/Footer" arguments="{_all}" />
-        </f:render>
-        <f:if condition="{item.inconsistentLanguage}">
-            <div class="t3-page-ce-footer">
-                <span class="badge badge-warning">{f:translate(key: 'LLL:EXT:core/Resources/Private/Language/locallang_core.xlf:labels.inconsistentLanguageWarning')}</span>
-            </div>
-        </f:if>
-    </div>
-    <f:if condition="{allowEditContent} && {item.column.contentEditable} && {column.context.allowNewContent} && {column.active}">
-        <f:render partial="PageLayout/ActionControls" arguments="{item: item, column: column, allowEditContent: allowEditContent, url: item.newContentAfterUrl}" />
-    </f:if>
-    <div class="t3-page-ce-dropzone t3js-page-ce-dropzone-available"></div>
-</div>
-</html>