diff --git a/src/components/settingComponents/sidebar.jsx b/src/components/settingComponents/sidebar.jsx
index 476923e7..0c763b25 100644
--- a/src/components/settingComponents/sidebar.jsx
+++ b/src/components/settingComponents/sidebar.jsx
@@ -11,30 +11,30 @@ export default function Sidebar() {
       <ul className="mr-2 py-2">
         <li className="py-1">
           <Link href="../settings" passHref>
-            <a className="px-2 py-1 text-lg font-medium text-white hover:text-gray-400 sm:text-base">
+            <div className="px-2 py-1 text-lg font-medium text-white hover:text-gray-400 sm:text-base">
               General
-            </a>
+            </div>
           </Link>
         </li>
         <li className="py-1">
           <Link href="../settings/security" passHref>
-            <a className="px-2 py-1 text-lg font-medium text-white hover:text-gray-400 sm:text-base">
+            <div className="px-2 py-1 text-lg font-medium text-white hover:text-gray-400 sm:text-base">
               Security
-            </a>
+            </div>
           </Link>
         </li>
         <li className="py-1">
           <Link href="../settings/preferences" passHref>
-            <a className="px-2 py-1 text-lg font-medium text-white hover:text-gray-400 sm:text-base">
+            <div className="px-2 py-1 text-lg font-medium text-white hover:text-gray-400 sm:text-base">
               Email Preferences
-            </a>
+            </div>
           </Link>
         </li>
         <li className="py-1">
           <Link href="../settings/billing" passHref>
-            <a className="px-2 py-1 text-lg font-medium text-white hover:text-gray-400 sm:text-base">
+            <div className="px-2 py-1 text-lg font-medium text-white hover:text-gray-400 sm:text-base">
               Billing
-            </a>
+            </div>
           </Link>
         </li>
       </ul>
diff --git a/src/pages/404.jsx b/src/pages/404.jsx
index f4d12a37..19b5e9ca 100644
--- a/src/pages/404.jsx
+++ b/src/pages/404.jsx
@@ -23,17 +23,17 @@ const NotFound = () => {
         </style>
       </Head>
       <div className="grid h-screen place-items-center bg-center">
-        <div className="text-blue-600 mt-12 mx-auto text-center">
+        <div className="text-blue-600 mx-auto text-center">
           <div className='grid-cols-1 grid'>
-            <div>
+            <div className='p-2'>
               <img
-                width="200"
+                width="150"
                 src={`${process.env.NEXT_PUBLIC_FRONTEND_URL}/ctfguide404WithLogo.png`}
-                className='mx-auto text-center mt-10'
+                className='mx-auto text-center mt-5'
                 alt="CTF Guide 404"
               />
               <h1 className='text-white text-xl mt-4'>Uh, oh. We looked everywhere and couldn't find that page.</h1>
-              <div className='bg-black text-white text-left px-4 py-4 mt-4'>
+              <div className='bg-black text-white text-left px-4 py-4 mt-4 mb-4'>
                 <div>
                   root@ctfguide:/home/cat/cat_stuff: <span className='text-yellow-400'>cd {pathname}</span> <br />
                   bash: cd: {pathname}: <span className='text-red-500'>No such file or directory</span>
@@ -45,18 +45,20 @@ const NotFound = () => {
                   <a className='ml-2 hover:text-blue-500 cursor-pointer' href="https://discord.gg/cTp4w9u8F2">[Join our Discord]</a>
                 </div>
               </div>
-              <img
-                width="500"
-                src={`${process.env.NEXT_PUBLIC_FRONTEND_URL}/Kana404.png`}
-                className='mx-auto text-center mt-10'
-                alt="Kana 404"
-              />
+
               <span
                 onClick={() => router.back()}
-                className="mt-6 cursor-pointer text-neutral-200 hover:text-neutral-400 mr-4 text-lg"
+                className="cursor-pointer text-neutral-200 hover:text-neutral-400 mr-4 text-2xl"
               >
                 <i className="fas fa-arrow-left"></i> Go Back
               </span>
+
+              <img
+                width="500"
+                src={`${process.env.NEXT_PUBLIC_FRONTEND_URL}/Kana404.png`}
+                className='mx-auto mt-10 text-center hidden lg:block'
+                alt="Kana 404"
+              />
             </div>
           </div>
         </div>