diff --git a/src/components/Post.tsx b/src/components/Post.tsx
deleted file mode 100644
index f58e7c0..0000000
--- a/src/components/Post.tsx
+++ /dev/null
@@ -1,182 +0,0 @@
-import { GetPostQuery } from "graphql/generated";
-import useSmartLanguage from "hooks/useSmartLanguage";
-import { AppStaticProps } from "queries/getAppStaticProps";
-import { getStatusDescription, prettySlug } from "queries/helpers";
-import AppLayout from "./AppLayout";
-import Chip from "./Chip";
-import HorizontalLine from "./HorizontalLine";
-import Markdawn from "./Markdown/Markdawn";
-import TOC from "./Markdown/TOC";
-import ReturnButton, { ReturnButtonType } from "./PanelComponents/ReturnButton";
-import ContentPanel from "./Panels/ContentPanel";
-import SubPanel from "./Panels/SubPanel";
-import RecorderChip from "./RecorderChip";
-import ThumbnailHeader from "./ThumbnailHeader";
-import ToolTip from "./ToolTip";
-
-interface Props {
-  post: Exclude<
-    Exclude<
-      GetPostQuery["posts"],
-      null | undefined
-    >["data"][number]["attributes"],
-    null | undefined
-  >;
-  langui: AppStaticProps["langui"];
-  languages: AppStaticProps["languages"];
-  currencies: AppStaticProps["currencies"];
-  returnHref?: string;
-  returnTitle?: string | null | undefined;
-  displayCredits?: boolean;
-  displayToc?: boolean;
-  displayThumbnailHeader?: boolean;
-  displayTitle?: boolean;
-  displayLanguageSwitcher?: boolean;
-  prependBody?: JSX.Element;
-  appendBody?: JSX.Element;
-}
-
-export default function Post(props: Props): JSX.Element {
-  const {
-    post,
-    langui,
-    languages,
-    returnHref,
-    returnTitle,
-    displayCredits,
-    displayToc,
-    displayThumbnailHeader,
-    displayLanguageSwitcher,
-    appendBody,
-    prependBody,
-  } = props;
-  const displayTitle = props.displayTitle ?? true;
-
-  const [selectedTranslation, LanguageSwitcher] = useSmartLanguage({
-    items: post.translations,
-    languages: languages,
-    languageExtractor: (item) => item?.language?.data?.attributes?.code,
-  });
-
-  const thumbnail =
-    selectedTranslation?.thumbnail?.data?.attributes ??
-    post.thumbnail?.data?.attributes;
-
-  const body = selectedTranslation?.body ?? "";
-  const title = selectedTranslation?.title ?? prettySlug(post.slug);
-  const except = selectedTranslation?.excerpt ?? "";
-
-  const subPanel =
-    returnHref || returnTitle || displayCredits || displayToc ? (
-      <SubPanel>
-        {returnHref && returnTitle && (
-          <ReturnButton
-            href={returnHref}
-            title={returnTitle}
-            langui={langui}
-            displayOn={ReturnButtonType.desktop}
-            horizontalLine
-          />
-        )}
-
-        {displayCredits && (
-          <>
-            {selectedTranslation && (
-              <div className="grid grid-flow-col place-items-center place-content-center gap-2">
-                <p className="font-headers">{langui.status}:</p>
-
-                <ToolTip
-                  content={getStatusDescription(
-                    selectedTranslation.status,
-                    langui
-                  )}
-                  maxWidth={"20rem"}
-                >
-                  <Chip>{selectedTranslation.status}</Chip>
-                </ToolTip>
-              </div>
-            )}
-
-            {post.authors && post.authors.data.length > 0 && (
-              <div>
-                <p className="font-headers">{"Authors"}:</p>
-                <div className="grid place-items-center place-content-center gap-2">
-                  {post.authors.data.map((author) => (
-                    <>
-                      {author.attributes && (
-                        <RecorderChip
-                          key={author.id}
-                          langui={langui}
-                          recorder={author.attributes}
-                        />
-                      )}
-                    </>
-                  ))}
-                </div>
-              </div>
-            )}
-
-            <HorizontalLine />
-          </>
-        )}
-
-        {displayToc && <TOC text={body} title={title} />}
-      </SubPanel>
-    ) : undefined;
-
-  const contentPanel = (
-    <ContentPanel>
-      {returnHref && returnTitle && (
-        <ReturnButton
-          href={returnHref}
-          title={returnTitle}
-          langui={langui}
-          displayOn={ReturnButtonType.mobile}
-          horizontalLine
-        />
-      )}
-
-      {displayThumbnailHeader ? (
-        <>
-          <ThumbnailHeader
-            thumbnail={thumbnail}
-            title={title}
-            description={except}
-            langui={langui}
-            categories={post.categories}
-            languageSwitcher={<LanguageSwitcher />}
-          />
-
-          <HorizontalLine />
-        </>
-      ) : (
-        <>
-          {displayLanguageSwitcher && (
-            <div className="grid place-content-end place-items-start">
-              <LanguageSwitcher />
-            </div>
-          )}
-          {displayTitle && (
-            <h1 className="text-center flex gap-3 justify-center text-4xl my-16">
-              {title}
-            </h1>
-          )}
-        </>
-      )}
-
-      {prependBody}
-      <Markdawn text={body} />
-      {appendBody}
-    </ContentPanel>
-  );
-
-  return (
-    <AppLayout
-      navTitle={title}
-      contentPanel={contentPanel}
-      subPanel={subPanel}
-      thumbnail={thumbnail ?? undefined}
-      {...props}
-    />
-  );
-}
diff --git a/src/pages/about-us/accords-handbook.tsx b/src/pages/about-us/accords-handbook.tsx
index 2faba56..f902502 100644
--- a/src/pages/about-us/accords-handbook.tsx
+++ b/src/pages/about-us/accords-handbook.tsx
@@ -1,20 +1,16 @@
-import Post from "components/Post";
-import { GetPostQuery } from "graphql/generated";
+import PostPage, { Post } from "components/PostPage";
 import { getReadySdk } from "graphql/sdk";
 import { GetStaticPropsContext } from "next";
 import { AppStaticProps, getAppStaticProps } from "queries/getAppStaticProps";
 
 interface Props extends AppStaticProps {
-  post: Exclude<
-    GetPostQuery["posts"],
-    null | undefined
-  >["data"][number]["attributes"];
+  post: Post;
 }
 
 export default function AccordsHandbook(props: Props): JSX.Element {
   const { post, langui, languages, currencies } = props;
   return (
-    <Post
+    <PostPage
       currencies={currencies}
       languages={languages}
       langui={langui}
@@ -36,7 +32,7 @@ export async function getStaticProps(
     slug: slug,
     language_code: context.locale ?? "en",
   });
-  if (!post.posts) return { notFound: true };
+  if (!post.posts?.data[0].attributes) return { notFound: true };
   const props: Props = {
     ...(await getAppStaticProps(context)),
     post: post.posts.data[0].attributes,
diff --git a/src/pages/about-us/contact.tsx b/src/pages/about-us/contact.tsx
index ea1477e..91f9b92 100644
--- a/src/pages/about-us/contact.tsx
+++ b/src/pages/about-us/contact.tsx
@@ -1,6 +1,5 @@
 import InsetBox from "components/InsetBox";
-import Post from "components/Post";
-import { GetPostQuery } from "graphql/generated";
+import PostPage, { Post } from "components/PostPage";
 import { getReadySdk } from "graphql/sdk";
 import { GetStaticPropsContext } from "next";
 import { useRouter } from "next/router";
@@ -10,10 +9,7 @@ import { randomInt } from "queries/helpers";
 import { useState } from "react";
 
 interface Props extends AppStaticProps {
-  post: Exclude<
-    GetPostQuery["posts"],
-    null | undefined
-  >["data"][number]["attributes"];
+  post: Post;
 }
 
 export default function AboutUs(props: Props): JSX.Element {
@@ -171,7 +167,7 @@ export default function AboutUs(props: Props): JSX.Element {
   );
 
   return (
-    <Post
+    <PostPage
       currencies={currencies}
       languages={languages}
       langui={langui}
@@ -194,7 +190,7 @@ export async function getStaticProps(
     slug: slug,
     language_code: context.locale ?? "en",
   });
-  if (!post.posts) return { notFound: true };
+  if (!post.posts?.data[0].attributes) return { notFound: true };
   const props: Props = {
     ...(await getAppStaticProps(context)),
     post: post.posts.data[0].attributes,
diff --git a/src/pages/about-us/legality.tsx b/src/pages/about-us/legality.tsx
index 267aa28..a6274a1 100644
--- a/src/pages/about-us/legality.tsx
+++ b/src/pages/about-us/legality.tsx
@@ -1,20 +1,16 @@
-import Post from "components/Post";
-import { GetPostQuery } from "graphql/generated";
+import PostPage, { Post } from "components/PostPage";
 import { getReadySdk } from "graphql/sdk";
 import { GetStaticPropsContext } from "next";
 import { AppStaticProps, getAppStaticProps } from "queries/getAppStaticProps";
 
 interface Props extends AppStaticProps {
-  post: Exclude<
-    GetPostQuery["posts"],
-    null | undefined
-  >["data"][number]["attributes"];
+  post: Post;
 }
 
 export default function SiteInformation(props: Props): JSX.Element {
   const { post, langui, languages, currencies } = props;
   return (
-    <Post
+    <PostPage
       currencies={currencies}
       languages={languages}
       langui={langui}
@@ -36,7 +32,7 @@ export async function getStaticProps(
     slug: slug,
     language_code: context.locale ?? "en",
   });
-  if (!post.posts) return { notFound: true };
+  if (!post.posts?.data[0].attributes) return { notFound: true };
   const props: Props = {
     ...(await getAppStaticProps(context)),
     post: post.posts.data[0].attributes,
diff --git a/src/pages/about-us/sharing-policy.tsx b/src/pages/about-us/sharing-policy.tsx
index cb12216..ed6ce6e 100644
--- a/src/pages/about-us/sharing-policy.tsx
+++ b/src/pages/about-us/sharing-policy.tsx
@@ -1,19 +1,15 @@
-import Post from "components/Post";
-import { GetPostQuery } from "graphql/generated";
+import PostPage, { Post } from "components/PostPage";
 import { getReadySdk } from "graphql/sdk";
 import { GetStaticPropsContext } from "next";
 import { AppStaticProps, getAppStaticProps } from "queries/getAppStaticProps";
 
 interface Props extends AppStaticProps {
-  post: Exclude<
-    GetPostQuery["posts"],
-    null | undefined
-  >["data"][number]["attributes"];
+  post: Post;
 }
 export default function SharingPolicy(props: Props): JSX.Element {
   const { post, langui, languages, currencies } = props;
   return (
-    <Post
+    <PostPage
       currencies={currencies}
       languages={languages}
       langui={langui}
@@ -35,7 +31,7 @@ export async function getStaticProps(
     slug: slug,
     language_code: context.locale ?? "en",
   });
-  if (!post.posts) return { notFound: true };
+  if (!post.posts?.data[0].attributes) return { notFound: true };
   const props: Props = {
     ...(await getAppStaticProps(context)),
     post: post.posts.data[0].attributes,
diff --git a/src/pages/index.tsx b/src/pages/index.tsx
index abcc38d..c318fa2 100644
--- a/src/pages/index.tsx
+++ b/src/pages/index.tsx
@@ -1,20 +1,16 @@
-import Post from "components/Post";
-import { GetPostQuery } from "graphql/generated";
+import PostPage, { Post } from "components/PostPage";
 import { getReadySdk } from "graphql/sdk";
 import { GetStaticPropsContext } from "next";
 import { AppStaticProps, getAppStaticProps } from "queries/getAppStaticProps";
 
 interface Props extends AppStaticProps {
-  post: Exclude<
-    GetPostQuery["posts"],
-    null | undefined
-  >["data"][number]["attributes"];
+  post: Post;
 }
 
 export default function Home(props: Props): JSX.Element {
   const { post, langui, languages, currencies } = props;
   return (
-    <Post
+    <PostPage
       currencies={currencies}
       languages={languages}
       langui={langui}
@@ -43,7 +39,7 @@ export async function getStaticProps(
     slug: slug,
     language_code: context.locale ?? "en",
   });
-  if (!post.posts) return { notFound: true };
+  if (!post.posts?.data[0].attributes) return { notFound: true };
   const props: Props = {
     ...(await getAppStaticProps(context)),
     post: post.posts.data[0].attributes,
diff --git a/src/pages/news/[slug].tsx b/src/pages/news/[slug].tsx
index 2a166ea..58e2d78 100644
--- a/src/pages/news/[slug].tsx
+++ b/src/pages/news/[slug].tsx
@@ -1,4 +1,4 @@
-import Post from "components/Post";
+import PostPage, { Post } from "components/PostPage";
 import { GetPostQuery } from "graphql/generated";
 import { getReadySdk } from "graphql/sdk";
 import {
@@ -9,13 +9,7 @@ import {
 import { AppStaticProps, getAppStaticProps } from "queries/getAppStaticProps";
 
 interface Props extends AppStaticProps {
-  post: Exclude<
-    Exclude<
-      GetPostQuery["posts"],
-      null | undefined
-    >["data"][number]["attributes"],
-    null | undefined
-  >;
+  post: Post;
   postId: Exclude<
     GetPostQuery["posts"],
     null | undefined
@@ -25,7 +19,7 @@ interface Props extends AppStaticProps {
 export default function LibrarySlug(props: Props): JSX.Element {
   const { post, langui, languages, currencies } = props;
   return (
-    <Post
+    <PostPage
       currencies={currencies}
       languages={languages}
       langui={langui}