diff --git a/views/errors/403.blade.php b/views/errors/403.blade.php
index bbd07b58..f2b51c98 100644
--- a/views/errors/403.blade.php
+++ b/views/errors/403.blade.php
@@ -4,7 +4,7 @@
 
 @section('content')
 <div class="row">
-	<div class="col">
+	<div class="col text-center">
 		<h1 class="alert alert-danger">{{ $__t('You are not allowed to view this page') }}</h1>
 	</div>
 </div>
diff --git a/views/errors/404.blade.php b/views/errors/404.blade.php
index a9dcc375..b71ad75d 100644
--- a/views/errors/404.blade.php
+++ b/views/errors/404.blade.php
@@ -5,8 +5,9 @@
 @section('content')
 <meta http-equiv="refresh"
 	content="5;url={{$U('/')}}">
+
 <div class="row">
-	<div class="col">
+	<div class="col text-center">
 		<h1 class="alert alert-danger">{{ $__t('This page does not exist') }}</h1>
 		<div class="alert alert-info">{{ $__t('You will be redirected to the default page in %s seconds', '5') }}</div>
 	</div>
diff --git a/views/layout/default.blade.php b/views/layout/default.blade.php
index ff42a5ce..c0057c25 100644
--- a/views/layout/default.blade.php
+++ b/views/layout/default.blade.php
@@ -132,6 +132,7 @@
 				class="d-none d-sm-inline"></span>
 		</span>
 
+		@if(GROCY_AUTHENTICATED)
 		<button class="navbar-toggler navbar-toggler-right"
 			type="button"
 			data-toggle="collapse"
@@ -139,7 +140,6 @@
 			<span class="navbar-toggler-icon"></span>
 		</button>
 
-		@if(GROCY_AUTHENTICATED)
 		<div id="sidebarResponsive"
 			class="collapse navbar-collapse">
 			<ul class="navbar-nav navbar-sidenav">
@@ -468,7 +468,7 @@
 			</ul>
 
 			<ul class="navbar-nav ml-auto">
-				@if(GROCY_AUTHENTICATED === true && !GROCY_IS_EMBEDDED_INSTALL && !GROCY_DISABLE_AUTH)
+				@if(GROCY_AUTHENTICATED && !GROCY_IS_EMBEDDED_INSTALL && !GROCY_DISABLE_AUTH)
 				<li class="nav-item dropdown">
 					<a class="nav-link dropdown-toggle discrete-link @if(!empty(GROCY_USER_PICTURE_FILE_NAME)) py-0 @endif"
 						href="#"
@@ -497,7 +497,7 @@
 				</li>
 				@endif
 
-				@if(GROCY_AUTHENTICATED === true)
+				@if(GROCY_AUTHENTICATED)
 				<li class="nav-item dropdown">
 					<a class="nav-link dropdown-toggle discrete-link"
 						href="#"
@@ -668,8 +668,8 @@
 	</nav>
 	@endif
 
-	<div class="content-wrapper pt-0">
-		<div class="container-fluid pr-1 pl-md-3 pl-1">
+	<div class="@if(GROCY_AUTHENTICATED) content-wrapper @endif pt-0">
+		<div class="container-fluid @if(GROCY_AUTHENTICATED) pr-1 pl-md-3 pl-1 @endif">
 			<div class="row mb-3">
 				<div id="page-content"
 					class="col content-text">
diff --git a/views/login.blade.php b/views/login.blade.php
index dba0e254..6d8c2cf5 100644
--- a/views/login.blade.php
+++ b/views/login.blade.php
@@ -5,7 +5,7 @@
 
 @section('content')
 <div class="row">
-	<div class="col-lg-6 offset-lg-3 col-12">
+	<div class="col-lg-4 offset-lg-4 col-md-6 offset-md-3 col-12">
 		<h2 class="text-center">@yield('title')</h2>
 
 		<hr class="my-2">