diff --git a/funnel/templates/macros.html.jinja2 b/funnel/templates/macros.html.jinja2
index 4e8745af6..34d948845 100644
--- a/funnel/templates/macros.html.jinja2
+++ b/funnel/templates/macros.html.jinja2
@@ -301,9 +301,9 @@
           <div class="user__box__gravatar user__box__gravatar--initials">{{ account.title|initials }}</div>
         {% endif %}
        {% if add_profile_link %}</a>{% endif %}
+       {% if add_profile_link %}<a href="{{ account.absolute_url }}" class="mui--text-dark mui--text-subhead text-bold nounderline" data-cy="profile-link">{%- else %}<span class="mui--text-dark mui--text-subhead text-bold nounderline">{% endif %}{{ account.title }}{% if add_profile_link %}</a>{%- else %}</span>{% endif %}
     </div>
   </div>
-  {% if add_profile_link %}<a href="{{ account.absolute_url }}" class="mui--text-dark mui--text-subhead text-bold nounderline" data-cy="profile-link">{%- else %}<span class="mui--text-dark mui--text-subhead text-bold nounderline">{% endif %}{{ account.title }}{% if add_profile_link %}</a>{%- else %}</span>{% endif %}
   {{ add_follow_button(account, css_class=css_class) }}
 {%- endmacro %}
 
diff --git a/funnel/templates/project_layout.html.jinja2 b/funnel/templates/project_layout.html.jinja2
index 526fa014f..bb29cb77c 100644
--- a/funnel/templates/project_layout.html.jinja2
+++ b/funnel/templates/project_layout.html.jinja2
@@ -325,12 +325,14 @@
               {{ faicon(icon='grip-vertical', baseline=false, css_class="margin-bottom drag-handle") }}
             {%- endif %}
           </div>
-          <div class="flex-wrapper flex-wrapper--center flex-wrapper--wrap margin-bottom">
+          <div class="flex-wrapper flex-wrapper--center flex-wrapper--wrap flex-wrapper--space-between margin-bottom">
             {{ profileavatar(sponsorship.member, css_class='flex-item-align-end') }}
-            {% if current_auth.user and current_auth.user.is_site_editor %}
-              <a href="{{ sponsorship.url_for('edit') }}" rel="modal:open" aria-label="{% trans %}Edit sponsor{% endtrans %}" data-ga="Edit sponsor" data-cy="edit-sponsor" role="button" aria-haspopup="true">{{ faicon(icon='edit', baseline=false, css_class="mui--text-light mui--align-middle fa-icon--left-margin fa-icon--right-margin") }}</a>
-              <a href="{{ sponsorship.url_for('remove') }}" rel="modal:open" aria-label="{% trans %}Remove sponsor{% endtrans %}" data-ga="Remove sponsor" data-cy="remove-sponsor" role="button" aria-haspopup="true">{{ faicon(icon='trash-alt', baseline=false, css_class="mui--text-light mui--align-middle") }}</a>
-            {% endif %}
+            <div>
+              {% if current_auth.user and current_auth.user.is_site_editor %}
+                <a href="{{ sponsorship.url_for('edit') }}" rel="modal:open" aria-label="{% trans %}Edit sponsor{% endtrans %}" data-ga="Edit sponsor" data-cy="edit-sponsor" role="button" aria-haspopup="true">{{ faicon(icon='edit', baseline=false, css_class="mui--text-light mui--align-middle fa-icon--left-margin fa-icon--right-margin") }}</a>
+                <a href="{{ sponsorship.url_for('remove') }}" rel="modal:open" aria-label="{% trans %}Remove sponsor{% endtrans %}" data-ga="Remove sponsor" data-cy="remove-sponsor" role="button" aria-haspopup="true">{{ faicon(icon='trash-alt', baseline=false, css_class="mui--text-light mui--align-middle") }}</a>
+              {% endif %}
+            </div>
           </div>
           {%- if sponsorship.member.tagline %}
             <div class="mui--text-body2 mui--text-light margin-bottom">