diff --git a/Classes/Controller/BackendController.php b/Classes/Controller/BackendController.php
index fe347a840d22c01c271fae6b27c483fecca02f8a..74843de70d04333f6b75bfea90347889c9491515 100644
--- a/Classes/Controller/BackendController.php
+++ b/Classes/Controller/BackendController.php
@@ -271,9 +271,7 @@ class BackendController extends ActionController {
 	 * @return  \Psr\Http\Message\ResponseInterface
 	 */
 	protected function createBackendResponse(): \Psr\Http\Message\ResponseInterface {
-		$this->getModuleTemplate();
-		$this->moduleTemplate->setContent($this->view->render());
-		return $this->htmlResponse($this->moduleTemplate->renderContent());
+		return $this->htmlResponse($this->view->render());
 	}
 
 	/**
diff --git a/Resources/Private/Layouts/Backend.html b/Resources/Private/Layouts/Backend.html
index 73ae87a2fdbf1b53bcc8580a0fa8225f38b2ffe5..a132085b79cd7df708f92535f8c44d7fe71bd000 100644
--- a/Resources/Private/Layouts/Backend.html
+++ b/Resources/Private/Layouts/Backend.html
@@ -1,68 +1,61 @@
 {namespace core = TYPO3\CMS\Core\ViewHelpers}
 {namespace sg=SGalinski\SgNews\ViewHelpers}
 
-<f:if condition="{V11}">
-	<f:then>
-		<f:be.pageRenderer	includeRequireJsModules="{
-				0: 'TYPO3/CMS/Backend/ContextMenu',
-				1: 'TYPO3/CMS/Backend/Tooltip',
-				2: 'TYPO3/CMS/SgNews/Backend'}"
-		/>
 
-		<h1>
-			<f:render section="headline" />
-		</h1>
-		<f:render section="content" />
-	</f:then>
-	<f:else>
-		<f:be.container
-			includeRequireJsModules="{
-				0: 'TYPO3/CMS/Backend/ContextMenu',
-				1: 'TYPO3/CMS/Backend/Tooltip',
-				2: 'TYPO3/CMS/SgNews/Backend'}">
-			<div class="module" data-module-id="" data-module-name="">
-				<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">
-						<div class="module-docheader-bar-column-left">
-							<f:for each="{docHeader.menus}" as="menu">
-								<f:be.menus.actionMenu additionalAttributes="{name: menu.identifier}">
-									<f:for each="{menu.menuItems}" as="menuItem">
-										<option value="{menuItem.href}" {f:if(condition: '{menuItem.active}', then: 'selected="selected"')}>{menuItem.title}</option>
-									</f:for>
-								</f:be.menus.actionMenu>
+<f:be.container
+	includeRequireJsModules="{
+		0: 'TYPO3/CMS/Backend/ContextMenu',
+		1: 'TYPO3/CMS/Backend/Tooltip',
+		2: 'TYPO3/CMS/SgNews/Backend'}">
+	<div class="module" data-module-id="" data-module-name="">
+		<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">
+				<div class="module-docheader-bar-column-left">
+					<f:for each="{docHeader.menus}" as="menu">
+						<f:be.menus.actionMenu additionalAttributes="{name: menu.identifier}">
+							<f:for each="{menu.menuItems}" as="menuItem">
+								<option value="{menuItem.href}" {f:if(condition: '{menuItem.active}', then: 'selected="selected"')}>{menuItem.title}</option>
 							</f:for>
-						</div>
-						<div class="module-docheader-bar-column-right">
-							<span class="typo3-docheader-pagePath">
-								<f:if condition="{typo3Version} < 9000000">
-									<f:then>
-										<f:translate key="LLL:EXT:lang/Resources/Private/Language/locallang_core.xlf:labels.path" />: <f:format.raw>{docHeader.metaInformation.path}</f:format.raw>
-									</f:then>
-									<f:else>
-										<f:translate key="LLL:EXT:core/Resources/Private/Language/locallang_core.xlf:labels.path" />: <f:format.raw>{docHeader.metaInformation.path}</f:format.raw>
-									</f:else>
-								</f:if>
-							</span>
-							<f:format.raw>{docHeader.metaInformation.recordInformation}</f:format.raw>
-						</div>
-					</div>
-					<div class="module-docheader-bar module-docheader-bar-buttons t3js-module-docheader-bar t3js-module-docheader-bar-buttons">
-						<div class="module-docheader-bar-column-left">
-						</div>
-						<div class="module-docheader-bar-column-right">
-							<f:render partial="ButtonBar" arguments="{buttons:docHeader.buttons.right}" />
-						</div>
-					</div>
+						</f:be.menus.actionMenu>
+					</f:for>
+				</div>
+				<div class="module-docheader-bar-column-right">
+					<span class="typo3-docheader-pagePath">
+						<f:if condition="{typo3Version} < 9000000">
+							<f:then>
+								<f:translate key="LLL:EXT:lang/Resources/Private/Language/locallang_core.xlf:labels.path" />: <f:format.raw>{docHeader.metaInformation.path}</f:format.raw>
+							</f:then>
+							<f:else>
+								<f:translate key="LLL:EXT:core/Resources/Private/Language/locallang_core.xlf:labels.path" />: <f:format.raw>{docHeader.metaInformation.path}</f:format.raw>
+							</f:else>
+						</f:if>
+					</span>
+					<f:format.raw>{docHeader.metaInformation.recordInformation}</f:format.raw>
 				</div>
 			</div>
-			<div id="typo3-docbody">
-				<div id="typo3-inner-docbody">
-					<h1>
-						<f:render section="headline" />
-					</h1>
-					<f:render section="content" />
+			<div class="module-docheader-bar module-docheader-bar-buttons t3js-module-docheader-bar t3js-module-docheader-bar-buttons">
+				<div class="module-docheader-bar-column-left">
+				</div>
+				<div class="module-docheader-bar-column-right">
+					<f:render partial="ButtonBar" arguments="{buttons:docHeader.buttons.right}" />
 				</div>
 			</div>
-		</f:be.container>
-	</f:else>
-</f:if>
+		</div>
+
+		<f:if condition="{V11}">
+			<f:then>
+				<div class="module-body t3js-module-body">
+			</f:then>
+			<f:else>
+				<div id="typo3-docbody">
+			</f:else>
+		</f:if>
+			<div id="typo3-inner-docbody">
+				<h1>
+					<f:render section="headline" />
+				</h1>
+				<f:render section="content" />
+			</div>
+		</div>
+	</div>
+</f:be.container>