diff --git a/assets/css/main.css b/assets/css/main.css
index 9d4c8b5..d8cdf56 100644
--- a/assets/css/main.css
+++ b/assets/css/main.css
@@ -272,6 +272,10 @@ button:not(:-moz-focusring):focus > .main-nav__btn-box {
 }
 
 @media (min-width: 920px) {
+	.header {
+		display: flex;
+	}
+
 	.logo {
 		display: inline-block;
 	}
@@ -312,7 +316,7 @@ button:not(:-moz-focusring):focus > .main-nav__btn-box {
 		border-color: #666;
 	}
 
-	.main-nav__list--right {
+	.main-nav--right {
 		margin-left: auto;
 	}
 
diff --git a/layouts/partials/menu.html b/layouts/partials/menu.html
index 0f0d2c7..f019d8a 100644
--- a/layouts/partials/menu.html
+++ b/layouts/partials/menu.html
@@ -1,5 +1,5 @@
 {{- if .Site.Menus.main }}
-<nav class="main-nav" role="navigation">
+<nav class="main-nav{{ if eq .Site.Params.mainMenuAlignment "right" }} main-nav--right{{ end }}" role="navigation">
 	<button id="toggle" class="main-nav__btn" aria-label="Menu toggle" aria-expanded="false" tabindex="0">
 		<div class="main-nav__btn-box" tabindex="-1">
 			<svg class="main-nav__icon icon-menu" width="18" height="18" viewBox="0 0 18 18">
@@ -8,7 +8,7 @@
 			</svg>
 		</div>
 	</button>
-	<ul id="menu" class="main-nav__list{{ if eq .Site.Params.mainMenuAlignment "right" }} main-nav__list--right{{ end }}">
+	<ul id="menu" class="main-nav__list">
 		{{- $currentNode := . }}
 		{{- range sort .Site.Menus.main }}
 			{{- $current := (or ($currentNode.IsMenuCurrent "main" .) ($currentNode.HasMenuCurrent "main" .)) }}