diff --git a/CTFd/themes/core/templates/base.html b/CTFd/themes/core/templates/base.html
index e1a32088..7e8ec224 100644
--- a/CTFd/themes/core/templates/base.html
+++ b/CTFd/themes/core/templates/base.html
@@ -67,7 +67,7 @@
 							<a class="nav-link" href="{{ request.script_root }}/scoreboard">Scoreboard</a>
 						</li>
 					{% endif %}
-					<li>
+					<li class="nav-item">
 						<a class="nav-link" href="{{ request.script_root }}/challenges">Challenges</a>
 					</li>
 				</ul>
@@ -99,7 +99,9 @@
 								<a class="nav-link d-none d-md-block d-lg-block">|</a>
 							</li>
 						{% endif %}
-						<li><a class="nav-link" href="{{ request.script_root }}/login">Login</a></li>
+						<li class="nav-item">
+							<a class="nav-link" href="{{ request.script_root }}/login">Login</a>
+						</li>
 					{% endif %}
 				</ul>
 			</div>
diff --git a/CTFd/themes/core/templates/login.html b/CTFd/themes/core/templates/login.html
index 5df3bf54..7f9cce13 100644
--- a/CTFd/themes/core/templates/login.html
+++ b/CTFd/themes/core/templates/login.html
@@ -9,9 +9,9 @@
 		<h1>Login</h1>
 	</div>
 </div>
-<div class="container main-container">
+<div class="container">
 	<div class="row">
-		<div id="login-container" class="col-md-6 offset-md-3">
+		<div class="col-md-6 offset-md-3">
 			{% for error in errors %}
 				<div class="alert alert-danger alert-dismissable" role="alert">
 				  <span class="sr-only">Error:</span>
diff --git a/CTFd/themes/core/templates/page.html b/CTFd/themes/core/templates/page.html
index 6f0b8811..bd73b3b2 100644
--- a/CTFd/themes/core/templates/page.html
+++ b/CTFd/themes/core/templates/page.html
@@ -1,7 +1,7 @@
 {% extends "base.html" %}
 
 {% block content %}
-	<div class="container main-container">
+	<div class="container">
 	{{ content | safe }}
 	</div>
 {% endblock %}