diff --git a/website/resources/css/custom.css b/website/resources/css/custom.css
index 365525a9..5e28b7cf 100644
--- a/website/resources/css/custom.css
+++ b/website/resources/css/custom.css
@@ -34,7 +34,10 @@
 	padding: 6px 12px 6px 28px;
 }
 
-.tidelift-link:hover, .tidelift-link-inline:hover {
+.tidelift-link:focus,
+.tidelift-link-inline:focus,
+.tidelift-link:hover,
+.tidelift-link-inline:hover {
 	color: white;
 }
 
@@ -493,3 +496,10 @@ body {
 	outline: 1px auto Highlight;
 	outline: 1px auto -webkit-focus-ring-color;
 }
+
+.bs-callout.bs-callout-danger h2 {
+	margin-top: 0;
+	margin-bottom: 5px;
+	text-align: start;
+	font-size: 17px;
+}
diff --git a/website/templates/_scaffold.html b/website/templates/_scaffold.html
index fde9cbde..a4da42ee 100644
--- a/website/templates/_scaffold.html
+++ b/website/templates/_scaffold.html
@@ -1,6 +1,6 @@
 <#macro feature title href>
 	<div class="bs-callout bs-callout-danger">
-		<h4><a href="${href}"><code>${title}</code></a></h4>
+		<h2><a href="${href}"><code>${title}</code></a></h2>
 		<p><#nested></p>
 	</div>
 </#macro>
@@ -75,7 +75,7 @@ ga('send', 'pageview');
 			<div class="container">
 				<div class="navbar-header">
 					<a href="/" class="navbar-brand">Project Lombok</a>
-					<button class="navbar-toggle" type="button" data-toggle="collapse" data-target="#navbar-main">
+					<button class="navbar-toggle" type="button" data-toggle="collapse" data-target="#navbar-main" aria-label="Open Menu">
 						<span class="icon-bar"></span>
 						<span class="icon-bar"></span>
 						<span class="icon-bar"></span>
diff --git a/website/templates/features/_features.html b/website/templates/features/_features.html
index f54a8fca..df339670 100644
--- a/website/templates/features/_features.html
+++ b/website/templates/features/_features.html
@@ -14,14 +14,14 @@
 
 <#macro overview>
 	<div class="row">
-		<@main.h3 title="Overview" />
+		<@main.h2 title="Overview" />
 		<#nested>
 	</div>
 </#macro>
 
 <#macro experimental>
 	<div class="row">
-		<@main.h3 title="Experimental" />
+		<@main.h2 title="Experimental" />
 
 		Experimental because:
 		<#nested>
@@ -31,13 +31,13 @@
 <#macro snippets name>
 	<div class="row container-fluid">
 		<div class="snippet-col first-snippet">
-			<@main.h3 title="With Lombok" />
+			<@main.h2 title="With Lombok" />
 
 			<div class="snippet">${usages.pre(name)?no_esc}</div>
 		</div>
 		<div class="sep"></div>
 		<div class="snippet-col second-snippet">
-			<@main.h3 title="Vanilla Java" />
+			<@main.h2 title="Vanilla Java" />
 
 			<div class="snippet">${usages.post(name)?no_esc}</div>
 		</div>
@@ -46,7 +46,7 @@
 
 <#macro confKeys>
 	<div class="row">
-		<@main.h3 title="Supported configuration keys:" />
+		<@main.h2 title="Supported configuration keys:" />
 		<dl>
 			<#nested>
 		</dl>
@@ -55,7 +55,7 @@
 
 <#macro smallPrint>
 	<div class="row">
-		<@main.h3 title="Small print" />
+		<@main.h2 title="Small print" />
 
 		<div class="smallprint">
 			<#nested>
@@ -71,7 +71,7 @@
 				<div class="header-group">
 					<@main.h1 title="${title}" />
 
-					<@main.h3 title="${logline?no_esc}" />
+					<@main.h2 title="${logline?no_esc}" />
 				</div>
 			</div>
 			<#nested>
diff --git a/website/templates/setup/_setup.html b/website/templates/setup/_setup.html
index 166891ce..52703e7e 100644
--- a/website/templates/setup/_setup.html
+++ b/website/templates/setup/_setup.html
@@ -8,7 +8,7 @@
 
 <#macro section title>
 	<div class="row">
-		<@main.h3 title="${title}" />
+		<@main.h2 title="${title}" />
 
 		<#nested>
 	</div>