diff --git a/Configuration/TypoScript/Setup/Page.typoscript b/Configuration/TypoScript/Setup/Page.typoscript
index 8f63eb3..b5ea66f 100644
--- a/Configuration/TypoScript/Setup/Page.typoscript
+++ b/Configuration/TypoScript/Setup/Page.typoscript
@@ -8,6 +8,18 @@ page {
         viewport = width=device-width, initial-scale=1
     }
 
+    # Just an idea to add layout based class, if necessary
+    # bodyTagCObject = COA
+    # bodyTagCObject {
+    #     10 = COA
+    #     10 {
+    #         10 =< page.10.templateName.cObject
+    #         10.wrap = Layout|
+    #         wrap = class="|"
+    #     }
+    #     stdWrap.noTrimWrap = |<body |>|
+    # }
+
     10 = FLUIDTEMPLATE
     10 {
         templateName {
diff --git a/Resources/Private/Layouts/Page/Default.html b/Resources/Private/Layouts/Page/Default.html
index 3aaf78f..114d99a 100644
--- a/Resources/Private/Layouts/Page/Default.html
+++ b/Resources/Private/Layouts/Page/Default.html
@@ -1,12 +1,7 @@
 <html xmlns:f="http://typo3.org/ns/TYPO3/Fluid/ViewHelpers"
     data-namespace-typo3-fluid="true">
     <header>
-        <div>
-            <a href="/">{settings.websiteTitle}</a>
-        </div>
-        <nav>
-            <a href="{f:uri.page(pageUid: 1. pageType: 1533906435, additionalParams: {sitemap: 'rssFeedAllBlogPosts'})}">RSS Feed</a>
-        </nav>
+        <a href="/">{settings.websiteTitle}</a>
     </header>
 
     <main>
diff --git a/Resources/Private/Partials/Page/FooterMenu.html b/Resources/Private/Partials/Page/FooterMenu.html
index ce79bf4..654ae09 100644
--- a/Resources/Private/Partials/Page/FooterMenu.html
+++ b/Resources/Private/Partials/Page/FooterMenu.html
@@ -1,6 +1,7 @@
 <html xmlns:f="http://typo3.org/ns/TYPO3/CMS/Fluid/ViewHelpers"
     data-namespace-typo3-fluid="true">
     <nav>
+        <a href="{f:uri.page(pageUid: 1. pageType: 1533906435, additionalParams: {sitemap: 'rssFeedAllBlogPosts'})}">RSS Feed</a>
         <f:for each="{pages}" as="page">
             <a href="{page.link}">{page.title}</a>
         </f:for>
diff --git a/Resources/Private/Sass/_layout.scss b/Resources/Private/Sass/_layout.scss
index e958e37..05d1afc 100644
--- a/Resources/Private/Sass/_layout.scss
+++ b/Resources/Private/Sass/_layout.scss
@@ -2,7 +2,6 @@
 @import "layout/content";
 @import "layout/footer";
 @import "layout/elements";
-@import "layout/pages/singleBlogPost";
 
 body {
     @extend .container;
diff --git a/Resources/Private/Sass/layout/_header.scss b/Resources/Private/Sass/layout/_header.scss
index 1b3b237..42539ae 100644
--- a/Resources/Private/Sass/layout/_header.scss
+++ b/Resources/Private/Sass/layout/_header.scss
@@ -1,26 +1,8 @@
 body > header {
-    @extend .row;
-
     padding-bottom: $spacer * 4;
 
-    & > div {
-        @extend .col-12;
-        @extend .col-sm-8;
-
-        a {
-            font-size: $h1-font-size;
-            text-decoration: none;
-        }
-    }
-
-    nav {
-        @extend .col-12;
-        @extend .col-sm-4;
-
-        padding-top: $spacer;
-
-        a {
-            color: $text-muted !important;
-        }
+    a {
+        font-size: $h1-font-size;
+        text-decoration: none;
     }
 }
diff --git a/Resources/Private/Sass/layout/pages/_singleBlogPost.scss b/Resources/Private/Sass/layout/pages/_singleBlogPost.scss
deleted file mode 100644
index eace8c1..0000000
--- a/Resources/Private/Sass/layout/pages/_singleBlogPost.scss
+++ /dev/null
@@ -1,11 +0,0 @@
-article.single-blog-post {
-    padding-top: 0;
-
-    > header {
-        margin-bottom: 0;
-    }
-
-    h1, h2, h3, h4, h5, h6 {
-        padding-top: $spacer * 2;
-    }
-}
diff --git a/Resources/Private/Templates/ErrorHandling/404.html b/Resources/Private/Templates/ErrorHandling/404.html
deleted file mode 100644
index 9daeafb..0000000
--- a/Resources/Private/Templates/ErrorHandling/404.html
+++ /dev/null
@@ -1 +0,0 @@
-test
diff --git a/Resources/Private/Templates/Page/BlogPost.html b/Resources/Private/Templates/Page/BlogPost.html
index 5b8c0e4..1abd4ba 100644
--- a/Resources/Private/Templates/Page/BlogPost.html
+++ b/Resources/Private/Templates/Page/BlogPost.html
@@ -7,7 +7,7 @@
         <header>
             <h1>Blog Post</h1>
         </header>
-        <article class="single-blog-post">
+        <article>
             {f:render(partial: 'BlogPostHeader', arguments: {
                 title: data.title,
                 blogPost : data,
