diff --git a/src/components/global/Footer.astro b/src/components/global/Footer.astro
new file mode 100644
index 0000000..137bd3c
--- /dev/null
+++ b/src/components/global/Footer.astro
@@ -0,0 +1,23 @@
+---
+// Settings
+import { SiteSettings, FeelbackConfig } from '@config'
+import {version} from '../../../package.json'
+---
+
+<div class="footer">
+    <div class="footer-start">
+        <p>© {SiteSettings.OrgName}. All right reserved.</p>
+    </div>
+    <div class="footer-end">
+        {SiteSettings.WhiteLabel ?
+            <p>Built with <a href="#">ButterflyVu</a></p>
+            :
+            null
+        }
+        {SiteSettings.FooterVersion ?
+            <p style="opacity: 0.5;">v{version}</p>
+            :
+            null
+        }
+    </div>
+</div>
\ No newline at end of file
diff --git a/src/layouts/Document.astro b/src/layouts/Document.astro
index d90c2de..3e123d2 100755
--- a/src/layouts/Document.astro
+++ b/src/layouts/Document.astro
@@ -1,7 +1,6 @@
 ---
 // Settings
-import { SiteSettings, FeelbackConfig } from '@config'
-import {version} from '../../package.json'
+import { FeelbackConfig } from '@config'
 
 // Properties
 const { frontmatter, Title, Feedback, Feelback } = Astro.props
@@ -9,6 +8,7 @@ const { frontmatter, Title, Feedback, Feelback } = Astro.props
 // Components
 import Head from '@components/global/Head.astro'
 import Header from '@components/global/Header.astro'
+import Footer from '@components/global/Footer.astro'
 import Sidebar from '@components/Sidebar.astro'
 import FeelbackYesNo from "astro-feelback/components/FeelbackYesNo.astro"
 import {Zorn} from "@minpluto/zorn"
@@ -41,25 +41,9 @@ import "@styles/prism.css"
             }
         </div>
     </article>
-
+    <Footer/>    
+    <!-- Zorn is broken if a player is not already set -->
     <Zorn is:raw PlayerName="zorn_null" Poster="#" Video="#"/>
-    <div class="footer">
-        <div class="footer-start">
-            <p>© {SiteSettings.OrgName}. All right reserved.</p>
-        </div>
-        <div class="footer-end">
-            {SiteSettings.WhiteLabel ?
-                <p>Built with <a href="#">ButterflyVu</a></p>
-                :
-                null
-            }
-            {SiteSettings.FooterVersion ?
-                <p style="opacity: 0.5;">v{version}</p>
-                :
-                null
-            }
-        </div>
-    </div>
 </div>
 
 <!-- Zorn is broken if a player is not already set -->
diff --git a/src/layouts/Splash.astro b/src/layouts/Splash.astro
index 3931229..fc5792a 100755
--- a/src/layouts/Splash.astro
+++ b/src/layouts/Splash.astro
@@ -1,14 +1,11 @@
 ---
-// Settings
-import { SiteSettings } from '@config'
-import {version} from '../../package.json'
-
 // Properties
 const { frontmatter } = Astro.props
 
 // Components
 import Head from '@components/global/Head.astro'
 import Header from '@components/global/Header.astro'
+import Footer from '@components/global/Footer.astro'
 import FeelbackYesNo from "astro-feelback/components/FeelbackYesNo.astro";
 
 // Styles
@@ -26,8 +23,8 @@ import "@styles/feelback.css";
                 <h1>{frontmatter.Title}</h1>
                 <p>{frontmatter.Description}</p>
                 <div class="splash-action">
-                    <a href={frontmatter.PrimaryLink} class="button">{frontmatter.PrimaryText}</a>
-                    <a href={frontmatter.SecondaryLink} class="button-secondary">{frontmatter.SecondaryText}</a>
+                    {frontmatter.PrimaryText ? <a href={frontmatter.PrimaryLink} class="button">{frontmatter.PrimaryText}</a> : null}
+                    {frontmatter.SecondaryText ? <a href={frontmatter.SecondaryLink} class="button-secondary">{frontmatter.SecondaryText}</a> : null}
                 </div>
             </div>
             <img src={frontmatter.Banner}/>
@@ -36,22 +33,6 @@ import "@styles/feelback.css";
             <slot/>
         </div>
     </div>
-    <div class="footer">
-        <div class="footer-start">
-            <p>© {SiteSettings.OrgName}. All right reserved.</p>
-        </div>
-        <div class="footer-end">
-            {SiteSettings.WhiteLabel ?
-                <p>Built with <a href="#">ButterflyVu</a></p>
-                :
-                null
-            }
-            {SiteSettings.FooterVersion ?
-                <p style="opacity: 0.5;">v{version}</p>
-                :
-                null
-            }
-        </div>
-    </div>
+    <Footer/>
 </div>
 </html>
\ No newline at end of file