diff --git a/babybuddy/templates/error/404.html b/babybuddy/templates/error/404.html
index 41cd6689..51793f57 100644
--- a/babybuddy/templates/error/404.html
+++ b/babybuddy/templates/error/404.html
@@ -7,7 +7,7 @@
     <h1>404 {% trans "Page Not Found" %}</h1>
     <div>
         {% blocktrans trimmed with request_path=request_path %}
-            The path <samp>{{ request_path }}</samp> does not exist.
+            The path <code>{{ request_path }}</code> does not exist.
         {% endblocktrans %}
     </div>
 {% endblock %}
\ No newline at end of file
diff --git a/babybuddy/templates/error/base.html b/babybuddy/templates/error/base.html
index fa379deb..164e279c 100644
--- a/babybuddy/templates/error/base.html
+++ b/babybuddy/templates/error/base.html
@@ -8,8 +8,11 @@
         <div class="row justify-content-md-center">
             <div class="col-lg-12 mb-4">
                 <div class="d-sm-flex">
-                    <img class="d-inline-block align-self-center mr-2 text-center" src="{% static "babybuddy/logo/logo-sad.png" %}" width="65" height="65">
-                    <div class="p-2 flex-grow-1">{% block content %}{% endblock %}</div>
+                    <img class="d-inline-block align-self-top mr-2 mt-2 text-center" src="{% static "babybuddy/logo/logo-sad.png" %}" width="65" height="65">
+                    <div class="p-2 flex-grow-1">
+                        {% block content %}{% endblock %}
+                        <a href="{% url "babybuddy:root-router" %}" class="btn btn-outline-primary mt-3">{% trans "Return to Baby Buddy" %}</a>
+                    </div>
                 </div>
             </div>
         </div>