diff --git a/webapp/src/components/DataPage.tsx b/webapp/src/components/DataPage.tsx
index 166c671070151001990421c78fd2c0dca7f211d8..c4a17996ff39aaafe0112d041921cc8e42fcbefa 100644
--- a/webapp/src/components/DataPage.tsx
+++ b/webapp/src/components/DataPage.tsx
@@ -1,10 +1,8 @@
 import React, { ReactElement } from "react";
 import { Container, Row } from "react-bootstrap";
-import { Link } from "react-router-dom";
 
 import OrganizationSidebar from "./OrganizationSidebar";
 import PageHeader from "../components/global/PageHeader"
-import SectionLink from "../components/global/SectionLink";
 import SectionNavigation from "./SectionNavigation";
 import { Sections } from "../helpers/constants";
 import PolicySidebar from "./PolicySidebar";
@@ -28,13 +26,7 @@ function DataPage({ title, description, filter, children, category }: inputProps
         <>
             {category === Sections.Organisation && <OrganizationSidebar />}
             {category === Sections.Policy && <PolicySidebar />}
-            <PageHeader type={'data'} header={<h1 className={'bold-caps-30pt'}>
-                <Link to="/data" style={{ textDecoration: 'none', color: 'white' }}>
-                    <span>Compendium Data</span>
-                </Link>
-            </h1>}>
-                <SectionLink section={"Reports"} />
-            </PageHeader>
+            <PageHeader type={'data'} />
             <SectionNavigation activeCategory={category} />
             <Container className="grow">
                 <Row>
diff --git a/webapp/src/components/global/PageHeader.tsx b/webapp/src/components/global/PageHeader.tsx
index 368b3d92cbd667f0d98461020b13f46303634b57..8d4b8126116f51e9a9820619a87073ead678fe72 100644
--- a/webapp/src/components/global/PageHeader.tsx
+++ b/webapp/src/components/global/PageHeader.tsx
@@ -1,13 +1,15 @@
 import React, { ReactElement } from "react";
 import { Container, Row, Col } from "react-bootstrap";
+import { Link } from "react-router-dom";
+
+import SectionLink from "./SectionLink";
+
 
 interface inputProps {
-    type: string,
-    header: ReactElement,
-    children: ReactElement
+    type: string
 }
 
-function CompendiumHeader({ type, header, children }: inputProps): ReactElement {
+function CompendiumHeader({ type }: inputProps): ReactElement {
     let className = ''
     if (type == 'data') {
         className += ' compendium-data-header'
@@ -20,10 +22,14 @@ function CompendiumHeader({ type, header, children }: inputProps): ReactElement
             <Container>
                 <Row>
                     <Col sm={8}>
-                        {header}
+                        <h1 className={'bold-caps-30pt'} style={{'marginTop': '0.5rem'}}>
+                            <Link to={type === 'data' ? "/data" : "/"} style={{ textDecoration: 'none', color: 'white' }}>
+                                <span>Compendium {type === 'data' ? 'Data' : 'Reports'}</span>
+                            </Link>
+                        </h1>
                     </Col>
                     <Col sm={4}>
-                        {children}
+                        <SectionLink section={"Reports"} />
                     </Col>
                 </Row>
             </Container>
diff --git a/webapp/src/pages/CompendiumData.tsx b/webapp/src/pages/CompendiumData.tsx
index 0ec005d6874caade886b60b31df2e51f39b5bbb7..4563fb1ba4d556b542364d5181439af1607493d1 100644
--- a/webapp/src/pages/CompendiumData.tsx
+++ b/webapp/src/pages/CompendiumData.tsx
@@ -2,7 +2,6 @@ import React, { ReactElement } from "react";
 import { Container, Row } from "react-bootstrap";
 import CollapsibleBox from "../components/CollapsibleBox";
 import PageHeader from "../components/global/PageHeader"
-import SectionLink from "../components/global/SectionLink";
 import Banner from "../components/global/Banner";
 import { Link } from "react-router-dom";
 import { Sections } from "../helpers/constants";
@@ -10,13 +9,7 @@ import { Sections } from "../helpers/constants";
 function CompendiumData(): ReactElement {
     return (
         <main className="content" style={{ backgroundColor: "white" }}>
-            <PageHeader type={'data'} header={<h1 className={'bold-caps-30pt'}>
-                <Link to="/data" style={{ textDecoration: 'none', color: 'white' }}>
-                    <span>Compendium Data</span>
-                </Link>
-            </h1>}>
-                <SectionLink section={"Reports"} />
-            </PageHeader>
+            <PageHeader type={'data'}/>
             <Banner type={'data'}>
                 <p className="wordwrap">
                     The GÉANT Compendium provides an authoritative reference source for anyone with an