diff --git a/web/typo3conf/ext/ep_products/Classes/Controller/TeamController.php b/web/typo3conf/ext/ep_products/Classes/Controller/TeamController.php
index 7abe54ef..a272d490 100644
--- a/web/typo3conf/ext/ep_products/Classes/Controller/TeamController.php
+++ b/web/typo3conf/ext/ep_products/Classes/Controller/TeamController.php
@@ -70,6 +70,29 @@ class TeamController extends ActionController
         if ($member === null) {
             $this->redirect('list');
         }
+
         $this->view->assign('member', $member);
+        $this->view->assign('data', $this->configurationManager->getContentObject()->data);
+        $this->view->assign('header', $this->coalesceHeader($member));
+    }
+
+    /**
+     * @param Teammember $member
+     *
+     * @return string
+     */
+    public function coalesceHeader(Teammember $member)
+    {
+        $data = $this->configurationManager->getContentObject()->data;
+        if (isset($data['header']) && $data['header'] !== '') {
+            return $data['header'];
+        }
+
+        $firstCategory = current($member->getCategories()->toArray());
+        if ($firstCategory !== null) {
+            return $firstCategory->getTitle();
+        }
+
+        return '';
     }
 }
diff --git a/web/typo3conf/ext/ep_products/Classes/Domain/Model/Teammember.php b/web/typo3conf/ext/ep_products/Classes/Domain/Model/Teammember.php
index a3f0ebf5..d7d1fffe 100644
--- a/web/typo3conf/ext/ep_products/Classes/Domain/Model/Teammember.php
+++ b/web/typo3conf/ext/ep_products/Classes/Domain/Model/Teammember.php
@@ -169,7 +169,7 @@ class Teammember extends \TYPO3\CMS\Extbase\DomainObject\AbstractEntity
     }
 
     /**
-     * @return ObjectStorage<\TYPO3\CMS\Extbase\Domain\Model\Category>
+     * @return \TYPO3\CMS\Extbase\Persistence\ObjectStorage<\TYPO3\CMS\Extbase\Domain\Model\Category>
      */
     public function getCategories()
     {
diff --git a/web/typo3conf/ext/ep_products/Configuration/FlexForms/flexform_teammembers.xml b/web/typo3conf/ext/ep_products/Configuration/FlexForms/flexform_teammembers.xml
index 1e235dfa..cd686559 100644
--- a/web/typo3conf/ext/ep_products/Configuration/FlexForms/flexform_teammembers.xml
+++ b/web/typo3conf/ext/ep_products/Configuration/FlexForms/flexform_teammembers.xml
@@ -10,6 +10,28 @@
 				</TCEforms>
 				<type>array</type>
 				<el>
+					<settings.teamListPID>
+						<TCEforms>
+							<exclude>0</exclude>
+							<label>Listenansicht PID</label>
+							<config>
+								<type>input</type>
+								<size>20</size>
+								<eval>required</eval>
+							</config>
+						</TCEforms>
+					</settings.teamListPID>
+					<settings.teamShowPID>
+						<TCEforms>
+							<exclude>0</exclude>
+							<label>Einzelansicht PID</label>
+							<config>
+								<type>input</type>
+								<size>20</size>
+								<eval>required</eval>
+							</config>
+						</TCEforms>
+					</settings.teamShowPID>
 					<settings.teamCategories>
 						<TCEforms>
 							<exclude>0</exclude>
diff --git a/web/typo3conf/ext/ep_theme/Classes/Hook/Tcemain.php b/web/typo3conf/ext/ep_theme/Classes/Hook/Tcemain.php
index 051ad035..2262f6c7 100644
--- a/web/typo3conf/ext/ep_theme/Classes/Hook/Tcemain.php
+++ b/web/typo3conf/ext/ep_theme/Classes/Hook/Tcemain.php
@@ -35,7 +35,6 @@ class Tcemain
     /**
      * @param array $fields
      * @param string $table
-     * @param string $table
      * @param int $id
      * @param DataHandler $dataHandler
      */
diff --git a/web/typo3conf/ext/ep_theme/Resources/Private/Templates/FluidStyledContent/List.html b/web/typo3conf/ext/ep_theme/Resources/Private/Templates/FluidStyledContent/List.html
index 2d84bebe..e2268de1 100644
--- a/web/typo3conf/ext/ep_theme/Resources/Private/Templates/FluidStyledContent/List.html
+++ b/web/typo3conf/ext/ep_theme/Resources/Private/Templates/FluidStyledContent/List.html
@@ -94,13 +94,6 @@
                     <f:cObject typoscriptObjectPath="tt_content.list.20.{data.list_type}" data="{data}"/>
                 </ep:container>
             </f:case>
-            <f:comment>Teammembers Plugin</f:comment>
-            <f:case value="epproducts_teammembers">
-                <f:render section="Header" arguments="{_all}"/>
-                <ep:container data="{data}">
-                    <f:cObject typoscriptObjectPath="tt_content.list.20.{data.list_type}" data="{data}"/>
-                </ep:container>
-            </f:case>
             <f:comment>Default</f:comment>
             <f:case default="1">
                 <f:cObject typoscriptObjectPath="tt_content.list.20.{data.list_type}" data="{data}"/>
diff --git a/web/typo3conf/ext/ep_theme/Resources/Private/Templates/Team/List.html b/web/typo3conf/ext/ep_theme/Resources/Private/Templates/Team/List.html
index dd27d656..697b6c65 100644
--- a/web/typo3conf/ext/ep_theme/Resources/Private/Templates/Team/List.html
+++ b/web/typo3conf/ext/ep_theme/Resources/Private/Templates/Team/List.html
@@ -21,6 +21,7 @@
     <f:section name="Member">
         <div class="col-xs-12 col-sm-6 col-md-3">
             <a href="{f:uri.action(
+                pageUid: settings.teamShowPID,
                 action: 'show',
                 extensionName: 'epproducts',
                 pluginName: 'teammembers',
diff --git a/web/typo3conf/ext/ep_theme/Resources/Private/Templates/Team/Show.html b/web/typo3conf/ext/ep_theme/Resources/Private/Templates/Team/Show.html
index 63788f45..9ad97ffa 100644
--- a/web/typo3conf/ext/ep_theme/Resources/Private/Templates/Team/Show.html
+++ b/web/typo3conf/ext/ep_theme/Resources/Private/Templates/Team/Show.html
@@ -7,6 +7,8 @@
     <f:layout name="Default"/>
 
     <f:section name="Main">
+        <f:render section="Header" arguments="{_all}"/>
+
         <div class="container ep-employee-detail">
             <div class="col-md-12">
                 <div class="row">
@@ -38,6 +40,7 @@
                 <div class="row">
                     <div class="col-md-8 col-md-offset-4">
                         <a href="{f:uri.action(
+                            pageUid: settings.teamListPID,
                             action: 'list',
                             extensionName: 'epproducts',
                             pluginName: 'teammembers'
@@ -48,4 +51,16 @@
         </div>
     </f:section>
 
+    <f:section name="Header">
+        <f:if condition="{header}">
+            <ep:container data="{data}">
+                <div class="row">
+                    <div class="col-md-12">
+                        <f:render partial="Header/Header" arguments="{header: header, subheader: data.subheader, layout: data.header_layout, link: data.header_link, default: settings.defaultHeaderType}" />
+                    </div>
+                </div>
+            </ep:container>
+        </f:if>
+    </f:section>
+
 </html>
diff --git a/web/typo3conf/realurl_conf.php b/web/typo3conf/realurl_conf.php
index 6e0bf221..051581c2 100644
--- a/web/typo3conf/realurl_conf.php
+++ b/web/typo3conf/realurl_conf.php
@@ -132,6 +132,7 @@ $GLOBALS['TYPO3_CONF_VARS']['EXTCONF']['realurl'] = [
             880 => 'ajax',
             881 => 'ajax',
             347 => 'team',
+            1446 => 'team',
             987 => 'events_contactform',
             1300 => 'events_activity',
             'newsDetailConfiguration' => [