diff --git a/Resources/Private/Partials/PageLayout/ActionControls.html b/Resources/Private/Partials/PageLayout/ActionControls.html
index 150ccc7..333486e 100644
--- a/Resources/Private/Partials/PageLayout/ActionControls.html
+++ b/Resources/Private/Partials/PageLayout/ActionControls.html
@@ -10,7 +10,7 @@
             </a>
         </f:then>
         <f:else>
-            <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')}">
+            <typo3-backend-new-content-element-wizard-button  class="btn btn-default btn-sm" url="{url}" 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>
diff --git a/Resources/Private/Partials/PageLayout/Grid/Column.html b/Resources/Private/Partials/PageLayout/Grid/Column.html
index bef2cc1..030ed02 100644
--- a/Resources/Private/Partials/PageLayout/Grid/Column.html
+++ b/Resources/Private/Partials/PageLayout/Grid/Column.html
@@ -13,12 +13,13 @@
 </f:variable>
 
 <td valign="top" colspan="{column.colSpan}" rowspan="{column.rowSpan}"
-    data-colpos="{column.columnNumber}" data-tx-container-parent="{column.containerUid}" data-language-uid="{column.context.siteLanguage.languageId}"
+    data-colpos="{column.columnNumber}" data-language-uid="{column.context.siteLanguage.languageId}"
     class="{columnClasses -> f:spaceless()}"
     role="group" aria-labelledby="{columnIdentifier}">
     <f:render partial="PageLayout/Grid/ColumnHeader" arguments="{_all}" />
     <f:if condition="{column.active} || {column.unused}">
         <div data-colpos="{column.columnNumber}" data-language-uid="{column.context.siteLanguage.languageId}"
+             data-tx-container-parent="{column.containerUid}"
              data-collapse-colpos="{column.containerUid}-{column.columnNumber}"
              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')}">