diff --git a/hypha/apply/dashboard/templates/dashboard/applicant_dashboard.html b/hypha/apply/dashboard/templates/dashboard/applicant_dashboard.html
index 12072a4d96..3b58a3b02f 100644
--- a/hypha/apply/dashboard/templates/dashboard/applicant_dashboard.html
+++ b/hypha/apply/dashboard/templates/dashboard/applicant_dashboard.html
@@ -1,67 +1,82 @@
 {% extends "base-apply.html" %}
 {% load render_table from django_tables2 %}
-{% load i18n static wagtailcore_tags workflow_tags statusbar_tags %}
+{% load i18n static wagtailcore_tags workflow_tags statusbar_tags heroicons %}
 
 {% block title %}{% trans "Dashboard" %}{% endblock %}
 
 {% block content %}
-<div class="admin-bar">
-    <div class="admin-bar__inner wrapper--applicant-dashboard">
-        <div>
-            <h3 class="heading heading--no-margin">{% trans "Dashboard" %}</h3>
-            <h5>{% trans "An overview of active and past submissions and projects" %}</h5>
-        </div>
+    {% adminbar %}
+        {% slot header %}{% trans "Dashboard" %}{% endslot %}
+        {% slot sub_heading %}{% trans "An overview of active and past submissions and projects" %}{% endslot %}
+
         <div class="wrapper wrapper--cta-box">
-            <h4 class="heading heading--no-margin">{% trans "Submit a new application" %}</h4>
-            <h5 class="heading heading--normal">{% trans "Apply now for our open rounds" %}</h5>
+            <h3 class="text-xl mb-0">{% trans "Submit a new application" %}</h3>
+            <p class="mt-0 mb-4 text-fg-muted text-sm">{% trans "Apply now for our open rounds" %}</p>
             <a class="button button--primary" href="{% pageurl APPLY_SITE.root_page %}" class="button">{% trans "Apply" %}</a>
         </div>
-    </div>
-</div>
+    {% endadminbar %}
 
-<div class="wrapper wrapper--large wrapper--inner-space-medium">
-    <h3>{% trans "Your active submissions" %}</h3>
+<div class="wrapper wrapper--large wrapper--inner-space-medium mb-4">
+    <h2 class="text-xl mb-2">
+        {% trans "Your active submissions" %}
+    </h2>
+    <div class="">
     {% for submission in my_active_submissions %}
         <div class="wrapper wrapper--status-bar-outer">
             <div class="wrapper wrapper--status-bar-inner">
-                <div>
-                    <h5 class="heading heading--no-margin"><a class="link link--underlined" href="{% url 'funds:submissions:detail' submission.id %}">{{ submission.title }}</a></h5>
-                    <h6 class="heading heading--no-margin heading--submission-meta"><span>{% trans "Submitted" %}:</span> {{ submission.submit_time.date }} {% trans "by" %} {{ submission.user.get_full_name }}</h6>
+                <div class="flex max-w-sm sm:max-w-lg flex-col gap-2 md:flex-row md:justify-between md:w-full md:max-w-none lg:flex-col lg:justify-start lg:w-auto lg:max-w-sm">
+                    <div>
+                        <h3 class="heading heading--no-margin text-base font-bold">
+                            <a class="link link--underlined" href="{% url 'funds:submissions:detail' submission.id %}">
+                                {{ submission.title }}
+                            </a>
+                        </h3>
+                        <p class="heading heading--no-margin text-fg-muted text-sm">
+                            {% trans "Submitted" %}: {{ submission.submit_time.date }} {% trans "by" %} {{ submission.user.get_full_name }}
+                        </p>
+                    </div>
+                    {% if request.user|has_edit_perm:submission %}
+                    <div>
+                        <a class="button button--primary" href="{% url 'funds:submissions:edit' submission.id %}">
+                            {% if submission.status == 'draft_proposal' %}
+                                {% trans "Start your" %} {{ submission.stage }} {% trans "application" %}
+                            {% else %}
+                                <span class="whitespace-nowrap">
+                                    {% heroicon_mini "pencil-square" size=18 class="inline mr-1 align-text-bottom" aria_hidden=true %}
+                                    {% trans "Edit" %}
+                                </span>
+                            {% endif %}
+                        </a>
+                    </div>
+                    {% endif %}
+
                 </div>
                 {% status_bar submission.workflow submission.phase request.user css_class="status-bar--small" %}
             </div>
-            {% if request.user|has_edit_perm:submission %}
-                <a class="button button--primary" href="{% url 'funds:submissions:edit' submission.id %}">
-                    {% if submission.status == 'draft_proposal' %}
-                        {% trans "Start your" %} {{ submission.stage }} {% trans "application" %}
-                    {% else %}
-                        {% trans "Edit" %}
-                    {% endif %}
-                </a>
-            {% endif %}
         </div>
     {% empty %}
         {% trans "No active submissions" %}
     {% endfor %}
+    </div>
 </div>
 
 {% if active_projects.count %}
-<div class="wrapper wrapper--large wrapper--inner-space-medium">
-    <h3>{% trans "Your active projects" %}</h3>
+<div class="wrapper wrapper--large wrapper--inner-space-medium mb-8">
+    <h2 class="text-xl mb-2">{% trans "Your active projects" %}</h2>
     {% render_table active_projects.table %}
 </div>
 {% endif %}
 
 {% if historical_submissions.count %}
-<div class="wrapper wrapper--large wrapper--inner-space-medium">
-    <h3>{% trans "Submission history" %}</h3>
+<div class="wrapper wrapper--large wrapper--inner-space-medium mb-8">
+    <h2 class="text-xl mb-2">{% trans "Submission history" %}</h3>
     {% render_table historical_submissions.table %}
 </div>
 {% endif %}
 
 {% if historical_projects.count %}
-<div class="wrapper wrapper--large wrapper--inner-space-medium">
-    <h3>{% trans "Project history" %}</h3>
+<div class="wrapper wrapper--large wrapper--inner-space-medium mb-8">
+    <h2 class="text-xl mb-2">{% trans "Project history" %}</h2>
     {% render_table historical_projects.table %}
 </div>
 {% endif %}
diff --git a/hypha/apply/dashboard/templates/dashboard/community_dashboard.html b/hypha/apply/dashboard/templates/dashboard/community_dashboard.html
index 56296aca20..9d6f915a16 100644
--- a/hypha/apply/dashboard/templates/dashboard/community_dashboard.html
+++ b/hypha/apply/dashboard/templates/dashboard/community_dashboard.html
@@ -1,6 +1,6 @@
 {% extends "base-apply.html" %}
 {% load render_table from django_tables2 %}
-{% load i18n static statusbar_tags workflow_tags wagtailcore_tags %}
+{% load i18n static statusbar_tags workflow_tags wagtailcore_tags heroicons %}
 
 {% block title %}{% trans "Dashboard" %}{% endblock %}
 
@@ -11,65 +11,85 @@
         {% slot sub_heading %}{% trans "An overview of active and past submissions" %}{% endslot %}
 
         <div class="wrapper wrapper--cta-box">
-            <h4 class="heading heading--no-margin">{% trans "Submit a new application" %}</h4>
-            <h5 class="heading heading--normal">{% trans "Apply now for our open rounds" %}</h5>
+            <h3 class="text-xl mb-0">{% trans "Submit a new application" %}</h3>
+            <p class="mt-0 mb-4 text-fg-muted text-sm">{% trans "Apply now for our open rounds" %}</p>
             <a class="button button--primary" href="{% pageurl APPLY_SITE.root_page %}" class="button">{% trans "Apply" %}</a>
         </div>
     {% endadminbar %}
 
-<div class="wrapper wrapper--large wrapper--inner-space-medium">
+    <div class="wrapper wrapper--large wrapper--inner-space-medium">
 
-    <div class="wrapper wrapper--bottom-space">
-        <h4 class="heading heading--normal">
-            {% trans "Community review submissions" %} <span class="bg-blue-100 text-blue-800 text-sm font-medium mr-2 px-2.5 py-0.5 rounded dark:bg-blue-900 dark:text-blue-300">{{ my_community_review_count }}</span>
-        </h4>
+        <div class="wrapper wrapper--bottom-space">
+            <h2 class="text-xl mb-2">
+                {% trans "Community review submissions" %} <span class="bg-blue-100 text-blue-800 text-sm font-medium mr-2 px-2.5 py-0.5 rounded">{{ my_community_review_count }}</span>
+            </h2>
+
+            {% if my_community_review.data %}
+                {% render_table my_community_review %}
+            {% else %}
+                {% trans "No submissions" %}
+            {% endif %}
+        </div>
 
-        {% if my_community_review.data %}
-            {% render_table my_community_review %}
-        {% else %}
-            {% trans "No submissions" %}
+        {% if my_reviewed.data %}
+            <div class="wrapper wrapper--bottom-space">
+                <h2 class="text-xl mb-2">
+                    {% trans "Your previous reviews" %}
+                </h2>
+                {% render_table my_reviewed %}
+            </div>
         {% endif %}
-    </div>
 
-    {% if my_reviewed.data %}
         <div class="wrapper wrapper--bottom-space">
-            <h4 class="heading heading--normal">{% trans "Your previous reviews" %}</h4>
-            {% render_table my_reviewed %}
-        </div>
-    {% endif %}
+            <h2 class="text-xl mb-2">
+                {% trans "Your active submissions" %}
+            </h2>
+            {% for submission in my_submissions %}
+                <div class="wrapper wrapper--status-bar-outer">
+                    <div class="wrapper wrapper--status-bar-inner">
+                        <div class="flex max-w-sm sm:max-w-lg flex-col gap-2 md:flex-row md:justify-between md:w-full md:max-w-none lg:flex-col lg:justify-start lg:w-auto lg:max-w-sm">
+                            <div>
+                                <h3 class="heading heading--no-margin text-base font-bold">
+                                    <a class="link link--underlined" href="{% url 'funds:submissions:detail' submission.id %}">
+                                        {{ submission.title }}
+                                    </a>
+                                </h3>
+                                <p class="heading heading--no-margin text-fg-muted text-sm">
+                                    {% trans "Submitted" %}: {{ submission.submit_time.date }} {% trans "by" %} {{ submission.user.get_full_name }}
+                                </p>
+                            </div>
+                            {% if request.user|has_edit_perm:submission %}
+                            <div>
+                                <a class="button button--primary" href="{% url 'funds:submissions:edit' submission.id %}">
+                                    {% if submission.status == 'draft_proposal' %}
+                                        {% trans "Start your" %} {{ submission.stage }} {% trans "application" %}
+                                    {% else %}
+                                        <span class="whitespace-nowrap">
+                                            {% heroicon_mini "pencil-square" size=18 class="inline mr-1 align-text-bottom" aria_hidden=true %}
+                                            {% trans "Edit" %}
+                                        </span>
+                                    {% endif %}
+                                </a>
+                            </div>
+                            {% endif %}
+                        </div>
 
-    <div class="wrapper wrapper--bottom-space">
-        <h4 class="heading heading--normal">{% trans "Your active submissions" %}</h4>
-        {% for submission in my_submissions %}
-            <div class="wrapper wrapper--status-bar-outer">
-                <div class="wrapper wrapper--status-bar-inner">
-                    <div>
-                        <h5 class="heading heading--no-margin"><a class="link link--underlined" href="{% url 'funds:submissions:detail' submission.id %}">{{ submission.title }}</a></h5>
-                        <h6 class="heading heading--no-margin heading--submission-meta"><span>{% trans "Submitted" %}:</span> {{ submission.submit_time.date }} {% trans "by" %} {{ submission.user.get_full_name }}</h6>
+                        {% status_bar submission.workflow submission.phase request.user css_class="status-bar--small" %}
                     </div>
-                    {% status_bar submission.workflow submission.phase request.user css_class="status-bar--small" %}
                 </div>
-                {% if request.user|has_edit_perm:submission %}
-                    <a class="button button--primary" href="{% url 'funds:submissions:edit' submission.id %}">
-                        {% if submission.status == 'draft_proposal' %}
-                            {% trans "Start your" %} {{ submission.stage }} {% trans "application" %}
-                        {% else %}
-                            {% trans "Edit" %}
-                        {% endif %}
-                    </a>
-                {% endif %}
+            {% empty %}
+                {% trans "No active submissions" %}
+            {% endfor %}
+        </div>
+
+        {% if my_inactive_submissions.data %}
+            <div class="wrapper wrapper--bottom-space">
+                <h2 class="text-xl mb-2">
+                    {% trans "Submission history" %}
+                </h2>
+                {% render_table my_inactive_submissions %}
             </div>
-        {% empty %}
-            {% trans "No active submissions" %}
-        {% endfor %}
+        {% endif %}
     </div>
 
-    {% if my_inactive_submissions.data %}
-        <div class="wrapper wrapper--bottom-space">
-            <h4 class="heading heading--normal">{% trans "Submission history" %}</h4>
-            {% render_table my_inactive_submissions %}
-        </div>
-    {% endif %}
-</div>
-
 {% endblock %}
diff --git a/hypha/apply/dashboard/templates/dashboard/contracting_dashboard.html b/hypha/apply/dashboard/templates/dashboard/contracting_dashboard.html
index 8cf04750f0..2439a27e51 100644
--- a/hypha/apply/dashboard/templates/dashboard/contracting_dashboard.html
+++ b/hypha/apply/dashboard/templates/dashboard/contracting_dashboard.html
@@ -5,17 +5,14 @@
 {% block title %}{% trans "Dashboard" %}{% endblock %}
 
 {% block content %}
-<div class="admin-bar">
-    <div class="admin-bar__inner admin-bar__inner--with-button">
-        {% block page_header %}
-            <h1 class="gamma heading heading--no-margin heading--bold">{% trans "Dashboard" %}</h1>
-        {% endblock %}
+    {% adminbar %}
+        {% slot header %}{% trans "Dashboard" %}{% endslot %}
+
         <a href="{% url 'wagtailadmin_home' %}" class="button button--primary button--arrow-pixels-white">
             {% trans "Apply admin" %}
             <svg><use xlink:href="#arrow-head-pixels--solid"></use></svg>
         </a>
-    </div>
-</div>
+    {% endadminbar %}
 
 <div class="wrapper wrapper--large wrapper--inner-space-medium">
     {% if paf_waiting_for_approval.count %}
diff --git a/hypha/apply/dashboard/templates/dashboard/finance_dashboard.html b/hypha/apply/dashboard/templates/dashboard/finance_dashboard.html
index 6e3c4ee54c..f46efa0278 100644
--- a/hypha/apply/dashboard/templates/dashboard/finance_dashboard.html
+++ b/hypha/apply/dashboard/templates/dashboard/finance_dashboard.html
@@ -5,17 +5,15 @@
 {% block title %}{% trans "Dashboard" %}{% endblock %}
 
 {% block content %}
-    <div class="admin-bar">
-        <div class="admin-bar__inner admin-bar__inner--with-button">
-            {% block page_header %}
-                <h1 class="gamma heading heading--no-margin heading--bold">{% trans "Dashboard" %}</h1>
-            {% endblock %}
-            <a href="{% url 'wagtailadmin_home' %}" class="button button--primary button--arrow-pixels-white">
-                {% trans "Apply admin" %}
-                <svg><use xlink:href="#arrow-head-pixels--solid"></use></svg>
-            </a>
-        </div>
-    </div>
+
+    {% adminbar %}
+        {% slot header %}{% trans "Dashboard" %}{% endslot %}
+        <a href="{% url 'wagtailadmin_home' %}" class="button button--primary button--arrow-pixels-white">
+            {% trans "Apply admin" %}
+            <svg><use xlink:href="#arrow-head-pixels--solid"></use></svg>
+        </a>
+    {% endadminbar %}
+
     <div class="wrapper wrapper--large wrapper--inner-space-medium">
         <div class="wrapper wrapper--bottom-space"
             role="tablist" aria-label="Invoice Tabs"
@@ -56,7 +54,9 @@ <h4 class="heading heading--normal heading--no-margin">{% trans 'Invoices' %} </
                 {% if active_invoices.count %}
                     {% render_table active_invoices.table %}
                 {% else %}
-                    {% trans "No Active Invoices" %}
+                    <div class="border px-2 py-4">
+                        {% trans "No Active Invoices" %}
+                    </div>
                 {% endif %}
             </div>
 
@@ -65,7 +65,9 @@ <h4 class="heading heading--normal heading--no-margin">{% trans 'Invoices' %} </
                 {% if invoices_for_approval.count %}
                     {% render_table invoices_for_approval.table %}
                 {% else %}
-                    {% trans "No Invoices for Approval " %}
+                    <div class="border px-2 py-4">
+                        {% trans "No Invoices for Approval " %}
+                    </div>
                 {% endif %}
             </div>
 
@@ -74,7 +76,9 @@ <h4 class="heading heading--normal heading--no-margin">{% trans 'Invoices' %} </
                 {% if invoices_to_convert.count %}
                     {% render_table invoices_to_convert.table %}
                 {% else %}
-                    {% trans "No Invoices for Conversion " %}
+                    <div class="border px-2 py-4">
+                        {% trans "No Invoices for Conversion " %}
+                    </div>
                 {% endif %}
             </div>
 
diff --git a/hypha/apply/dashboard/templates/dashboard/includes/flagged.html b/hypha/apply/dashboard/templates/dashboard/includes/flagged.html
index 41d3484f97..0badca3a3a 100644
--- a/hypha/apply/dashboard/templates/dashboard/includes/flagged.html
+++ b/hypha/apply/dashboard/templates/dashboard/includes/flagged.html
@@ -1,9 +1,9 @@
 {% load render_table from django_tables2 %}
 {% load i18n %}
 
-<h4 class="heading heading--normal">
+<h2 class="text-xl mb-2">
     {% trans "Your Flagged Submissions" %}
-</h4>
+</h2>
 
 {% if my_flagged.data %}
     {% render_table my_flagged %}
diff --git a/hypha/apply/dashboard/templates/dashboard/includes/paf_waiting_for_approval.html b/hypha/apply/dashboard/templates/dashboard/includes/paf_waiting_for_approval.html
index 4acdb62252..3464bc2401 100644
--- a/hypha/apply/dashboard/templates/dashboard/includes/paf_waiting_for_approval.html
+++ b/hypha/apply/dashboard/templates/dashboard/includes/paf_waiting_for_approval.html
@@ -3,7 +3,9 @@
 
 <div id="paf-awaiting-approval" class="wrapper wrapper--bottom-space" x-data="{ tab: '{% trans "Awaiting your approval" %}' }">
     <section class="section section--with-options">
-        <h4 class="heading heading--normal heading--no-margin">{% trans 'PAF waiting for internal approval' %}</h4>
+        <h2 class="text-xl mb-2">
+            {% trans 'PAF waiting for internal approval' %}
+        </h2>
         <nav>
             <a class="tab__item tab__item--alt"
                 role="tab"
@@ -28,14 +30,18 @@ <h4 class="heading heading--normal heading--no-margin">{% trans 'PAF waiting for
         {% if paf_waiting_for_approval.awaiting_your_approval.count %}
             {% render_table paf_waiting_for_approval.awaiting_your_approval.table %}
         {% else %}
-            {% trans "You have approved all PAFs, no PAF is waiting for your Approval " %}
+            <div class="border px-2 py-4">
+                {% trans "You have approved all PAFs, no PAF is waiting for your Approval " %}
+            </div>
         {% endif %}
     </div>
     <div x-show="tab === '{% trans "Approved by you" %}'" role="tabpanel" tabindex="0" aria-labelledby="tab-paf-approved" id="panel-paf-approved">
         {% if paf_waiting_for_approval.approved_by_you.count %}
             {% render_table paf_waiting_for_approval.approved_by_you.table %}
         {% else %}
-            {% trans "No PAF is approved by you yet " %}
+            <div class="border px-2 py-4">
+                {% trans "No PAF is approved by you yet " %}
+            </div>
         {% endif %}
     </div>
 
diff --git a/hypha/apply/dashboard/templates/dashboard/includes/projects_in_contracting.html b/hypha/apply/dashboard/templates/dashboard/includes/projects_in_contracting.html
index e0a8c14e9f..968d78503b 100644
--- a/hypha/apply/dashboard/templates/dashboard/includes/projects_in_contracting.html
+++ b/hypha/apply/dashboard/templates/dashboard/includes/projects_in_contracting.html
@@ -3,7 +3,9 @@
 
 <div id="projects-in-contracting" class="wrapper wrapper--bottom-space" x-data="{ tab: '{% trans "Waiting for contract" %}' }">
     <section class="section section--with-options">
-        <h4 class="heading heading--normal heading--no-margin">{% trans 'Projects in contracting' %}</h4>
+        <h2 class="text-xl mb-2">
+            {% trans 'Projects in contracting' %}
+        </h2>
         <nav>
             <a class="tab__item tab__item--alt"
                 role="tab"
@@ -28,14 +30,18 @@ <h4 class="heading heading--normal heading--no-margin">{% trans 'Projects in con
         {% if projects_in_contracting.waiting_for_contract.count %}
             {% render_table projects_in_contracting.waiting_for_contract.table %}
         {% else %}
-            {% trans "No project is waiting for contract" %}
+            <div class="border px-2 py-4">
+                {% trans "No project is waiting for contract" %}
+            </div>
         {% endif %}
     </div>
     <div x-show="tab === '{% trans "Waiting for contract approval" %}'" role="tabpanel" tabindex="0" aria-labelledby="tab-contract-approval" id="panel-contract-approval">
         {% if projects_in_contracting.waiting_for_contract_approval.count %}
             {% render_table projects_in_contracting.waiting_for_contract_approval.table %}
         {% else %}
-            {% trans "No project is waiting for contract approval " %}
+            <div class="border px-2 py-4">
+                {% trans "No project is waiting for contract approval " %}
+            </div>
         {% endif %}
     </div>
 
diff --git a/hypha/apply/dashboard/templates/dashboard/includes/submissions-waiting-for-review.html b/hypha/apply/dashboard/templates/dashboard/includes/submissions-waiting-for-review.html
index 416a634090..e7162005a5 100644
--- a/hypha/apply/dashboard/templates/dashboard/includes/submissions-waiting-for-review.html
+++ b/hypha/apply/dashboard/templates/dashboard/includes/submissions-waiting-for-review.html
@@ -1,9 +1,9 @@
 {% load render_table from django_tables2 %}
 {% load i18n %}
 
-<h4 class="text-xl font-medium mb-1">
-    {% trans "Submissions waiting for your review" %} <span class="bg-blue-100 text-blue-800 text-sm font-medium mr-2 px-2.5 py-0.5 rounded dark:bg-blue-900 dark:text-blue-300">{{ in_review_count }}</span>
-</h4>
+<h2 class="text-xl mb-2">
+    {% trans "Submissions waiting for your review" %} <span class="bg-blue-100 text-blue-800 text-sm font-medium mr-2 px-2.5 py-0.5 rounded">{{ in_review_count }}</span>
+</h2>
 
 {% if my_review.data %}
     {% render_table my_review %}
diff --git a/hypha/apply/dashboard/templates/dashboard/reviewer_dashboard.html b/hypha/apply/dashboard/templates/dashboard/reviewer_dashboard.html
index 8ee8ef3493..f977fa5998 100644
--- a/hypha/apply/dashboard/templates/dashboard/reviewer_dashboard.html
+++ b/hypha/apply/dashboard/templates/dashboard/reviewer_dashboard.html
@@ -9,13 +9,10 @@
 {% block title %}{% trans "Dashboard" %}{% endblock %}
 
 {% block content %}
-<div class="admin-bar">
-    <div class="admin-bar__inner">
-        {% block page_header %}
-            <h1 class="gamma heading heading--no-margin heading--bold">{% trans "Dashboard" %}</h1>
-        {% endblock %}
-    </div>
-</div>
+
+    {% adminbar %}
+        {% slot header %}{% trans "Dashboard" %}{% endslot %}
+    {% endadminbar %}
 
 <div class="wrapper wrapper--large wrapper--inner-space-medium">
 
@@ -46,7 +43,9 @@ <h1 class="gamma heading heading--no-margin heading--bold">{% trans "Dashboard"
 
     {% if my_submissions %}
     <div class="wrapper wrapper--bottom-space">
-        <h4 class="heading heading--normal">{% trans "Your active submissions" %}</h4>
+        <h2 class="text-xl mb-2">
+            {% trans "Your active submissions" %}
+        </h2>
         {% for submission in my_submissions %}
             <div class="wrapper wrapper--status-bar-outer">
                 <div class="wrapper wrapper--status-bar-inner">
@@ -72,14 +71,18 @@ <h6 class="heading heading--no-margin heading--submission-meta"><span>{% trans "
 
     {% if paf_waiting_for_assignment.count %}
      <div id="paf_waiting_for_assignment" class="wrapper wrapper--bottom-space">
-        <h4 class="heading heading--normal">{% trans "PAF waiting for assignee" %}</h4>
+        <h2 class="text-xl mb-2">
+            {% trans "PAF waiting for assignee" %}
+        </h2>
         {% render_table paf_waiting_for_assignment.table %}
     </div>
     {% endif %}
 
     {% if my_inactive_submissions.data %}
         <div class="wrapper wrapper--bottom-space">
-            <h4 class="heading heading--normal">{% trans "Submission history" %}</h4>
+            <h2 class="text-xl mb-2">
+                {% trans "Submission history" %}
+            </h2>
             {% render_table my_inactive_submissions %}
         </div>
     {% endif %}
diff --git a/hypha/apply/determinations/templates/determinations/base_determination_form.html b/hypha/apply/determinations/templates/determinations/base_determination_form.html
index 009d873c86..9e1430e680 100644
--- a/hypha/apply/determinations/templates/determinations/base_determination_form.html
+++ b/hypha/apply/determinations/templates/determinations/base_determination_form.html
@@ -2,63 +2,56 @@
 {% load i18n static bleach_tags %}
 {% block title %}{% if object %}{% trans "Edit a Determination" %} {% if object.is_draft %}{% trans "draft" %}{% endif %}{% else %}{% trans "Create a Determination" %}{% endif %}{% endblock %}
 {% block content %}
+
 {% block header %}
-    <div class="admin-bar">
-        <div class="admin-bar__inner">
-            <h2 class="heading heading--no-margin">{% if object %}{% trans "Update Determination draft" %}{% else %}{% trans "Create Determination" %}{% endif %}</h2>
-            <h5>{% trans "For" %} <a href="{% url "funds:submissions:detail" submission.id %}">{{ submission.title }}</a></h5>
-        </div>
-    </div>
+    {% adminbar %}
+        {% slot header %}{% if object %}{% trans "Update Determination draft" %}{% else %}{% trans "Create Determination" %}{% endif %}{% endslot %}
+        {% slot sub_heading %}{% trans "For" %} <a href="{% url "funds:submissions:detail" submission.id %}">{{ submission.title }}</a>{% endslot %}
+    {% endadminbar %}
 {% endblock %}
 
 {% block form %}
-{% include "forms/includes/form_errors.html" with form=form %}
-
-<div class="wrapper wrapper--medium wrapper--inner-space-medium">
-    {% block determination_information %}
-    {% endblock %}
-
-    <form class="form form--with-p-tags" action="" method="post" x-data="{ isFormSubmitting: false }" x-on:submit="isFormSubmitting = true">
-        {{ form.media }}
-        {% csrf_token %}
-
-        {% for hidden in form.hidden_fields %}
-            {{ hidden }}
-        {% endfor %}
-
-        {% for field in form.visible_fields %}
-            {# to be replaced with better logic when/if we use stream form #}
-            {% ifchanged field.field.group %}
-                {% for key, value in form.titles.items %}
-                    {% if key == field.field.group %}
-                        <h2>{{ value }}</h2>
-                    {% endif %}
-                {% endfor %}
-            {% endifchanged %}
-
-            {% if field.field %}
-                {% include "forms/includes/field.html" %}
-            {% else %}
-                {{ field.block }}
-            {% endif %}
+    <section class="my-8">
+        {% include "forms/includes/form_errors.html" with form=form %}
+        {% block determination_information %}
+        {% endblock %}
+        <form class="form max-w-3xl" action="" method="post" x-data="{ isFormSubmitting: false }" x-on:submit="isFormSubmitting = true">
+            {{ form.media }}
+            {% csrf_token %}
+            {% for hidden in form.hidden_fields %}
+                {{ hidden }}
+            {% endfor %}
+            {% for field in form.visible_fields %}
+                {# to be replaced with better logic when/if we use stream form #}
+                {% ifchanged field.field.group %}
+                    {% for key, value in form.titles.items %}
+                        {% if key == field.field.group %}
+                            <h2>{{ value }}</h2>
+                        {% endif %}
+                    {% endfor %}
+                {% endifchanged %}
+                {% if field.field %}
+                    {% include "forms/includes/field.html" %}
+                {% else %}
+                    {{ field.block }}
+                {% endif %}
+            {% endfor %}
+            {% block form_buttons %}
+            <div class="form__group">
+                {% if form.draft_button_name %}
+                    <button class="button button--submit button--white" type="submit" name="{{ form.draft_button_name }}" formnovalidate>{% trans "Save draft" %}</button>
+                {% endif %}
+                <button class="button button--submit button--primary" :disabled="isFormSubmitting" type="submit" name="submit">{% trans "Submit" %}</button>
+            </div>
+            {% endblock %}
+        </form>
+        {% for type, message in message_templates.items %}
+            <div class="is-hidden" data-type="{{ type }}" id="determination-message-{{ type }}">
+                {{ message }}
+            </div>
         {% endfor %}
-
-        {% block form_buttons %}
-        <div class="form__group">
-            {% if form.draft_button_name %}
-                <button class="button button--submit button--white" type="submit" name="{{ form.draft_button_name }}" formnovalidate>{% trans "Save draft" %}</button>
-            {% endif %}
-            <button class="button button--submit button--primary" :disabled="isFormSubmitting" type="submit" name="submit">{% trans "Submit" %}</button>
-        </div>
         {% endblock %}
-    </form>
-    {% for type, message in message_templates.items %}
-        <div class="is-hidden" data-type="{{ type }}" id="determination-message-{{ type }}">
-            {{ message }}
-        </div>
-    {% endfor %}
-</div>
-{% endblock %}
+    </section>
 {% endblock %}
 
 {% block extra_js %}
diff --git a/hypha/apply/determinations/templates/determinations/determination_detail.html b/hypha/apply/determinations/templates/determinations/determination_detail.html
index a9478ccd33..68f9e11322 100644
--- a/hypha/apply/determinations/templates/determinations/determination_detail.html
+++ b/hypha/apply/determinations/templates/determinations/determination_detail.html
@@ -1,5 +1,5 @@
 {% extends "base-apply.html" %}
-{% load i18n bleach_tags %}
+{% load i18n bleach_tags heroicons %}
 
 {% block title %}{% trans "Determination for" %} {{ determination.submission.title }}{% endblock %}
 
@@ -12,22 +12,21 @@
         {% endslot %}
 
         {% slot header %} {% trans "Determination" %} {% if determination.is_draft %}[{% trans "DRAFT" %}] {% endif %}{% endslot %}
-
         {% slot sub_heading %}{% trans "For" %} <a class="text-blue-300 hover:underline" href="{% url "funds:submissions:detail" determination.submission.id %}">{{ determination.submission.title }}</a>{% endslot %}
 
     {% endadminbar %}
 
-    <div class="grid">
-        <div>
-            <h5 class="determination-outcome">{% trans "Determination" %}: {{ determination.get_outcome_display }}</h5>
-        </div>
+    <div class="flex justify-between pt-2 mb-2 mt-2 max-w-[50em] border-b">
+
+        <h5 class="determination-outcome mb-4">
+            {% trans "Determination" %}: {{ determination.get_outcome_display }}
+        </h5>
         {% if request.user.is_apply_staff %}
-            <div>
-                <a class="link link--edit-determination is-active" href="{% url 'apply:submissions:determinations:edit' submission_pk=determination.submission.id pk=determination.id %}">
-                    {% trans "Edit" %}
-                <svg class="icon icon--pen"><use xlink:href="#pen"></use></svg>
-                </a>
-            </div>
+            <a class="text-blue-500 hover:underline" href="{% url 'apply:submissions:determinations:edit' submission_pk=determination.submission.id pk=determination.id %}">
+                <span class="whitespace-nowrap">
+                    {% trans "Edit" %}{% heroicon_mini "pencil-square" size=18 class="inline ml-1 align-text-bottom" aria_hidden=true %}
+                </span>
+            </a>
         {% endif %}
     </div>
 
diff --git a/hypha/apply/funds/templates/funds/application_base.html b/hypha/apply/funds/templates/funds/application_base.html
index f6d890aaeb..a2329e74e7 100644
--- a/hypha/apply/funds/templates/funds/application_base.html
+++ b/hypha/apply/funds/templates/funds/application_base.html
@@ -12,7 +12,7 @@
                 <span class="font-bold text-fg-muted">{% trans "Next deadline" %}: {{ page.end_date }}</span>
             </p>
         {% endif %}
-        <h1>{{ page.title }}</h1>
+        <h1 class="text-5xl font-bold">{{ page.title }}</h1>
         {% if form.errors or form.non_field_errors %}
             <div class="wrapper wrapper--error">
                 {% heroicon_solid "exclamation-triangle" aria_hidden="true" class="inline mr-2 fill-red-500" %}
diff --git a/hypha/apply/funds/templates/funds/applicationrevision_list.html b/hypha/apply/funds/templates/funds/applicationrevision_list.html
index 86b5c6405f..3ce639ee8a 100644
--- a/hypha/apply/funds/templates/funds/applicationrevision_list.html
+++ b/hypha/apply/funds/templates/funds/applicationrevision_list.html
@@ -3,12 +3,10 @@
 {% block title %}{% blocktrans with title=submission.title %}Revisions for {{ title }}{% endblocktrans %}{% endblock %}
 
 {% block content %}
-<div class="admin-bar">
-    <div class="admin-bar__inner">
-        <h1 class="beta heading heading--no-margin heading--bold">{% trans "Revisions" %}</h1>
-        <h5>{% trans "For" %} <a href="{% url "funds:submissions:detail" submission.id %}">{{ submission.title }}</a></h5>
-    </div>
-</div>
+    {% adminbar %}
+        {% slot header %}{% trans "Revisions" %}{% endslot %}
+        {% slot sub_heading %}{% trans "For" %} <a class="text-blue-300 hover:underline" href="{% url "funds:submissions:detail" submission.id %}">{{ submission.title }}</a>{% endslot %}
+    {% endadminbar %}
 
 <div class="wrapper wrapper--medium">
     <ul class="revision">
diff --git a/hypha/apply/funds/templates/funds/includes/table_filter_and_search.html b/hypha/apply/funds/templates/funds/includes/table_filter_and_search.html
index c78ce3f6e8..ad72271e58 100644
--- a/hypha/apply/funds/templates/funds/includes/table_filter_and_search.html
+++ b/hypha/apply/funds/templates/funds/includes/table_filter_and_search.html
@@ -6,7 +6,9 @@
         {# Left #}
         <div class="actions-bar__inner actions-bar__inner--left">
             {% if heading %}
-                <h4 class="heading heading--normal heading--no-margin">{{ heading }}
+                <h2 class="text-xl mb-2">
+
+                    {{ heading }}
 
                     {% if show_try_new_submissions_link %}
                         <a class="text-sm text-[#1d79a8] border-b border-transparent hover:opacity-70 hover:underline transition-all"
@@ -17,7 +19,7 @@ <h4 class="heading heading--normal heading--no-margin">{{ heading }}
                             {% trans "Try newer version" %})
                         </a>
                     {% endif %}
-                </h4>
+                </h2>
             {% endif %}
 
 
diff --git a/hypha/apply/funds/templates/funds/reminder_confirm_delete.html b/hypha/apply/funds/templates/funds/reminder_confirm_delete.html
index 8f6e5f8776..88334d3945 100644
--- a/hypha/apply/funds/templates/funds/reminder_confirm_delete.html
+++ b/hypha/apply/funds/templates/funds/reminder_confirm_delete.html
@@ -4,20 +4,19 @@
 {% block title %}{% trans "Deleting" %}: {{ object }}{% endblock %}
 
 {% block content %}
-<div class="admin-bar">
-    <div class="admin-bar__inner">
-        <h2 class="heading heading--no-margin">{% trans "Deleting" %}: {{ object }}</h2>
-    </div>
-</div>
 
-<div class="wrapper wrapper--light-grey-bg wrapper--form wrapper--sidebar">
-    <div class="wrapper--sidebar--inner">
-        <form class="form" action="" method="post">
-            {% csrf_token %}
-            <p><strong{% blocktrans %}>Are you sure you want to delete "{{ object }}"?{% endblocktrans %}</strong></p>
-            <button class="button button--warning button--submit button--top-space" type="submit">{% trans "Confirm" %}</button>
-        </form>
+    {% adminbar %}
+        {% slot header %}{% trans "Deleting" %}: {{ object }}{% endslot %}
+    {% endadminbar %}
+
+    <div class="wrapper wrapper--light-grey-bg wrapper--form wrapper--sidebar">
+        <div class="wrapper--sidebar--inner">
+            <form class="form" action="" method="post">
+                {% csrf_token %}
+                <p><strong{% blocktrans %}>Are you sure you want to delete "{{ object }}"?{% endblocktrans %}</strong></p>
+                <button class="button button--warning button--submit button--top-space" type="submit">{% trans "Confirm" %}</button>
+            </form>
+        </div>
     </div>
-</div>
 
 {% endblock %}
diff --git a/hypha/apply/funds/templates/funds/revisions_compare.html b/hypha/apply/funds/templates/funds/revisions_compare.html
index eaf55100d6..fbae8efe38 100644
--- a/hypha/apply/funds/templates/funds/revisions_compare.html
+++ b/hypha/apply/funds/templates/funds/revisions_compare.html
@@ -2,15 +2,22 @@
 {% load i18n %}
 {% block title %}{% trans "Compare" %}: {{ object.title }}{% endblock %}
 {% block content %}
-<div class="admin-bar">
-    <div class="admin-bar__inner">
-        <h2 class="heading heading--no-margin">{% trans "Comparing revisions" %}</h2>
-        <h5>{% trans "For" %} <a href="{% url "funds:submissions:detail" object.id %}">{{ object.title }}</a></h5>
-        <h5><a href="{% url "funds:submissions:revisions:list" object.id %}">{% trans "Back to revisions" %}</a></h5>
-    </div>
-</div>
 
-<div class="wrapper wrapper--large wrapper--tabs">
-    {% include "funds/includes/revision_diff_table.html" %}
-</div>
+    {% adminbar %}
+        {% slot back_link %}
+            <a class="simplified__submissions-link" href="{% url "funds:submissions:revisions:list" object.id %}">
+                {% trans "View revisions" %}
+            </a>
+        {% endslot %}
+
+        {% slot header %}{% trans "Comparing revisions" %}{% endslot %}
+        {% slot sub_heading %}
+            {% trans "For" %} <a class="text-blue-300 hover:underline" href="{% url "funds:submissions:detail" object.id %}">{{ object.title }}</a>
+        {% endslot %}
+
+    {% endadminbar %}
+
+    <div class="wrapper wrapper--large wrapper--tabs">
+        {% include "funds/includes/revision_diff_table.html" %}
+    </div>
 {% endblock %}
diff --git a/hypha/apply/stream_forms/templates/stream_forms/heading_field.html b/hypha/apply/stream_forms/templates/stream_forms/heading_field.html
index cdbafe29ff..0c8b1e07e2 100644
--- a/hypha/apply/stream_forms/templates/stream_forms/heading_field.html
+++ b/hypha/apply/stream_forms/templates/stream_forms/heading_field.html
@@ -1,14 +1,14 @@
-<div class="section-head">
+<div class="section-head mb-4">
     <{{ self.size }} tabindex="-1" class="p-2 mb-2 bg-light-blue text-white">
 
-        {{ value.heading_text }}
-        <a id="{{ value.heading_text|slugify }}"
-            class="anchor hidden group-hover:inline-block text-gray-700"
-            href="#{{ value.heading_text|slugify }}"
-            aria-hidden='true'>
-            <svg class="icon icon--anchor-link">
-                <use xlink:href="#anchor-link"></use>
-            </svg>
-        </a>
-    </{{ self.size }}>
+    {{ value.heading_text }}
+    <a id="{{ value.heading_text|slugify }}"
+       class="anchor hidden group-hover:inline-block text-gray-700"
+       href="#{{ value.heading_text|slugify }}"
+       aria-hidden='true'>
+        <svg class="icon icon--anchor-link">
+            <use xlink:href="#anchor-link"></use>
+        </svg>
+    </a>
+</{{ self.size }}>
 </div>
diff --git a/hypha/apply/users/templates/users/account.html b/hypha/apply/users/templates/users/account.html
index ac4152f930..5bd5c6cae8 100644
--- a/hypha/apply/users/templates/users/account.html
+++ b/hypha/apply/users/templates/users/account.html
@@ -16,7 +16,7 @@
 
 <div class="profile">
     <div class="profile__column">
-        <h3 class="text-2xl">{% trans "Profile" %}</h3>
+        <h2 class="text-2xl">{% trans "Profile" %}</h2>
         <form action="" method="post" class="form">
             {% csrf_token %}
             {% for field in form %}
@@ -30,15 +30,15 @@ <h3 class="text-2xl">{% trans "Profile" %}</h3>
 
     {% if show_change_password and user.has_usable_password and not backends.associated %}
         <div class="profile__column">
-            <h3 class="text-2xl">{% trans "Account Security" %}</h3>
-            <h4 class="text-xl">{% trans "Password" %}</h4>
+            <h2 class="text-2xl">{% trans "Account Security" %}</h2>
+            <h3 class="text-base">{% trans "Password" %}</h3>
             <p><a class="button button--primary" href="{% url 'users:password_change' %}">{% trans "Update password" %}</a></p>
 
-            <h4 class="text-xl mt-8">{% trans "Two-Factor Authentication (2FA)" %}</h4>
+            <h4 class="text-base mt-8">{% trans "Two-Factor Authentication (2FA)" %}</h4>
             {% if default_device %}
                 <div>
                     <p><a class="button button--primary" href="{% url 'users:backup_tokens_password' %}">{% trans "Backup codes" %}</a></p>
-                    <p><a class="button button--primary" href="{% url 'two_factor:disable' %}">{% trans "Disable 2FA" %}</a></p>
+                    <p><a class="button button--primary button--warning" href="{% url 'two_factor:disable' %}">{% trans "Disable 2FA" %}</a></p>
                 </div>
             {% else %}
                 <p><a class="button button--primary" href="{% url 'two_factor:setup' %}">{% trans "Enable 2FA" %}</a></p>
@@ -50,7 +50,7 @@ <h4 class="text-xl mt-8">{% trans "Two-Factor Authentication (2FA)" %}</h4>
     {% if swappable_form %}
     <div class="profile__column">
         {% if swappable_form %}
-            <h3 class="text-2xl">{% trans "Become" %}:</h3>
+            <h2 class="text-2xl">{% trans "Become" %}:</h2>
             <form action="{% url 'users:become' %}" method="post" class="form">
                 {{ swappable_form.media }}
                 {% csrf_token %}
diff --git a/hypha/apply/users/templates/users/login.html b/hypha/apply/users/templates/users/login.html
index f1119fff4e..ab5154f588 100644
--- a/hypha/apply/users/templates/users/login.html
+++ b/hypha/apply/users/templates/users/login.html
@@ -5,106 +5,111 @@
 {% block body_class %}bg-white{% endblock %}
 
 {% block content %}
-<div class="w-full grid bg-white mt-5 md:py-4">
-
-    <section>
-        <div class="px-4 pt-4">
-            {% if wizard.steps.current == 'token' %}
-                {% if device.method == 'call' %}
-                    <p>{% blocktrans trimmed %}We are calling your phone right now, please enter the
-                        digits you hear.{% endblocktrans %}</p>
-                {% elif device.method == 'sms' %}
-                    <p>{% blocktrans trimmed %}We sent you a text message, please enter the tokens we
-                        sent.{% endblocktrans %}</p>
-                {% else %}
-                    <h2 class="text-2xl">Two Factor Verification</h2>
-                    <p>{% blocktrans trimmed %}Please enter the 6-digit verification code generated by your Authenticator App.{% endblocktrans %}</p>
-                {% endif %}
-            {% elif wizard.steps.current == 'backup' %}
-                <p>{% blocktrans trimmed %}Please enter one of the backup codes to login to your account.
-                    Those codes were generated for you during 2FA setup to print or keep safe in a password manager.{% endblocktrans %}</p>
-            {% endif %}
-
-            <form class="form form--user-login" method="post">
-                {% csrf_token %}
-                {{ wizard.management_form }}
-
-                {% if wizard.steps.current == 'auth' %}
-
-                    <h2 class="text-2xl">Log in to {{ ORG_SHORT_NAME }}</h2>
-                    {% for field in form %}
-                        {% include "forms/includes/field.html" %}
-                    {% endfor %}
-                    {% if settings.users.AuthSettings.extra_text %}
-                        {{ settings.users.AuthSettings.extra_text|richtext}}
+    <div class="w-full grid bg-white mt-5 md:py-4">
+
+        <section>
+            <div class="px-4 pt-4">
+                {% if wizard.steps.current == 'token' %}
+                    {% if device.method == 'call' %}
+                        <p>{% blocktrans trimmed %}We are calling your phone right now, please enter the
+                            digits you hear.{% endblocktrans %}</p>
+                    {% elif device.method == 'sms' %}
+                        <p>{% blocktrans trimmed %}We sent you a text message, please enter the tokens we
+                            sent.{% endblocktrans %}</p>
+                    {% else %}
+                        <h2 class="text-2xl">Two Factor Verification</h2>
+                        <p>{% blocktrans trimmed %}Please enter the 6-digit verification code generated by your Authenticator App.{% endblocktrans %}</p>
                     {% endif %}
+                {% elif wizard.steps.current == 'backup' %}
+                    <p>{% blocktrans trimmed %}Please enter one of the backup codes to login to your account.
+                        Those codes were generated for you during 2FA setup to print or keep safe in a password manager.{% endblocktrans %}</p>
+                {% endif %}
 
-                    <div class="form__group">
-                        <button class="link link--button link--button-secondary" type="submit">{% trans "Log in" %}</button>
-                    </div>
+                <form class="form form--user-login" method="post">
+                    {% csrf_token %}
+                    {{ wizard.management_form }}
 
-                    {% if GOOGLE_OAUTH2 %}
-                    <div class="flex items-center justify-start relative">
-                        <hr class="inline w-32 h-px my-6 bg-gray-300 border-0">
-                        <span class="px-3 text-gray-400 font-medium">or</span>
-                        <hr class="inline w-32 h-px my-6 bg-gray-300 border-0">
-                    </div>
+                    {% if wizard.steps.current == 'auth' %}
 
-                    <div class="">
-                        <a class="link link--button link--button-tertiary" href="{% url "social:begin" "google-oauth2" %}{% if next %}?next={{ next }}{% endif %}">{% blocktrans %}Log in with your {{ ORG_SHORT_NAME }} email{% endblocktrans %}</a>
-                    </div>
-                    {% endif %}
+                        <h2 class="text-2xl">Log in to {{ ORG_SHORT_NAME }}</h2>
+                        {% for field in form %}
+                            <div class="form__group">
+                                {% include "forms/includes/field.html" %}
+                            </div>
+                        {% endfor %}
+                        {% if settings.users.AuthSettings.extra_text %}
+                            {{ settings.users.AuthSettings.extra_text|richtext}}
+                        {% endif %}
+
+                        <div class="form__group">
+                            <button class="link link--button link--button-secondary" type="submit">{% trans "Log in" %}</button>
+                        </div>
+
+                        {% if GOOGLE_OAUTH2 %}
+                            <div class="flex items-center justify-start relative">
+                                <hr class="inline w-32 h-px my-6 bg-gray-300 border-0">
+                                <span class="px-3 text-gray-400 font-medium">or</span>
+                                <hr class="inline w-32 h-px my-6 bg-gray-300 border-0">
+                            </div>
 
-                    <div class="inline-flex gap-8 w-full mt-4">
-                        {% if ENABLE_REGISTRATION_WITHOUT_APPLICATION %}
-                            <a href="{% url 'users_public:register' %}{% if redirect_url %}?next={{ redirect_url }}{% endif %}" hx-boost="true"> {% trans "Create account" %}</a>
+                            <div class="">
+                                <a class="link link--button link--button-tertiary" href="{% url "social:begin" "google-oauth2" %}{% if next %}?next={{ next }}{% endif %}">{% blocktrans %}Log in with your {{ ORG_SHORT_NAME }} email{% endblocktrans %}</a>
+                            </div>
                         {% endif %}
-                        <a class="link" href="{% url 'users:password_reset' %}{% if redirect_url %}?next={{ redirect_url }}{% endif %}" hx-boost="true">{% trans "Forgot your password?" %}</a>
-                    </div>
-                {% else %}
-                    {{ wizard.form }}
+
+                        <div class="inline-flex gap-8 w-full mt-4">
+                            {% if ENABLE_REGISTRATION_WITHOUT_APPLICATION %}
+                                <a href="{% url 'users_public:register' %}{% if redirect_url %}?next={{ redirect_url }}{% endif %}" hx-boost="true"> {% trans "Create account" %}</a>
+                            {% endif %}
+                            <a class="link" href="{% url 'users:password_reset' %}{% if redirect_url %}?next={{ redirect_url }}{% endif %}" hx-boost="true">{% trans "Forgot your password?" %}</a>
+                        </div>
+                    {% else %}
+
+                        <div class="form__group">
+                            {{ wizard.form }}
+                        </div>
 
                     {# hidden submit button to enable [enter] key #}
-                    <div class="sr-only"><input type="submit" value=""/></div>
+                        <div class="sr-only"><input type="submit" value=""/></div>
 
-                    {% if other_devices %}
-                        <p>{% trans "Or, alternatively, use one of your backup phones:" %}</p>
-                        <p>
-                            {% for other in other_devices %}
-                            <button name="challenge_device" value="{{ other.persistent_id }}"
+                        {% if other_devices %}
+                            <p>{% trans "Or, alternatively, use one of your backup phones:" %}</p>
+                            <p>
+                                {% for other in other_devices %}
+                                    <button name="challenge_device" value="{{ other.persistent_id }}"
                                             class="btn btn-default btn-block" type="submit">
-                                {{ other.generate_challenge_button_title }}
-                            </button>
-                        {% endfor %}</p>
-                    {% endif %}
+                                        {{ other.generate_challenge_button_title }}
+                                    </button>
+                                {% endfor %}</p>
+                        {% endif %}
 
-                    <div class="wrapper">
-                        {% include "two_factor/_wizard_actions.html" %}
-                    </div>
+                        <div class="wrapper">
+                            {% include "two_factor/_wizard_actions.html" %}
+                        </div>
 
-                    {% if backup_tokens %}
-                        <p>{% trans "As a last resort, you can use a backup codes:" %}
-                            <button name="wizard_goto_step" type="submit" value="backup"
-                                            class="link link--button link--button-tertiary">{% trans "Use Backup Code" %}</button>
-                        </p>
+                        {% if backup_tokens %}
+                            <p>{% trans "As a last resort, you can use a backup codes:" %}
+                                <button name="wizard_goto_step" type="submit" value="backup"
+                                        class="link link--button link--button-tertiary">{% trans "Use Backup Code" %}</button>
+                            </p>
+                        {% endif %}
                     {% endif %}
-                {% endif %}
-            </form>
-        </div>
-    </section>
-</div>
+                </form>
+            </div>
+        </section>
+    </div>
 
-<script>
+    <script>
     {# Fix copy of dynamic fields label #}
-    var labelOtpToken = document.querySelector("label[for=id_token-otp_token]");
-    if(labelOtpToken){
-        labelOtpToken.textContent = "{% trans 'Verification Code' %}: ";
-    }
-    var labelBackupOTPToken = document.querySelector("label[for=id_backup-otp_token]");
-    if(labelBackupOTPToken){
-        labelBackupOTPToken.textContent = "{% trans 'Backup Code' %}: ";
-    }
-</script>
+        var labelOtpToken = document.querySelector("label[for=id_token-otp_token]");
+        if(labelOtpToken){
+            labelOtpToken.textContent = "{% trans 'Verification Code' %}: ";
+        }
+        var labelBackupOTPToken = document.querySelector("label[for=id_backup-otp_token]");
+        if(labelBackupOTPToken){
+            labelBackupOTPToken.textContent = "{% trans 'Backup Code' %}: ";
+        }
+    </script>
 
 
 {% endblock %}
diff --git a/hypha/apply/users/templates/users/register.html b/hypha/apply/users/templates/users/register.html
index 154874726e..b05b79fb3a 100644
--- a/hypha/apply/users/templates/users/register.html
+++ b/hypha/apply/users/templates/users/register.html
@@ -5,41 +5,41 @@
 {% block body_class %}bg-white{% endblock %}
 
 {% block content %}
-<div class="w-full grid md:mt-5 md:py-4">
-    <section>
-        <div class="px-4 pt-4">
-            <form class="form" method="post" action="{% url 'users_public:register' %}">
-                {% csrf_token %}
-                {% if redirect_url %}
-                    <input type="hidden" value="{{ redirect_url }}" name="next">
-                {% endif %}
-                <h2 class="text-2xl">Create your account</h2>
-
-                {% if form.non_field_errors %}
-                    <div class="wrapper wrapper--error">{{ form.non_field_errors.as_text }}</div>
-                {% endif %}
+    <div class="w-full grid md:mt-5 md:py-4">
+        <section>
+            <div class="px-4 pt-4">
+                <form class="form" method="post" action="{% url 'users_public:register' %}">
+                    {% csrf_token %}
+                    {% if redirect_url %}
+                        <input type="hidden" value="{{ redirect_url }}" name="next">
+                    {% endif %}
+                    <h2 class="text-2xl">Create your account</h2>
 
-                {% for field in form %}
-                {%if field.id_for_label != 'id_is_superuser' and field.label != 'Groups' %}
-                    {% include "forms/includes/field.html" %}
-                {%endif%}
-                {% endfor %}
-                <div class="form_group">
-                    <button class="button button--primary" type="submit">{% trans "Submit" %}</button>
-                </div>
-            </form>
-            <p>
-                {% trans "Already have an account?" %}<a href="{% url 'users_public:login' %}{% if redirect_url %}?next={{ redirect_url }}{% endif %}" hx-boost="true"> {% trans "Log in" %}</a>
-            </p>
-        </div>
-    </section>
+                    {% if form.non_field_errors %}
+                        <div class="wrapper wrapper--error">{{ form.non_field_errors.as_text }}</div>
+                    {% endif %}
 
-    {% if settings.users.AuthSettings.register_extra_text %}
-        <section>
-            <div class="px-4 my-4">
-                {{ settings.users.AuthSettings.register_extra_text|richtext}}
+                    {% for field in form %}
+                        {%if field.id_for_label != 'id_is_superuser' and field.label != 'Groups' %}
+                            {% include "forms/includes/field.html" %}
+                        {%endif%}
+                    {% endfor %}
+                    <div class="form__group">
+                        <button class="button button--primary" type="submit">{% trans "Submit" %}</button>
+                    </div>
+                </form>
+                <p class="mt-4">
+                    {% trans "Already have an account?" %}<a href="{% url 'users_public:login' %}{% if redirect_url %}?next={{ redirect_url }}{% endif %}" hx-boost="true"> {% trans "Log in" %}</a>
+                </p>
             </div>
         </section>
-    {% endif %}
-</div>
+
+        {% if settings.users.AuthSettings.register_extra_text %}
+            <section>
+                <div class="px-4 my-4">
+                    {{ settings.users.AuthSettings.register_extra_text|richtext}}
+                </div>
+            </section>
+        {% endif %}
+    </div>
 {% endblock %}
diff --git a/hypha/static_src/src/sass/apply/components/_form.scss b/hypha/static_src/src/sass/apply/components/_form.scss
index 215a9084e5..8983aecbad 100644
--- a/hypha/static_src/src/sass/apply/components/_form.scss
+++ b/hypha/static_src/src/sass/apply/components/_form.scss
@@ -1,6 +1,6 @@
 // stylelint-disable selector-max-compound-selectors
 
-@use 'sass:math';
+@use "sass:math";
 
 .form {
     $root: &;
@@ -11,7 +11,7 @@
 
             label {
                 display: block;
-                margin-bottom: .5em;
+                margin-bottom: 0.5em;
                 font-weight: $weight--bold;
             }
         }
@@ -34,7 +34,8 @@
 
     &__group {
         position: relative;
-        margin-top: 1.5rem;
+        margin-top: 0.5rem;
+        margin-bottom: 1.5rem;
 
         &:nth-of-type(1) {
             margin-top: 0;
@@ -80,12 +81,12 @@
                 &__item {
                     display: flex;
                     align-items: center;
-                    gap: .5em;
+                    gap: 0.5em;
                 }
             }
         }
 
-        input[type='date']:last-child {
+        input[type="date"]:last-child {
             max-width: 385px;
         }
     }
@@ -104,7 +105,8 @@
             @include button($color--light-blue, $color--darkest-blue);
             max-width: 290px;
             text-align: center;
-            background: url('./../../images/upload.svg') $color--light-blue no-repeat 20px center;
+            background: url("./../../images/upload.svg") $color--light-blue
+                no-repeat 20px center;
             border: 0;
 
             .no-js & {
@@ -116,7 +118,8 @@
             }
 
             &:hover {
-                background: url('./../../images/upload.svg') $color--dark-blue no-repeat 20px center;
+                background: url("./../../images/upload.svg") $color--dark-blue
+                    no-repeat 20px center;
 
                 .no-js & {
                     background: none;
@@ -133,7 +136,7 @@
 
     &__file-list {
         ul {
-            margin: .5rem 0;
+            margin: 0.5rem 0;
         }
     }
 
@@ -154,7 +157,7 @@
 
             &.is-active {
                 font-weight: $weight--normal;
-                background-color: transparentize($color--primary, .9);
+                background-color: transparentize($color--primary, 0.9);
                 border-color: $color--mid-grey;
             }
 
@@ -279,7 +282,7 @@
     &__help {
         margin: 0;
         color: var(--color-fg-muted);
-        font-size: .875rem;
+        font-size: 0.875rem;
         line-height: 1.25rem;
 
         .profile & {
@@ -288,7 +291,7 @@
     }
 
     &__help-link {
-        font-size: .875rem;
+        font-size: 0.875rem;
         line-height: 1.25rem;
 
         a {
@@ -308,7 +311,7 @@
 
     &__item {
         position: relative;
-        padding-top: .5rem;
+        padding-top: 0.5rem;
     }
 
     &__select {
@@ -332,7 +335,7 @@
             }
         }
 
-        select[multiple='multiple'] {
+        select[multiple="multiple"] {
             display: block;
         }
 
@@ -348,14 +351,14 @@
     }
 
     select,
-    input[type='url'],
-    input[type='text']:not(.input--secondary),
-    input[type='date'],
-    input[type='time'],
-    input[type='email'],
-    input[type='number'],
-    input[type='password'],
-    input[type='datetime-local'] {
+    input[type="url"],
+    input[type="text"]:not(.input--secondary),
+    input[type="date"],
+    input[type="time"],
+    input[type="email"],
+    input[type="number"],
+    input[type="password"],
+    input[type="datetime-local"] {
         width: 100%;
         max-width: 385px;
 
@@ -368,14 +371,14 @@
     &__error {
         select,
         textarea,
-        input[type='url'],
-        input[type='text'],
-        input[type='date'],
-        input[type='time'],
-        input[type='email'],
-        input[type='number'],
-        input[type='password'],
-        input[type='datetime-local'] {
+        input[type="url"],
+        input[type="text"],
+        input[type="date"],
+        input[type="time"],
+        input[type="email"],
+        input[type="number"],
+        input[type="password"],
+        input[type="datetime-local"] {
             border: 2px solid $color--error;
         }
     }
@@ -402,21 +405,21 @@
                 border-color: transparent $color--error transparent transparent;
                 border-style: solid;
                 border-width: 5px 10px 5px 0;
-                content: '';
+                content: "";
             }
         }
     }
 
     // make date & time input siblings inline
-    input[type='date'] {
+    input[type="date"] {
         max-width: calc(385px - 100px);
     }
 
-    input[type='date'] + input[type='time'] {
+    input[type="date"] + input[type="time"] {
         width: 100px;
     }
 
-    input[type='file'] {
+    input[type="file"] {
         @extend %off-screen;
 
         .no-js & {
@@ -428,7 +431,7 @@
     &__textarea {
         display: block;
         width: 100%;
-        padding: .4em;
+        padding: 0.4em;
         border: 1px solid $color--mid-grey;
         line-height: math.div($base-line-height, $base-font-size);
     }
@@ -443,12 +446,12 @@
 
     &__comments {
         display: grid;
-        grid-template-areas: 'message' 'visibility' 'actions';
+        grid-template-areas: "message" "visibility" "actions";
         grid-template-rows: auto auto auto;
         grid-template-columns: 1fr;
 
         @include media-query(tablet-landscape) {
-            grid-template-areas: 'message visibility' 'actions actions';
+            grid-template-areas: "message visibility" "actions actions";
             grid-template-rows: auto auto;
             grid-template-columns: 2fr 1fr;
             column-gap: 2rem;
@@ -460,7 +463,8 @@
             }
         }
 
-        .id_message { // stylelint-disable-line selector-class-pattern
+        // stylelint-disable-next-line selector-class-pattern
+        .id_message {
             grid-area: message;
 
             > label {
@@ -468,7 +472,8 @@
             }
         }
 
-        .id_visibility_0 { // stylelint-disable-line selector-class-pattern
+        // stylelint-disable-next-line selector-class-pattern
+        .id_visibility_0 {
             grid-area: visibility;
         }
 
@@ -479,34 +484,35 @@
         }
     }
 
-
     // Radio + Checkbox
-    [type='radio'],
-    [type='checkbox'] {
+    [type="radio"],
+    [type="checkbox"] {
         & + label {
-            padding-inline-start: .25rem;
+            padding-inline-start: 0.25rem;
             cursor: pointer;
         }
     }
 
     .errorlist {
         padding: 5px;
-        margin-bottom: .2em;
+        margin-bottom: 0.2em;
         background: $color--light-pink;
         border: 1px solid $color--tomato;
     }
 
     .address {
-        padding: .4em;
-        border: 1px solid #cfcfcf8f;  // stylelint-disable-line color-no-hex
+        padding: 0.4em;
+        border: 1px solid #cfcfcf8f; // stylelint-disable-line color-no-hex
         max-width: 410px;
 
-        .form__group {               // stylelint-disable-line selector-class-pattern
-            margin-top: .5rem;
+        // stylelint-disable-next-line selector-class-pattern
+        .form__group {
+            margin-top: 0.5rem;
         }
 
-        .form__question {             // stylelint-disable-line selector-class-pattern
-            margin-bottom: .25rem;
+        // stylelint-disable-next-line selector-class-pattern
+        .form__question {
+            margin-bottom: 0.25rem;
             font-size: 1rem;
             line-height: 1.25rem;
 
@@ -539,5 +545,7 @@
 }
 
 @keyframes flash {
-    50% { background-color: $color--mustard; }
+    50% {
+        background-color: $color--mustard;
+    }
 }
diff --git a/hypha/static_src/src/sass/apply/components/_grid.scss b/hypha/static_src/src/sass/apply/components/_grid.scss
index 3290c15483..0585a714d0 100644
--- a/hypha/static_src/src/sass/apply/components/_grid.scss
+++ b/hypha/static_src/src/sass/apply/components/_grid.scss
@@ -27,7 +27,7 @@
 @supports (display: grid) {
     .grid {
         display: grid;
-        margin: 30px 0;
+        margin-bottom: 1rem;
         grid-gap: 10px;
         grid-template-columns: repeat(auto-fit, minmax(200px, 1fr));
 
@@ -39,7 +39,7 @@
 
         &--two {
             grid-template-columns: 100%;
-            grid-gap: .25rem;
+            grid-gap: 0.25rem;
 
             @include media-query(tablet-portrait) {
                 grid-template-columns: 1fr 1fr;
diff --git a/hypha/static_src/src/sass/apply/components/_wrapper.scss b/hypha/static_src/src/sass/apply/components/_wrapper.scss
index 6d8e20abda..0079adf623 100644
--- a/hypha/static_src/src/sass/apply/components/_wrapper.scss
+++ b/hypha/static_src/src/sass/apply/components/_wrapper.scss
@@ -3,17 +3,20 @@
 
     &--small {
         max-width: $wrapper--small;
-        margin: 0 auto;
+        margin-left: auto;
+        margin-right: auto;
     }
 
     &--medium {
         max-width: $wrapper--medium;
-        margin: 0 auto;
+        margin-left: auto;
+        margin-right: auto;
     }
 
     &--large {
         max-width: $site-width;
-        margin: 0 auto;
+        margin-left: auto;
+        margin-right: auto;
     }
 
     &--main {
@@ -236,7 +239,7 @@
     }
 
     &--status-bar-outer {
-        padding: 20px;
+        padding: 20px 0;
         background-color: $color--white;
         border-bottom: 3px solid $color--light-grey;
     }
diff --git a/hypha/templates/django/forms/widgets/multiple_input.html b/hypha/templates/django/forms/widgets/multiple_input.html
index 362fed2940..765e63d6d9 100644
--- a/hypha/templates/django/forms/widgets/multiple_input.html
+++ b/hypha/templates/django/forms/widgets/multiple_input.html
@@ -1,5 +1,8 @@
 {% with id=widget.attrs.id %}
-  <ul{% if id %} id="{{ id }}"{% endif %} class="grid grid--two grid--no-margin {% if widget.attrs.class %} {{ widget.attrs.class }} {% endif %}">
+  <ul
+    class="!mb-0 grid grid--two {% if widget.attrs.class %} {{ widget.attrs.class }} {% endif %}"
+    {% if id %} id="{{ id }}"{% endif %}
+  >
     {% for group, options, index in widget.optgroups %}
       {% if group %}
         <li>{{ group }}<ul{% if id %} id="{{ id }}_{{ index }}"{% endif %}>
@@ -12,4 +15,4 @@
         </li>
       {% endif %}
     {% endfor %}
-</ul>{% endwith %}
+  </ul>{% endwith %}