diff --git a/web/typo3conf/ext/ep_events/Configuration/TypoScript/Extensions/Form.typoscript b/web/typo3conf/ext/ep_events/Configuration/TypoScript/Extensions/Form.typoscript
index cc762f3c..e1f6073b 100644
--- a/web/typo3conf/ext/ep_events/Configuration/TypoScript/Extensions/Form.typoscript
+++ b/web/typo3conf/ext/ep_events/Configuration/TypoScript/Extensions/Form.typoscript
@@ -1 +1 @@
-<INCLUDE_TYPOSCRIPT: source="FILE:EXT:form_legacy/Configuration/TypoScript/setup.txt">
+<INCLUDE_TYPOSCRIPT: source="FILE:EXT:form/Configuration/TypoScript/setup.txt">
diff --git a/web/typo3conf/ext/ep_events/Configuration/TypoScript/constants.txt b/web/typo3conf/ext/ep_events/Configuration/TypoScript/constants.txt
index de1610df..6b56066c 100644
--- a/web/typo3conf/ext/ep_events/Configuration/TypoScript/constants.txt
+++ b/web/typo3conf/ext/ep_events/Configuration/TypoScript/constants.txt
@@ -22,8 +22,6 @@ plugin.tx_epevents {
         activityListPageUid =
         # cat=plugin.tx_epevents//a; type=string; label=Inquiry page UID
         inquiryPageUid =
-        # cat=plugin.tx_epevents//a; type=string; label=Feedback page UID
-        feedbackPageUid =
         # cat=plugin.tx_epevents//a; type=string; label=Ajax page UID
         ajaxPageUid =
         # cat=plugin.tx_epevents//a; type=string; label=Search page UID
diff --git a/web/typo3conf/ext/ep_events/Configuration/TypoScript/setup.txt b/web/typo3conf/ext/ep_events/Configuration/TypoScript/setup.txt
index d32cafa7..7838aaa6 100644
--- a/web/typo3conf/ext/ep_events/Configuration/TypoScript/setup.txt
+++ b/web/typo3conf/ext/ep_events/Configuration/TypoScript/setup.txt
@@ -47,7 +47,6 @@ plugin.tx_epevents {
         dataProtectionPageUid = {$plugin.tx_epevents.settings.dataProtectionPageUid}
         legalNoticePageUid = {$plugin.tx_epevents.settings.legalNoticePageUid}
         termsPageUid = {$plugin.tx_epevents.settings.termsPageUid}
-        feedbackPageUid = {$plugin.tx_epevents.settings.feedbackPageUid}
         searchLogIgnoreIps = {$plugin.tx_epevents.settings.searchLogIgnoreIps}
         activityDefaultHeaderImage = {$plugin.tx_epevents.settings.activityDefaultHeaderImage}
         activityDefaultKeywordsImage = {$plugin.tx_epevents.settings.activityDefaultKeywordsImage}
diff --git a/web/typo3conf/ext/ep_events/Resources/Private/Layouts/FluidStyledContent/Default.html b/web/typo3conf/ext/ep_events/Resources/Private/Layouts/FluidStyledContent/Default.html
index 8b8422db..0d4e0f51 100644
--- a/web/typo3conf/ext/ep_events/Resources/Private/Layouts/FluidStyledContent/Default.html
+++ b/web/typo3conf/ext/ep_events/Resources/Private/Layouts/FluidStyledContent/Default.html
@@ -2,6 +2,6 @@
       xmlns="http://www.w3.org/1999/xhtml"
       xmlns:f="http://typo3.org/ns/fluid/ViewHelpers">
 
-    <f:render section="Content"/>
+    <f:render section="Main" optional="true"/>
 
 </html>
diff --git a/web/typo3conf/ext/ep_events/Resources/Private/Templates/FluidStyledContent/Banner.html b/web/typo3conf/ext/ep_events/Resources/Private/Templates/FluidStyledContent/Banner.html
index b648cad0..dcbb1e87 100644
--- a/web/typo3conf/ext/ep_events/Resources/Private/Templates/FluidStyledContent/Banner.html
+++ b/web/typo3conf/ext/ep_events/Resources/Private/Templates/FluidStyledContent/Banner.html
@@ -6,7 +6,7 @@
 
     <f:layout name="Default"/>
 
-    <f:section name="Content">
+    <f:section name="Main">
         <div class="banner {ep:sectionCssClass(sectionValue: data.tx_epevents_configurator_travel_type)}">
             <div class="banner__content">
                 <span class="banner__title">{data.bodytext -> f:format.nl2br()}</span>
diff --git a/web/typo3conf/ext/ep_events/Resources/Private/Templates/FluidStyledContent/Header.html b/web/typo3conf/ext/ep_events/Resources/Private/Templates/FluidStyledContent/Header.html
index 8534ea2e..06363cce 100644
--- a/web/typo3conf/ext/ep_events/Resources/Private/Templates/FluidStyledContent/Header.html
+++ b/web/typo3conf/ext/ep_events/Resources/Private/Templates/FluidStyledContent/Header.html
@@ -5,7 +5,7 @@
 
     <f:layout name="Default" />
 
-    <f:section name="Content">
+    <f:section name="Main">
         <f:render partial="Header/Header" arguments="{
                 header: data.header,
                 subheader: data.subheader,
diff --git a/web/typo3conf/ext/ep_events/Resources/Private/Templates/FluidStyledContent/Herounit.html b/web/typo3conf/ext/ep_events/Resources/Private/Templates/FluidStyledContent/Herounit.html
index 4391dc8b..1bdd0ea9 100644
--- a/web/typo3conf/ext/ep_events/Resources/Private/Templates/FluidStyledContent/Herounit.html
+++ b/web/typo3conf/ext/ep_events/Resources/Private/Templates/FluidStyledContent/Herounit.html
@@ -6,7 +6,7 @@
 
     <f:layout name="Default"/>
 
-    <f:section name="Content">
+    <f:section name="Main">
         <f:spaceless>
             <f:if condition="{image.0.uid}">
                 <f:then>
diff --git a/web/typo3conf/ext/ep_events/Resources/Private/Templates/FluidStyledContent/List.html b/web/typo3conf/ext/ep_events/Resources/Private/Templates/FluidStyledContent/List.html
index b5201335..3f8f2e36 100644
--- a/web/typo3conf/ext/ep_events/Resources/Private/Templates/FluidStyledContent/List.html
+++ b/web/typo3conf/ext/ep_events/Resources/Private/Templates/FluidStyledContent/List.html
@@ -4,7 +4,7 @@
 
     <f:layout name="Default"/>
 
-    <f:section name="Content">
+    <f:section name="Main">
         <f:cObject typoscriptObjectPath="tt_content.list.20.{data.list_type}" data="{data}" />
     </f:section>
 
diff --git a/web/typo3conf/ext/ep_events/Resources/Private/Templates/FluidStyledContent/Statement.html b/web/typo3conf/ext/ep_events/Resources/Private/Templates/FluidStyledContent/Statement.html
index 5cdb383a..acc33e0e 100644
--- a/web/typo3conf/ext/ep_events/Resources/Private/Templates/FluidStyledContent/Statement.html
+++ b/web/typo3conf/ext/ep_events/Resources/Private/Templates/FluidStyledContent/Statement.html
@@ -6,7 +6,7 @@
 
     <f:layout name="Default"/>
 
-    <f:section name="Content">
+    <f:section name="Main">
         <div class="statement {ep:sectionCssClass(sectionValue: data.tx_epevents_configurator_travel_type)}">
             <div class="statement__inner">
                 {data.bodytext -> v:iterator.explode(glue: 'constant:LF') -> v:variable.set(name: 'items')}
diff --git a/web/typo3conf/ext/ep_events/Resources/Private/Templates/FluidStyledContent/Tile.html b/web/typo3conf/ext/ep_events/Resources/Private/Templates/FluidStyledContent/Tile.html
index c21086e7..2a4d2576 100644
--- a/web/typo3conf/ext/ep_events/Resources/Private/Templates/FluidStyledContent/Tile.html
+++ b/web/typo3conf/ext/ep_events/Resources/Private/Templates/FluidStyledContent/Tile.html
@@ -5,7 +5,7 @@
 
     <f:layout name="Default"/>
 
-    <f:section name="Content">
+    <f:section name="Main">
         <a class="tile" href="{f:uri.typolink(parameter: data.header_link)}" title="{data.header}">
             <div class="tile__inner" style="background-image: url({f:uri.image(image: image.0, cropVariant: 'default')})">
                 <div class="tile__caption {ep:sectionCssClass(sectionValue: data.tx_epevents_configurator_travel_type)}">
diff --git a/web/typo3conf/ext/ep_events/Resources/Private/Templates/Form/Configurator.html b/web/typo3conf/ext/ep_events/Resources/Private/Templates/Form/Configurator.html
index 93ff7bc8..d417e0b8 100644
--- a/web/typo3conf/ext/ep_events/Resources/Private/Templates/Form/Configurator.html
+++ b/web/typo3conf/ext/ep_events/Resources/Private/Templates/Form/Configurator.html
@@ -211,12 +211,6 @@
                                         <button class="button button--configurator"
                                                 v-on:click.prevent="submitForm">&raquo; jetzt anfragen</button>
                                     </div>
-                                    <f:if condition="{settings.feedbackPageUid}">
-                                        <div class="form__item form__item--link form__item--mobile">
-                                            <f:link.typolink class="form__link"
-                                                         parameter="{settings.feedbackPageUid}">Feedback</f:link.typolink>
-                                        </div>
-                                    </f:if>
                                 </div>
                             </div>
                         </div>
@@ -262,12 +256,6 @@
                                 <button class="button button--configurator"
                                         v-on:click.prevent="submitForm">&raquo; jetzt anfragen</button>
                             </div>
-                            <f:if condition="{settings.feedbackPageUid}">
-                                <div class="form__item form__item--link form__item--desktop">
-                                    <f:link.typolink class="form__link"
-                                                 parameter="{settings.feedbackPageUid}">Feedback</f:link.typolink>
-                                </div>
-                            </f:if>
                         </div>
                     </div>
                     <div class="configurator__overlay" v-show="processing">