diff --git a/layouts/404.html b/layouts/404.html
index eb0e307..5eb5533 100644
--- a/layouts/404.html
+++ b/layouts/404.html
@@ -1,11 +1,13 @@
-<!DOCTYPE html>
-<html lang="en">
-<head>
-    <meta charset="UTF-8">
-    <meta name="viewport" content="width=device-width, initial-scale=1.0">
-    <title>404 Page</title>
-</head>
-<body>
-    <h1>It seems you got lost....</h1>
-</body>
-</html>
\ No newline at end of file
+{{ define "navbar" }}
+    {{ partial "navbar-2.html" (dict "baseURL" .Site.BaseURL "title" .Site.Title "hasToggleButton" true) }}
+{{ end }}
+
+{{ define "content" }}
+<div class="notFound">
+    <img src="/assets/images/404.png" alt="">
+    <div class="message">
+        <h1>404</h1>
+        <h4>The page you are looking for is not done yet.</h4>
+    </div>
+</div>
+{{ end }}
diff --git a/layouts/partials/footer.html b/layouts/partials/footer.html
index 7f65f40..7eb67e6 100644
--- a/layouts/partials/footer.html
+++ b/layouts/partials/footer.html
@@ -6,7 +6,7 @@
         <ul>
           {{ range .Site.Menus.main }}
           <li class="nav-item">
-            <a class="smooth-scroll" href="#{{ .URL }}">{{ .Name }}</a>
+            <a class="smooth-scroll" href="{{ .URL }}">{{ .Name }}</a>
           </li>
           {{ end }}
         </ul>
diff --git a/layouts/partials/navbar.html b/layouts/partials/navbar.html
index dc03708..492672e 100644
--- a/layouts/partials/navbar.html
+++ b/layouts/partials/navbar.html
@@ -1,6 +1,6 @@
 <nav class="navbar navbar-expand-lg top-navbar initial-navbar" id="top-navbar">
   <div class="container">
-    <a class="navbar-brand" href="#">{{- .Site.Title -}}</a>
+    <a class="navbar-brand" href="{{ .Site.BaseURL }}">{{- .Site.Title -}}</a>
     <button
       class="navbar-toggler navbar-dark"
       id="navbar-toggler"
diff --git a/static/assets/css/achievements.css b/static/assets/css/achievements.css
index 71f13c1..3679f16 100644
--- a/static/assets/css/achievements.css
+++ b/static/assets/css/achievements.css
@@ -5,19 +5,20 @@
   margin-left: 7px;
   margin-right: 7px;
   z-index: 1;
-  opacity: 1;
   background-size: cover;
   background-repeat: no-repeat;
   background-position: center;
   position: relative;
   overflow: hidden;
+  transition: all 0.3s ease-out;
 }
 
 #gallery .achievement-entry:hover {
   cursor: pointer;
   z-index: 1;
-  opacity: 0.95;
-  transition: opacity 0.3s ease-out;
+  transform: scale(1.1);
+  transition: all 0.3s ease-out;
+  z-index: 20000;
 }
 
 #gallery .achievement-details {
@@ -25,6 +26,7 @@
   z-index: 1;
   opacity: 1 !important;
   transition: none !important;
+  transform: none !important;
 }
 
 #gallery .img-type-1 {
@@ -41,7 +43,6 @@
   padding: 10px;
   font-size: 0rem;
   opacity: 0;
-  position: absolute;
 }
 
 #gallery .achievement-entry:hover i {
@@ -52,17 +53,17 @@
 }
 
 #gallery .img-type-1 i {
-  margin-top: 140px;
+  margin-top: 135px;
 }
 #gallery .img-type-2 i {
-  margin-top: 65px;
+  margin-top: 50px;
 }
 
 #gallery .achievement-details.img-type-1 i,
 .achievement-details.img-type-2 i {
-  right: 5px !important;
-  margin-top: 5px !important;
+  margin-top: 0px !important;
   transition: none !important;
+  float: right;
 }
 
 #gallery .achievement-entry .title {
diff --git a/static/assets/css/style.css b/static/assets/css/style.css
index 037ac34..9929479 100644
--- a/static/assets/css/style.css
+++ b/static/assets/css/style.css
@@ -191,6 +191,27 @@ a:hover {
   color: #c0ccda;
 }
 
+.notFound{
+  padding-top: 5rem;
+  text-align: center;
+  padding-bottom: 8rem;
+}
+
+.notFound img{
+  height: 500px;
+}
+
+.notFound h1{
+  font-style: italic;
+}
+
+.notFound .message{
+  position: absolute;
+  max-width: 20rem;
+  top: 40%;
+  left: 30%;
+}
+
 /* --- FOOTER END ---- */
 
 /* ============= Device specific fixes ======= */
diff --git a/static/assets/images/404.png b/static/assets/images/404.png
new file mode 100644
index 0000000..c9dd23d
Binary files /dev/null and b/static/assets/images/404.png differ
