diff --git a/typo3/sysext/backend/Resources/Private/Partials/DocHeader.html b/typo3/sysext/backend/Resources/Private/Partials/DocHeader.html
index 6ed37a7c3cfa7c042cf243e4663c6af30a7a36a7..f58ace3d2f1efb4e07a028e26f7a87760478bf26 100644
--- a/typo3/sysext/backend/Resources/Private/Partials/DocHeader.html
+++ b/typo3/sysext/backend/Resources/Private/Partials/DocHeader.html
@@ -1,39 +1,36 @@
 <div class="module-loading-indicator"></div>
 <div class="module-docheader t3js-module-docheader">
     <div class="module-docheader-bar module-docheader-bar-navigation t3js-module-docheader-bar t3js-module-docheader-bar-navigation row">
+        <f:variable name="columnCssClass">module-docheader-bar-column-left col-xs-12 text-right</f:variable>
         <f:if condition="{docHeader.menus}">
-            <f:then>
-                <f:if condition="{docHeader.menus->f:count()} > 1">
-                    <f:then>
-                        <div class="module-docheader-bar-column-left col-xs-12 col-sm-5 col-md-6 col-lg-4">
-                            <div class="form-inline row">
-                                <f:for each="{docHeader.menus}" as="menu">
-                                    <div class="form-group form-group-sm col-xs-6">
-                                        <f:render partial="Menus/SelectBoxJumpMenu" arguments="{menu:menu}"/>
-                                    </div>
-                                </f:for>
-                            </div>
+            <f:if condition="{docHeader.menus -> f:count()} > 1">
+                <f:then>
+                    <f:variable name="columnCssClass">module-docheader-bar-column-right col-xs-12 col-sm-7 col-md-6 col-lg-8 text-right</f:variable>
+                    <div class="module-docheader-bar-column-left col-xs-12 col-sm-5 col-md-6 col-lg-4">
+                        <div class="form-inline row">
+                            <f:for each="{docHeader.menus}" as="menu">
+                                <div class="form-group form-group-sm col-xs-6">
+                                    <f:render partial="Menus/SelectBoxJumpMenu" arguments="{menu:menu}"/>
+                                </div>
+                            </f:for>
                         </div>
-                        <div class="module-docheader-bar-column-right col-xs-12 col-sm-7 col-md-6 col-lg-8 text-right">
-                    </f:then>
-                    <f:else>
-                        <div class="module-docheader-bar-column-left col-xs-12 col-sm-3">
-                            <div class="form-inline">
-                                <f:for each="{docHeader.menus}" as="menu">
-                                    <div class="form-group form-group-sm">
-                                        <f:render partial="Menus/SelectBoxJumpMenu" arguments="{menu:menu}"/>
-                                    </div>
-                                </f:for>
-                            </div>
+                    </div>
+                </f:then>
+                <f:else>
+                    <f:variable name="columnCssClass">module-docheader-bar-column-right col-xs-12 col-sm-9 text-right</f:variable>
+                    <div class="module-docheader-bar-column-left col-xs-12 col-sm-3">
+                        <div class="form-inline">
+                            <f:for each="{docHeader.menus}" as="menu">
+                                <div class="form-group form-group-sm">
+                                    <f:render partial="Menus/SelectBoxJumpMenu" arguments="{menu:menu}"/>
+                                </div>
+                            </f:for>
                         </div>
-                        <div class="module-docheader-bar-column-right col-xs-12 col-sm-9 text-right">
-                    </f:else>
-                </f:if>
-            </f:then>
-            <f:else>
-                <div class="module-docheader-bar-column-left col-xs-12 text-right">
-            </f:else>
+                    </div>
+                </f:else>
+            </f:if>
         </f:if>
+        <div class="{columnCssClass}">
             <f:if condition="{docHeader.metaInformation.recordInformation}">
                 <span class="typo3-docheader-pagePath">
                     <f:translate key="LLL:EXT:core/Resources/Private/Language/locallang_core.xlf:labels.path"/>: <f:format.raw>{docHeader.metaInformation.path}</f:format.raw>
diff --git a/typo3/sysext/tstemplate/Resources/Private/Templates/PageZero.html b/typo3/sysext/tstemplate/Resources/Private/Templates/PageZero.html
index 096f5e99d44ea656027e23c6e97bd27748fa7bff..fb50cc46c3f62948f6d4af9e365bf442d5352349 100644
--- a/typo3/sysext/tstemplate/Resources/Private/Templates/PageZero.html
+++ b/typo3/sysext/tstemplate/Resources/Private/Templates/PageZero.html
@@ -78,7 +78,7 @@
     </tr>
     <f:if condition="{page}">
         <!-- Additional templates -->
-        <f:if condition="{f:count({page._templates})}">
+        <f:if condition="{page._templates -> f:count()}">
             <f:for each="{page._templates}" as="template" iteration="i">
                 <f:if condition="{i.index} > 0">
                     <f:render section="PageZeroTableRow" arguments="{page: 0, level: level, template: template}" />
@@ -86,7 +86,7 @@
             </f:for>
         </f:if>
         <!-- Subpages -->
-        <f:if condition="{f:count({page._nodes})}">
+        <f:if condition="{page._nodes -> f:count()}">
             <f:for each="{page._nodes}" as="page">
                 <f:render section="PageZeroTableRow" arguments="{page: page, level: '{level + 1}', template: page._templates.0}" />
             </f:for>