diff --git a/evennia/web/website/templates/website/base.html b/evennia/web/website/templates/website/base.html
index c856f3081..4122bed97 100644
--- a/evennia/web/website/templates/website/base.html
+++ b/evennia/web/website/templates/website/base.html
@@ -30,8 +30,7 @@
   </head>
   <body>
     <div id="top"><a href="#main-content" class="sr-only sr-only-focusable">Skip to main content.</a></div>
-
-    <nav class="navbar navbar-inverse font-weight-bold navbar-toggleable-sm">
+    <nav class="navbar navbar-dark font-weight-bold navbar-expand-md">
         <button class="navbar-toggler navbar-toggler-right" type="button" data-toggle="collapse" data-target="#menu-content" aria-controls="menu-content" aria-expanded="false" aria-label="Toggle navigation">
             <span class="navbar-toggler-icon"></span>
         </button>
diff --git a/evennia/web/website/templates/website/index.html b/evennia/web/website/templates/website/index.html
index f16b41741..1215e6bf0 100644
--- a/evennia/web/website/templates/website/index.html
+++ b/evennia/web/website/templates/website/index.html
@@ -9,7 +9,7 @@
 <div class="row">
   <div class="col">
     <div class="card">
-      <div class="card-block">
+      <div class="card-body">
         <h1 class="card-title">Welcome!</h1>
 
         <hr />
@@ -54,7 +54,7 @@
     <div class="card">
       <h4 class="card-header">Accounts</h4>
 
-      <div class="card-block">
+      <div class="card-body">
         <p>
           There's currently <strong>{{num_accounts_connected}}</strong> connected out of a total of <strong>{{num_accounts_registered}}</strong> account{{num_accounts_registered|pluralize}} registered.
         </p>
@@ -69,7 +69,7 @@
     <div class="card">
       <h4 class="card-header text-center">Recently Connected</h4>
 
-      <div class="card-block px-0 py-0">
+      <div class="card-body px-0 py-0">
         <ul class="list-group">
           {% for account in accounts_connected_recent %}
             <li class="list-group-item">{{account.username}}&mdash;<em>{{account.last_login|timesince}} ago</em></li>
@@ -83,7 +83,7 @@
     <div class="card">
       <h4 class="card-header text-center">Database Stats</h4>
 
-      <div class="card-block py-0 px-0">
+      <div class="card-body py-0 px-0">
         <ul class="list-group">
           <li class="list-group-item">{{num_accounts_registered}} account{{num_accounts_registered|pluralize}} (+ {{num_characters}} character{{num_characters|pluralize}})</li>
           <li class="list-group-item">{{num_rooms}} room{{num_rooms|pluralize}} (+ {{num_exits}} exits)</li>
@@ -92,12 +92,14 @@
       </div>
     </div>
   </div>
+</div>
 
+<div class="row">
   <div class="col">
     <div class="card">
       <h4 class="card-header text-center">Evennia</h4>
 
-      <div class="card-block">
+      <div class="card-body">
         <p><a href="http://evennia.com">Evennia</a> is an open-source MUD server built in
         <a href="http://python.org">Python</a>, on top of the
         <a href="http://twistedmatrix.com">Twisted</a> and
