diff --git a/src/components/PageStrcture/Footer.vue b/src/components/PageStrcture/Footer.vue
index 77529692..252c2abb 100644
--- a/src/components/PageStrcture/Footer.vue
+++ b/src/components/PageStrcture/Footer.vue
@@ -1,8 +1,8 @@
 <template>
   <!-- User Footer -->
-  <footer v-if="text && text !== ''" v-html="text"></footer>
+  <footer v-if="text && text !== '' && visible" v-html="text"></footer>
   <!-- Default Footer -->
-  <footer v-else>
+  <footer v-else-if="visible">
       Developed by <a :href="authorUrl">{{authorName}}</a>.
       Licensed under <a :href="licenseUrl">{{license}}</a>
       {{ showCopyright? '©': '' }} {{date}}.
@@ -11,6 +11,9 @@
 </template>
 
 <script>
+
+import { shouldBeVisible } from '@/utils/MiscHelpers';
+
 export default {
   name: 'Footer',
   props: {
@@ -23,6 +26,11 @@ export default {
     showCopyright: { type: Boolean, default: true },
     repoUrl: { type: String, default: 'https://github.com/lissy93/dashy' },
   },
+  computed: {
+    visible() {
+      return shouldBeVisible(this.$route.name);
+    },
+  },
 };
 </script>
 
diff --git a/src/components/PageStrcture/Header.vue b/src/components/PageStrcture/Header.vue
index 754f3313..6fb4679e 100644
--- a/src/components/PageStrcture/Header.vue
+++ b/src/components/PageStrcture/Header.vue
@@ -1,5 +1,5 @@
 <template>
-    <header>
+    <header v-if="visible">
       <PageTitle
         v-if="titleVisible"
         :title="pageInfo.title"
@@ -14,6 +14,7 @@
 import PageTitle from '@/components/PageStrcture/PageTitle.vue';
 import Nav from '@/components/PageStrcture/Nav.vue';
 import { visibleComponents as defaultVisibleComponents } from '@/utils/defaults';
+import { shouldBeVisible } from '@/utils/MiscHelpers';
 
 export default {
   name: 'Header',
@@ -31,6 +32,11 @@ export default {
       navVisible: (this.visibleComponents || defaultVisibleComponents).navigation,
     };
   },
+  computed: {
+    visible() {
+      return shouldBeVisible(this.$route.name);
+    },
+  },
 };
 </script>