diff --git a/services/web/app/views/_mixins/begin_now_card.pug b/services/web/app/views/_mixins/begin_now_card.pug
index 641703d606..6dbf1137ec 100644
--- a/services/web/app/views/_mixins/begin_now_card.pug
+++ b/services/web/app/views/_mixins/begin_now_card.pug
@@ -17,7 +17,7 @@ mixin begin_now_card
 				p.card-links
 					if !isUserLoggedIn
 						a.btn.btn-primary.card-link(href=registerURL) #{translate("sign_up_for_free")}
-					a.btn.card-link(
-						class=isUserLoggedIn ? 'btn-primary' : 'btn-secondary'
+					a.card-link(
 						href=plansURL
+						class={'btn-primary': isUserLoggedIn, 'btn-secondary': !isUserLoggedIn}
 					) #{translate("explore_all_plans")}
diff --git a/services/web/app/views/_mixins/bookmarkable_tabset.pug b/services/web/app/views/_mixins/bookmarkable_tabset.pug
index 72579c7725..facf67755e 100644
--- a/services/web/app/views/_mixins/bookmarkable_tabset.pug
+++ b/services/web/app/views/_mixins/bookmarkable_tabset.pug
@@ -2,7 +2,7 @@ mixin bookmarkable-tabset-header(id, title, active)
 	li(role='presentation')
 		a.nav-link(
 			href='#' + id
-			class=active ? 'active' : ''
+			class={active}
 			aria-controls=id
 			role='tab'
 			data-toggle='tab'
diff --git a/services/web/app/views/_mixins/links.pug b/services/web/app/views/_mixins/links.pug
index 16257ecb0f..aaab08aefa 100644
--- a/services/web/app/views/_mixins/links.pug
+++ b/services/web/app/views/_mixins/links.pug
@@ -1,29 +1,23 @@
 include ./material_symbol
 
 mixin linkBenefits(linkText, linkClass)
-	a(
-		href=(settings.siteUrl ? settings.siteUrl : '') + '/for/authors'
-		class=linkClass ? linkClass : ''
-	)
+	a(href=(settings.siteUrl ? settings.siteUrl : '') + '/for/authors' class=linkClass)
 		| #{linkText ? linkText : 'benefits'}
 
 mixin linkBlog(linkText, linkClass, slug)
 	if slug
 		a(
 			href=(settings.siteUrl ? settings.siteUrl : '') + '/blog/' + slug
-			class=linkClass ? linkClass : ''
+			class=linkClass
 		)
 			| #{linkText ? linkText : 'blog'}
 
 mixin linkContact(linkText, linkClass)
-	a(
-		href=(settings.siteUrl ? settings.siteUrl : '') + '/contact'
-		class=linkClass ? linkClass : ''
-	)
+	a(href=(settings.siteUrl ? settings.siteUrl : '') + '/contact' class=linkClass)
 		| #{linkText ? linkText : 'contact'}
 
 mixin linkDash(linkText, linkClass)
-	a(href='/project' class=linkClass ? linkClass : '')
+	a(href='/project' class=linkClass)
 		| #{linkText ? linkText : 'project dashboard'}
 
 mixin linkInvite(linkText, linkClass, track)
@@ -36,7 +30,7 @@ mixin linkInvite(linkText, linkClass, track)
 
 	a(
 		href='/user/bonus'
-		class=linkClass ? linkClass : ''
+		class=linkClass
 		event-tracking-ga=gaCategory
 		event-tracking=gaAction
 		event-tracking-label=gaLabel
@@ -47,7 +41,7 @@ mixin linkInvite(linkText, linkClass, track)
 		span #{linkText ? linkText : 'invite your friends'}
 
 mixin linkPlansAndPricing(linkText, linkClass)
-	a(href='/user/subscription/plans' class=linkClass ? linkClass : '')
+	a(href='/user/subscription/plans' class=linkClass)
 		| #{linkText ? linkText : 'plans and pricing'}
 
 mixin linkPrintNewTab(linkText, linkClass, icon, track)
@@ -60,7 +54,7 @@ mixin linkPrintNewTab(linkText, linkClass, icon, track)
 
 	a(
 		href='?media=print'
-		class=linkClass ? linkClass : ''
+		class=linkClass
 		event-tracking-ga=gaCategory
 		event-tracking=gaAction
 		event-tracking-label=gaLabel
@@ -76,17 +70,11 @@ mixin linkPrintNewTab(linkText, linkClass, icon, track)
 		span #{linkText ? linkText : 'print'}
 
 mixin linkSignIn(linkText, linkClass, redirect)
-	a(
-		href=`/login${redirect ? '?redir=' + redirect : ''}`
-		class=linkClass ? linkClass : ''
-	)
+	a(href=`/login${redirect ? '?redir=' + redirect : ''}` class=linkClass)
 		| #{linkText ? linkText : 'sign in'}
 
 mixin linkSignUp(linkText, linkClass, redirect)
-	a(
-		href=`/register${redirect ? '?redir=' + redirect : ''}`
-		class=linkClass ? linkClass : ''
-	)
+	a(href=`/register${redirect ? '?redir=' + redirect : ''}` class=linkClass)
 		| #{linkText ? linkText : 'sign up'}
 
 mixin linkTweet(linkText, linkClass, tweetText, track)
@@ -113,7 +101,7 @@ mixin linkTweet(linkText, linkClass, tweetText, track)
 mixin linkUniversities(linkText, linkClass)
 	a(
 		href=(settings.siteUrl ? settings.siteUrl : '') + '/for/universities'
-		class=linkClass ? linkClass : ''
+		class=linkClass
 	)
 		| #{linkText ? linkText : 'universities'}
 
diff --git a/services/web/app/views/general/400.pug b/services/web/app/views/general/400.pug
index 48d1fff5eb..749611b629 100644
--- a/services/web/app/views/general/400.pug
+++ b/services/web/app/views/general/400.pug
@@ -25,5 +25,4 @@ block body
 							a(href='mailto:' + settings.adminEmail target='_blank') #{settings.adminEmail}
 							| .
 						p.error-actions
-							a.error-btn(href='javascript:history.back()') Back
-							a.btn.btn-secondary(href='/') Home
+							a.btn.btn-primary(href='/') Home
diff --git a/services/web/app/views/layout/fat-footer-website-redesign.pug b/services/web/app/views/layout/fat-footer-website-redesign.pug
index d20eb14a2c..26e003ad56 100644
--- a/services/web/app/views/layout/fat-footer-website-redesign.pug
+++ b/services/web/app/views/layout/fat-footer-website-redesign.pug
@@ -3,7 +3,7 @@ footer.fat-footer.hidden-print.website-redesign-fat-footer
 		role='navigation'
 		aria-label=translate('footer_navigation')
 	)
-		.fat-footer-sections(class=hideFatFooter ? 'hidden' : undefined)
+		.fat-footer-sections(class={hidden: hideFatFooter})
 			#footer-brand.footer-section
 				a.footer-brand(href='/' aria-label=settings.appName)
 
diff --git a/services/web/app/views/layout/fat-footer.pug b/services/web/app/views/layout/fat-footer.pug
index e5637a986f..d672d5ec29 100644
--- a/services/web/app/views/layout/fat-footer.pug
+++ b/services/web/app/views/layout/fat-footer.pug
@@ -3,7 +3,7 @@ footer.fat-footer.hidden-print
 		role='navigation'
 		aria-label=translate('footer_navigation')
 	)
-		.fat-footer-sections(class=hideFatFooter ? 'hidden' : undefined)
+		.fat-footer-sections(class={hidden: hideFatFooter})
 			#footer-brand.footer-section
 				a.footer-brand(href='/' aria-label=settings.appName)
 
diff --git a/services/web/app/views/layout/language-picker-bootstrap-5.pug b/services/web/app/views/layout/language-picker-bootstrap-5.pug
index 09f8f58c7d..312b13ea18 100644
--- a/services/web/app/views/layout/language-picker-bootstrap-5.pug
+++ b/services/web/app/views/layout/language-picker-bootstrap-5.pug
@@ -27,7 +27,7 @@ li.dropdown.dropup.subdued.language-picker(dropdown)
 					a.menu-indent(
 						href=subdomainDetails.url + currentUrlWithQueryParams
 						role='menuitem'
-						class=isActive ? 'dropdown-item active' : 'dropdown-item'
+						class=['dropdown-item', {active: isActive}]
 						aria-selected=isActive ? 'true' : 'false'
 					)
 						| #{settings.translatedLanguages[subdomainDetails.lngCode]}