diff --git a/codewof/static/scss/website.scss b/codewof/static/scss/website.scss
index cc4d9863c..376c7e2fe 100644
--- a/codewof/static/scss/website.scss
+++ b/codewof/static/scss/website.scss
@@ -173,7 +173,7 @@ strong {
 
 // Create achievement CSS rules off colour names
 @each $color, $value in $colors {
-  .achievement-#{$color} {
+  .badge-#{$color} {
     @include badge-variant($value);
   }
 }
diff --git a/codewof/templates/account/email.html b/codewof/templates/account/email.html
index c853f0425..24c0fae8f 100644
--- a/codewof/templates/account/email.html
+++ b/codewof/templates/account/email.html
@@ -24,12 +24,12 @@ <h1>{% trans "E-mail Addresses" %}</h1>
 
     {{ emailaddress.email }}
     {% if emailaddress.verified %}
-      <span class="achievement achievement-success">{% trans "Verified" %}</span>
+      <span class="badge badge-success">{% trans "Verified" %}</span>
     {% else %}
-      <span class="achievement achievement-secondary">{% trans "Unverified" %}</span>
+      <span class="badge badge-secondary">{% trans "Unverified" %}</span>
     {% endif %}
     {% if emailaddress.primary %}
-      <span class="achievement achievement-primary">{% trans "Primary" %}</span>
+      <span class="badge badge-primary">{% trans "Primary" %}</span>
     {% endif %}
   </label>
 </div>
diff --git a/codewof/templates/base.html b/codewof/templates/base.html
index f8a79c614..2f956192b 100644
--- a/codewof/templates/base.html
+++ b/codewof/templates/base.html
@@ -34,7 +34,7 @@
         <script src="https://cdnjs.cloudflare.com/ajax/libs/html5shiv/3.7.3/html5shiv.min.js"></script>
       <![endif]-->
   </head>
-  {% block body_element %}<body class="py-5">{% endblock body_element %}
+  {% block body_element %}<body class="pt-5">{% endblock body_element %}
     <nav id="codewof-navbar" class="navbar navbar-expand-md navbar-dark fixed-top">
       <div class="container">
         <button class="navbar-toggler navbar-toggler-right" type="button" data-toggle="collapse"
@@ -46,7 +46,7 @@
         </a>
 
         {% if DEPLOYMENT_TYPE == 'dev' %}
-        <span class="achievement achievement-warning">Test server</span>
+        <span class="badge badge-warning">Test server</span>
         {% endif %}
 
         <div class="collapse navbar-collapse" id="navbarContent">
diff --git a/codewof/templates/research/components/research-card.html b/codewof/templates/research/components/research-card.html
index 629ead678..9c7453b0f 100644
--- a/codewof/templates/research/components/research-card.html
+++ b/codewof/templates/research/components/research-card.html
@@ -2,7 +2,7 @@
     <div class="card-body">
         <h5 class="card-title">{{ study.title }}
             {% if study.registered %}
-            <span class="achievement achievement-success float-right">Registered</span>
+            <span class="badge badge-success float-right">Registered</span>
             {% endif %}
         </h5>
         <h6 class="card-subtitle mb-2 text-muted">
