diff --git a/author.hbs b/author.hbs
index e475ea4..a0e3bc5 100644
--- a/author.hbs
+++ b/author.hbs
@@ -1,16 +1,12 @@
 {{!< default}}
-<div>
-{{> "site-header"}}
-</div>
-
 {{#author}}
-<div class="h-64 relative">
+<div class="relative group index-header">
   {{> header-background background=feature_image}} {{!--Special header-image.hbs partial to generate the background image--}}
     <div class="h-full opacity-50 bg-black">
     </div>
   </div>
   <div class="absolute bottom-0 py-6 h-full left-0 right-0">
-   <div class="container mx-auto px-2 sm:px-8 md:px-16 lg:px-32 xl:px-64 h-full  flex flex-col justify-end items-begin">
+   <div class="container mx-auto px-2 sm:px-8 md:px-16 lg:px-32 xl:px-64 h-full flex flex-col justify-end items-begin">
     <div class="my-2">
       <p class="bg-red-700 w-auto inline-block px-2 py-1 text-white text-sm">Author</p>
     </div>
@@ -49,6 +45,9 @@
     </div>
    </div>
   </div>
+  <div class="w-full flex flex-row justify-begin items-center absolute top-0 index-navbar">
+  {{> "site-header"}}
+  </div>
 </div>
 {{/author}}
 
diff --git a/package.json b/package.json
index 2a2605e..5cf03d0 100644
--- a/package.json
+++ b/package.json
@@ -1,7 +1,7 @@
 {
     "name": "yuika",
     "description": "nanao.moe's blog theme",
-    "version": "0.4.0",
+    "version": "0.5.0",
     "engines": {
         "ghost-api": "v3"
     },
diff --git a/tag.hbs b/tag.hbs
index 0356c54..f6eb5a7 100644
--- a/tag.hbs
+++ b/tag.hbs
@@ -1,16 +1,13 @@
 {{!< default}}
-<div>
-{{> "site-header"}}
-</div>
 
 {{#tag}}
-<div class="h-64 relative">
+<div class="relative group index-header">
   {{> header-background background=feature_image}} {{!--Special header-image.hbs partial to generate the background image--}}
     <div class="h-full opacity-50 bg-black">
     </div>
   </div>
-  <div class="absolute bottom-0 py-6">
-   <div class="container mx-auto px-2 sm:px-8 md:px-16 lg:px-32 xl:px-64">
+  <div class="absolute bottom-0 py-6 h-full left-0 right-0">
+   <div class="container mx-auto px-2 sm:px-8 md:px-16 lg:px-32 xl:px-64 h-full flex flex-col justify-end items-begin">
     <div>
       <p class="bg-blue-700 w-auto inline-block px-2 py-1 text-white text-sm">Tag</p>
     </div>
@@ -26,6 +23,9 @@
     </div>
    </div>
   </div>
+  <div class="w-full flex flex-row justify-begin items-center absolute top-0 index-navbar">
+  {{> "site-header"}}
+  </div>
 </div>
 {{/tag}}