diff --git a/assets/sass/layout.scss b/assets/sass/layout.scss
index 891299a..191c178 100644
--- a/assets/sass/layout.scss
+++ b/assets/sass/layout.scss
@@ -63,13 +63,28 @@ header {
 			li {
 				list-style: none;
 
-				a, span {
+				a, button {
 					position: relative;
+					height: 64px;
+					margin: 0;
+					padding: 0 24px;
+
 					display: flex;
 					flex-direction: row;
 					align-items: center;
-					height: 64px;
-					padding: 0 24px;
+
+					&:hover, &:active {
+						&:not(button) {
+							background-color: rgba(255, 255, 255, 0.07);
+						}
+
+						.tip {
+							visibility: visible;
+							opacity: 1;
+							transition: opacity ease-out 100ms;
+							transition-delay: 150ms;
+						}
+					}
 
 					.feather {
 						--icon-size: 24px;
@@ -85,8 +100,26 @@ header {
 					}
 				}
 
-				a:hover, a:active {
-					background-color: rgba(255, 255, 255, 0.07);
+				button {
+					margin: 8px;
+					padding: 24px;
+					height: 32px;
+
+					.feather {
+						margin-right: 0;
+					}
+
+					.tip {
+						text-transform: initial;
+						font-weight: initial;
+					}
+				}
+
+				form {
+					display: flex;
+					justify-content: center;
+					align-items: center;
+					padding: 0;
 				}
 			}
 		}
@@ -139,10 +172,14 @@ header {
 					transform: translateX(0%);
 				}
 
-				li a {
-					.tip {
-						display: block;
-						margin-left: 8px;
+				li {
+					a, button {
+						.tip {
+							display: block;
+							margin-left: 8px;
+							text-transform: inherit;
+							font-weight: inherit;
+						}
 					}
 				}
 			}
@@ -151,32 +188,38 @@ header {
 
 	@media (min-width: $menuLayoutSwitchTreshold) {
 		nav ul li {
-			a .tip {
-				visibility: hidden;
-				position: absolute;
-				display: block;
-				width: max-content;
-				height: 30px;
-				padding: 4px 8px;
-				line-height: 22px;
-				top: calc(100% + 8px);
-				left: 50%;
-				transform: translateX(-50%);
+			a, button {
+				.tip {
+					visibility: hidden;
+					position: absolute;
+					display: block;
+					width: max-content;
+					height: 30px;
+					padding: 4px 8px;
+					line-height: 22px;
+					top: calc(100% + 8px);
+					left: 50%;
+					transform: translateX(-50%);
 
-				text-align: center;
-				font-size: 18px;
-				color: $defaultTextColor;
-				opacity: 0;
-				transition: opacity ease-out 100ms, visibility step-end 150ms;
-				transition-delay: 0ms;
-				background-color: #000;
-				border-radius: 5px;
+					text-align: center;
+					font-size: 18px;
+					color: $defaultTextColor;
+					opacity: 0;
+					transition: opacity ease-out 100ms, visibility step-end 150ms;
+					transition-delay: 0ms;
+					background-color: #000;
+					border-radius: 5px;
+				}
 			}
 
-			&:last-child a .tip {
-				left: unset;
-				right: 4px;
-				transform: none;
+			&:last-child {
+				a, button {
+					.tip {
+						left: unset;
+						right: 4px;
+						transform: none;
+					}
+				}
 			}
 		}
 	}
diff --git a/views/layouts/base.njk b/views/layouts/base.njk
index cb76570..f350e8e 100644
--- a/views/layouts/base.njk
+++ b/views/layouts/base.njk
@@ -16,7 +16,7 @@
     <nav>
         <button id="menu-button"><i data-feather="menu"></i></button>
         <ul id="main-menu">
-            <li><a href="{{ route('about') }}"><i data-feather="info"></i> About</a></li>
+            <li><a href="{{ route('about') }}"><i data-feather="info"></i> <span class="tip">About</span></a></li>
         </ul>
     </nav>
 {% endblock %}