diff --git a/src/components/Header.svelte b/src/components/Header.svelte
index 56298ccc..9b2fc529 100644
--- a/src/components/Header.svelte
+++ b/src/components/Header.svelte
@@ -23,11 +23,11 @@
   }
 </style>
 
-<div class="flex items-center lg:hidden fixed w-full h-16 header bg-background z-30 shadow-md overflow-hidden">
+<a href="/" class="flex items-center lg:hidden fixed w-full h-16 header bg-background z-30 shadow-md overflow-hidden">
   <h1 class="flex-1 pl-4 md:pl-8 font-display text-3xl font-black text-white relative z-10 pt-2">
     Paimon<span class="text-xl text-primary">.moe</span>
   </h1>
   <div class="p-8 cursor-pointer" on:click={showMenu}>
     <Icon path={mdiMenu} color="white" />
   </div>
-</div>
+</a>
diff --git a/src/components/Sidebar/Title.svelte b/src/components/Sidebar/Title.svelte
index e96a4c1c..5e55c40d 100644
--- a/src/components/Sidebar/Title.svelte
+++ b/src/components/Sidebar/Title.svelte
@@ -1,6 +1,6 @@
-<div class="relative py-2">
+<a href="/" class="relative py-2">
   <h1 class="font-display text-3xl font-black text-white py-4 relative z-10">
     Paimon
     <span class="absolute right-0 text-xl text-primary z-10" style="top: 5px;">.moe</span>
   </h1>
-</div>
+</a>
diff --git a/src/routes/calculator/index.svelte b/src/routes/calculator/index.svelte
index 0745a161..c7d69bea 100644
--- a/src/routes/calculator/index.svelte
+++ b/src/routes/calculator/index.svelte
@@ -40,7 +40,7 @@
 <svelte:head>
   <title>Calculator - Paimon.moe</title>
 </svelte:head>
-<div class="pt-20 lg:ml-64 lg:pt-8 p-8">
+<div class="pt-20 lg:ml-64 lg:pt-8 px-4 md:px-8">
   <div class="flex justify-center md:justify-start mb-4">
     <Button on:click={openHowTo}>
       <Icon size={0.8} path={mdiHelpCircle} />