diff --git a/hypha/apply/funds/templates/funds/submission-success.html b/hypha/apply/funds/templates/funds/submission-success.html
index 765f8a40e8..6be59f9e9c 100644
--- a/hypha/apply/funds/templates/funds/submission-success.html
+++ b/hypha/apply/funds/templates/funds/submission-success.html
@@ -5,7 +5,7 @@
 {% block content %}
     <div class="mx-auto mt-8 max-w-2xl prose">
         {% if form_submission.status == 'draft' %}
-            <h2>{% trans "Your application is saved as a draft." %}</h2>
+            <h1>{% trans "Your application is saved as a draft." %}</h1>
 
             <p>{% trans "Please note that your application is not submitted for review." %}</p>
 
@@ -16,11 +16,11 @@ <h2>{% trans "Your application is saved as a draft." %}</h2>
             {% endif %}
 
         {% else %}
-            <h3>
+            <h1>
                 {% blocktrans trimmed %}
                     Thank you for your submission to the {{ ORG_LONG_NAME }}.
                 {% endblocktrans %}
-            </h3>
+            </h1>
 
             <p>{% trans "An e-mail with more information has been sent to the address you entered." %}</p>
 
@@ -51,32 +51,31 @@ <h3>
             {% endif %}
 
         {% endif %}
-
-        <div class="mt-4 card-actions">
-            {% if request.user.is_authenticated and request.user.can_access_dashboard%}
-                <a class="btn btn-primary" href="{% url 'dashboard:dashboard' %}">
-                    {% trans "Go to your dashboard" %}
+    </div>
+    <div class="mx-auto mt-8 max-w-2xl card-actions">
+        {% if request.user.is_authenticated and request.user.can_access_dashboard%}
+            <a class="btn btn-primary" href="{% url 'dashboard:dashboard' %}">
+                {% trans "Go to your dashboard" %}
+            </a>
+            {% if form_submission.status == 'draft' %}
+                <a
+                    class="btn btn-secondary btn-outline"
+                    href="{% url 'apply:submissions:edit' form_submission.id %}"
+                >
+                    {% trans "Continue editing" %}
                 </a>
-                {% if form_submission.status == 'draft' %}
-                    <a
-                        class="btn btn-secondary btn-outline"
-                        href="{% url 'apply:submissions:edit' form_submission.id %}"
-                    >
-                        {% trans "Continue editing" %}
-                    </a>
-                {% else %}
-                    <a
-                        class="btn btn-secondary btn-outline"
-                        href="{% url 'apply:submissions:detail' form_submission.id %}"
-                    >
-                        {% trans "View your submission" %}
-                    </a>
-                {% endif %}
             {% else %}
-                <a class="btn btn-primary" href="{% url 'users:login' %}">
-                    {% trans "Log in" %}
+                <a
+                    class="btn btn-secondary btn-outline"
+                    href="{% url 'apply:submissions:detail' form_submission.id %}"
+                >
+                    {% trans "View your submission" %}
                 </a>
             {% endif %}
-        </div>
+        {% else %}
+            <a class="btn btn-primary" href="{% url 'users:login' %}">
+                {% trans "Log in" %}
+            </a>
+        {% endif %}
     </div>
 {% endblock %}
diff --git a/hypha/apply/users/templates/two_factor/core/setup_complete.html b/hypha/apply/users/templates/two_factor/core/setup_complete.html
index 5a5188f6ae..42749b6fc3 100644
--- a/hypha/apply/users/templates/two_factor/core/setup_complete.html
+++ b/hypha/apply/users/templates/two_factor/core/setup_complete.html
@@ -18,7 +18,7 @@
                 your primary token device. To enable account recovery, add a phone number.
             {% endblocktrans %}</p>
 
-            <div class="card-actions">
+            <div class="card-actions not-prose">
                 <a href="{% url 'users:backup_tokens' %}" class="mt-2 btn btn-primary btn-wide">
                     {% trans "Show Codes" %}
                 </a>