diff --git a/Resources/Private/Layouts/Submodule.html b/Resources/Private/Layouts/Submodule.html
deleted file mode 100644
index e0d5bfcd5..000000000
--- a/Resources/Private/Layouts/Submodule.html
+++ /dev/null
@@ -1,6 +0,0 @@
-<html xmlns:f="http://typo3.org/ns/TYPO3/CMS/Fluid/ViewHelpers" data-namespace-typo3-fluid="true">
-	<f:render section="Header" optional="true"/>
-	<f:flashMessages/>
-	<f:render section="Main" optional="true"/>
-	<f:render partial="Footer" arguments="{_all}"/>
-</html>
diff --git a/Resources/Private/Templates/CompareDatabaseTool/Compare.html b/Resources/Private/Templates/CompareDatabaseTool/Compare.html
index a44197f6b..5e71b25ec 100644
--- a/Resources/Private/Templates/CompareDatabaseTool/Compare.html
+++ b/Resources/Private/Templates/CompareDatabaseTool/Compare.html
@@ -1,11 +1,14 @@
 <html xmlns:f="http://typo3.org/ns/TYPO3/CMS/Fluid/ViewHelpers" data-namespace-typo3-fluid="true">
-	<f:layout name="Submodule" />
+	<f:layout name="Module" />
 
 	<f:section name="Header">
 		<f:render partial="Header" arguments="{moduleName: '{f:translate(key:\'LLL:EXT:in2publish_core/Resources/Private/Language/locallang_mod4.xlf:moduleselector.compare\')}'}" />
 	</f:section>
 
-	<f:section name="Main">
+	<f:section name="Content">
+
+		<f:render partial="Header" arguments="{moduleName: '{f:translate(key:\'LLL:EXT:in2publish_core/Resources/Private/Language/locallang_mod4.xlf:moduleselector.compare\')}'}" />
+
 		<f:if condition="{differences}">
 			<f:then>
 				<f:render partial="Tools/CompareDatabaseTool/TransferNotice" arguments="{_all}" />
@@ -15,5 +18,6 @@
 				<h3><f:translate key="LLL:EXT:in2publish_core/Resources/Private/Language/locallang_mod4.xlf:compare_database.no_differences" /></h3>
 			</f:else>
 		</f:if>
+
 	</f:section>
 </html>
diff --git a/Resources/Private/Templates/CompareDatabaseTool/Index.html b/Resources/Private/Templates/CompareDatabaseTool/Index.html
index f16fedc08..df8d58fc4 100644
--- a/Resources/Private/Templates/CompareDatabaseTool/Index.html
+++ b/Resources/Private/Templates/CompareDatabaseTool/Index.html
@@ -1,11 +1,9 @@
 <html xmlns:f="http://typo3.org/ns/TYPO3/CMS/Fluid/ViewHelpers" data-namespace-typo3-fluid="true">
-	<f:layout name="Submodule" />
+	<f:layout name="Module" />
 
-	<f:section name="Header">
-		<f:render partial="Header" arguments="{moduleName: '{f:translate(key:\'LLL:EXT:in2publish_core/Resources/Private/Language/locallang_mod4.xlf:moduleselector.compare\')}'}" />
-	</f:section>
+	<f:section name="Content">
 
-	<f:section name="Main">
+		<f:render partial="Header" arguments="{moduleName: '{f:translate(key:\'LLL:EXT:in2publish_core/Resources/Private/Language/locallang_mod4.xlf:moduleselector.compare\')}'}" />
 
 		<f:form action="compare" objectName="comparisonRequest" class="form-inline">
 			<div class="card card-default">
diff --git a/Resources/Private/Templates/Letterbox/Index.html b/Resources/Private/Templates/Letterbox/Index.html
index 7a2844a23..8874c8beb 100644
--- a/Resources/Private/Templates/Letterbox/Index.html
+++ b/Resources/Private/Templates/Letterbox/Index.html
@@ -1,11 +1,10 @@
 <html xmlns:f="http://typo3.org/ns/TYPO3/CMS/Fluid/ViewHelpers" data-namespace-typo3-fluid="true">
-	<f:layout name="Submodule" />
+	<f:layout name="Module" />
+
+	<f:section name="Content">
 
-	<f:section name="Header">
 		<f:render partial="Header" arguments="{moduleName: '{f:translate(key:\'LLL:EXT:in2publish_core/Resources/Private/Language/locallang_mod4.xlf:moduleselector.flush_envelopes\')}'}" />
-	</f:section>
 
-	<f:section name="Main">
 		<div class="card-container">
 			<div class="card card-default card-size-small">
 				<div class="card-body">
diff --git a/Resources/Private/Templates/RecordInspector/Index.html b/Resources/Private/Templates/RecordInspector/Index.html
index 3bf04b8d0..65aad3e26 100644
--- a/Resources/Private/Templates/RecordInspector/Index.html
+++ b/Resources/Private/Templates/RecordInspector/Index.html
@@ -1,11 +1,10 @@
 <html xmlns:f="http://typo3.org/ns/TYPO3/CMS/Fluid/ViewHelpers" data-namespace-typo3-fluid="true">
-	<f:layout name="Submodule"/>
+	<f:layout name="Module"/>
+
+	<f:section name="Content">
 
-	<f:section name="Header">
 		<f:render partial="Header" arguments="{moduleName: '{f:translate(key:\'LLL:EXT:in2publish_core/Resources/Private/Language/locallang_mod4.xlf:moduleselector.record_inspector\')}'}" />
-	</f:section>
 
-	<f:section name="Main">
 		<f:form action="inspect">
 			<div class="card card-default">
 				<div class="card-header">
diff --git a/Resources/Private/Templates/RecordInspector/Inspect.html b/Resources/Private/Templates/RecordInspector/Inspect.html
index d1461824d..69136db40 100644
--- a/Resources/Private/Templates/RecordInspector/Inspect.html
+++ b/Resources/Private/Templates/RecordInspector/Inspect.html
@@ -1,11 +1,10 @@
 <html xmlns:f="http://typo3.org/ns/TYPO3/CMS/Fluid/ViewHelpers" data-namespace-typo3-fluid="true">
-	<f:layout name="Submodule" />
+	<f:layout name="Module" />
+
+	<f:section name="Content">
 
-	<f:section name="Header">
 		<f:render partial="Header" arguments="{moduleName: '{f:translate(key:\'LLL:EXT:in2publish_core/Resources/Private/Language/locallang_mod4.xlf:moduleselector.record_inspector\')}'}" />
-	</f:section>
 
-	<f:section name="Main">
 		<div class="card card-default">
 			<div class="card-header">
 				<div class="card-header-body">
diff --git a/Resources/Private/Templates/Registry/Index.html b/Resources/Private/Templates/Registry/Index.html
index 424eae0f6..79992b7dc 100644
--- a/Resources/Private/Templates/Registry/Index.html
+++ b/Resources/Private/Templates/Registry/Index.html
@@ -1,11 +1,10 @@
 <html xmlns:f="http://typo3.org/ns/TYPO3/CMS/Fluid/ViewHelpers" data-namespace-typo3-fluid="true">
-	<f:layout name="Submodule" />
+    <f:layout name="Module" />
+
+	<f:section name="Content">
 
-	<f:section name="Header">
 		<f:render partial="Header" arguments="{moduleName: '{f:translate(key:\'LLL:EXT:in2publish_core/Resources/Private/Language/locallang_mod4.xlf:moduleselector.flush_registry\')}'}" />
-	</f:section>
 
-	<f:section name="Main">
 		<div class="card-container">
 			<div class="card card-default card-size-small">
 				<div class="card-body">
diff --git a/Resources/Private/Templates/ShowConfiguration/Index.html b/Resources/Private/Templates/ShowConfiguration/Index.html
index 786543a18..4ebef0017 100755
--- a/Resources/Private/Templates/ShowConfiguration/Index.html
+++ b/Resources/Private/Templates/ShowConfiguration/Index.html
@@ -1,11 +1,10 @@
 <html xmlns:f="http://typo3.org/ns/TYPO3/CMS/Fluid/ViewHelpers" data-namespace-typo3-fluid="true">
-	<f:layout name="Submodule" />
+	<f:layout name="Module" />
+
+	<f:section name="Content">
 
-	<f:section name="Header">
 		<f:render partial="Header" arguments="{moduleName: '{f:translate(key:\'LLL:EXT:in2publish_core/Resources/Private/Language/locallang_mod4.xlf:moduleselector.configuration\')}'}" />
-	</f:section>
 
-	<f:section name="Main">
 		<a id="global-configuration"></a>
 		<f:render section="navigation" />
 		<div class="card card-default">
diff --git a/Resources/Private/Templates/SystemInformationExport/SysInfoDecode.html b/Resources/Private/Templates/SystemInformationExport/SysInfoDecode.html
index aec0174e4..9d314cc18 100644
--- a/Resources/Private/Templates/SystemInformationExport/SysInfoDecode.html
+++ b/Resources/Private/Templates/SystemInformationExport/SysInfoDecode.html
@@ -1,11 +1,10 @@
 <html xmlns:f="http://typo3.org/ns/TYPO3/CMS/Fluid/ViewHelpers" data-namespace-typo3-fluid="true">
-	<f:layout name="Submodule" />
+	<f:layout name="Module" />
+
+	<f:section name="Content">
 
-	<f:section name="Header">
 		<f:render partial="Header" arguments="{moduleName: '{f:translate(key:\'LLL:EXT:in2publish_core/Resources/Private/Language/locallang_mod4.xlf:moduleselector.system_info\')}'}" />
-	</f:section>
 
-	<f:section name="Main">
 		<div class="card card-default">
 			<div class="card-body">
 				<f:form action="sysInfoDecode" method="post">
diff --git a/Resources/Private/Templates/SystemInformationExport/SysInfoIndex.html b/Resources/Private/Templates/SystemInformationExport/SysInfoIndex.html
index e85ebd171..84b486e7f 100644
--- a/Resources/Private/Templates/SystemInformationExport/SysInfoIndex.html
+++ b/Resources/Private/Templates/SystemInformationExport/SysInfoIndex.html
@@ -2,13 +2,12 @@
 	  xmlns:core="http://typo3.org/ns/TYPO3/CMS/Core/ViewHelpers"
 	  data-namespace-typo3-fluid="true"
 >
-	<f:layout name="Submodule" />
+	<f:layout name="Module" />
+
+	<f:section name="Content">
 
-	<f:section name="Header">
 		<f:render partial="Header" arguments="{moduleName: '{f:translate(key:\'LLL:EXT:in2publish_core/Resources/Private/Language/locallang_mod4.xlf:moduleselector.system_info\')}'}" />
-	</f:section>
 
-	<f:section name="Main">
 		<div class="card-container">
 			<div class="card card-default card-size-medium">
 				<div class="card-body">
diff --git a/Resources/Private/Templates/SystemInformationExport/SysInfoShow.html b/Resources/Private/Templates/SystemInformationExport/SysInfoShow.html
index bcb253b77..2d3579103 100644
--- a/Resources/Private/Templates/SystemInformationExport/SysInfoShow.html
+++ b/Resources/Private/Templates/SystemInformationExport/SysInfoShow.html
@@ -1,11 +1,10 @@
 <html xmlns:f="http://typo3.org/ns/TYPO3/CMS/Fluid/ViewHelpers" data-namespace-typo3-fluid="true">
-	<f:layout name="Submodule" />
+	<f:layout name="Module" />
+
+	<f:section name="Content">
 
-	<f:section name="Header">
 		<f:render partial="Header" arguments="{moduleName: '{f:translate(key:\'LLL:EXT:in2publish_core/Resources/Private/Language/locallang_mod4.xlf:moduleselector.system_info\')}'}" />
-	</f:section>
 
-	<f:section name="Main">
 		<div class="card card-default">
 			<div class="card-header">
 				<div class="card-header-body">
diff --git a/Resources/Private/Templates/Tca/Index.html b/Resources/Private/Templates/Tca/Index.html
index 9a7a64a7b..65647db1d 100755
--- a/Resources/Private/Templates/Tca/Index.html
+++ b/Resources/Private/Templates/Tca/Index.html
@@ -1,11 +1,10 @@
 <html xmlns:f="http://typo3.org/ns/TYPO3/CMS/Fluid/ViewHelpers" data-namespace-typo3-fluid="true">
-	<f:layout name="Submodule" />
+	<f:layout name="Module" />
+
+	<f:section name="Content">
 
-	<f:section name="Header">
 		<f:render partial="Header" arguments="{moduleName: '{f:translate(key:\'LLL:EXT:in2publish_core/Resources/Private/Language/locallang_mod4.xlf:moduleselector.tca\')}'}" />
-	</f:section>
 
-	<f:section name="Main">
 		<a id="in2publish--compatible-tca"></a>
 		<f:render section="navigation" />
 		<div class="card card-success">
diff --git a/Resources/Private/Templates/Test/Index.html b/Resources/Private/Templates/Test/Index.html
index cb76218a5..b03c3b462 100755
--- a/Resources/Private/Templates/Test/Index.html
+++ b/Resources/Private/Templates/Test/Index.html
@@ -1,11 +1,10 @@
 <html xmlns:f="http://typo3.org/ns/TYPO3/CMS/Fluid/ViewHelpers" data-namespace-typo3-fluid="true">
-	<f:layout name="Submodule" />
+	<f:layout name="Module" />
+
+	<f:section name="Content">
 
-	<f:section name="Header">
 		<f:render partial="Header" arguments="{moduleName: '{f:translate(key:\'LLL:EXT:in2publish_core/Resources/Private/Language/locallang_mod4.xlf:moduleselector.test\')}'}" />
-	</f:section>
 
-	<f:section name="Main">
 		<div class="card">
 			<div class="card-body">
 				<div class="in2publish-messages">
diff --git a/Resources/Private/Templates/Tools/Index.html b/Resources/Private/Templates/Tools/Index.html
index cc55fa5ce..1fad34426 100755
--- a/Resources/Private/Templates/Tools/Index.html
+++ b/Resources/Private/Templates/Tools/Index.html
@@ -1,16 +1,16 @@
 <html xmlns:f="http://typo3.org/ns/TYPO3/CMS/Fluid/ViewHelpers" data-namespace-typo3-fluid="true">
-	<f:layout name="Submodule" />
+	<f:layout name="Module" />
 
-	<f:section name="Header">
+	<f:section name="Content">
 		<f:render partial="Header" arguments="{moduleName: '{f:translate(key:\'LLL:EXT:in2publish_core/Resources/Private/Language/locallang_mod4.xlf:moduleselector.index\')}'}" />
-	</f:section>
-
-	<f:section name="Main">
+		<f:flashMessages/>
 		<div class="card-container">
 			<f:if condition="{supports}">
 				<f:render partial="Tools/GetHelp" arguments="{_all}" />
 			</f:if>
 			<f:render partial="Tools/IntroductionMenu" arguments="{_all}" />
 		</div>
+		<f:render partial="Footer" arguments="{_all}"/>
 	</f:section>
+
 </html>
