diff --git a/passbook/admin/templates/administration/flow/list.html b/passbook/admin/templates/administration/flow/list.html
index f309209d5..8af179c26 100644
--- a/passbook/admin/templates/administration/flow/list.html
+++ b/passbook/admin/templates/administration/flow/list.html
@@ -86,9 +86,8 @@
                             </button>
                             <div slot="modal"></div>
                         </pb-modal-button>
-                        {# TODO: Fix execute link being modified #}
-                        <a class="pf-c-button pf-m-secondary" href="{% url 'passbook_admin:flow-execute' pk=flow.pk %}?next={{ request.get_full_path }}">{% trans 'Execute' %}</a>
-                        <a class="pf-c-button pf-m-secondary" href="{% url 'passbook_admin:flow-export' pk=flow.pk %}?next={{ request.get_full_path }}">{% trans 'Export' %}</a>
+                        <a class="pf-c-button pf-m-secondary pb-root-link" href="{% url 'passbook_admin:flow-execute' pk=flow.pk %}?next={{ request.get_full_path }}">{% trans 'Execute' %}</a>
+                        <a class="pf-c-button pf-m-secondary pb-root-link" href="{% url 'passbook_admin:flow-export' pk=flow.pk %}?next={{ request.get_full_path }}">{% trans 'Export' %}</a>
                     </td>
                 </tr>
                 {% endfor %}
diff --git a/passbook/admin/templates/administration/provider/list.html b/passbook/admin/templates/administration/provider/list.html
index c7a99d1da..3e5c3a867 100644
--- a/passbook/admin/templates/administration/provider/list.html
+++ b/passbook/admin/templates/administration/provider/list.html
@@ -97,7 +97,7 @@
                         </pb-modal-button>
                         {% get_links provider as links %}
                         {% for name, href in links.items %}
-                            <a class="pf-c-button pf-m-tertiary" href="{{ href }}?back={{ request.get_full_path }}">{% trans name %}</a>
+                            <a class="pf-c-button pf-m-tertiary pb-root-link" href="{{ href }}?back={{ request.get_full_path }}">{% trans name %}</a>
                         {% endfor %}
                         {% get_htmls provider as htmls %}
                         {% for html in htmls %}
diff --git a/passbook/admin/templates/administration/source/list.html b/passbook/admin/templates/administration/source/list.html
index 38ee8a78d..a0c286d2c 100644
--- a/passbook/admin/templates/administration/source/list.html
+++ b/passbook/admin/templates/administration/source/list.html
@@ -95,7 +95,7 @@
                         </pb-modal-button>
                         {% get_links source as links %}
                         {% for name, href in links %}
-                            <a class="pf-c-button pf-m-tertiary" href="{{ href }}?back={{ request.get_full_path }}">{% trans name %}</a>
+                            <a class="pf-c-button pf-m-tertiary pb-root-link" href="{{ href }}?back={{ request.get_full_path }}">{% trans name %}</a>
                         {% endfor %}
                     </td>
                 </tr>
diff --git a/passbook/admin/templates/administration/stage/list.html b/passbook/admin/templates/administration/stage/list.html
index abf9c36f6..f6efb6812 100644
--- a/passbook/admin/templates/administration/stage/list.html
+++ b/passbook/admin/templates/administration/stage/list.html
@@ -90,7 +90,7 @@
                         </pb-modal-button>
                         {% get_links stage as links %}
                         {% for name, href in links.items %}
-                        <a class="pf-c-button pf-m-tertiary" href="{{ href }}?back={{ request.get_full_path }}">{% trans name %}</a>
+                        <a class="pf-c-button pf-m-tertiary pb-root-link" href="{{ href }}?back={{ request.get_full_path }}">{% trans name %}</a>
                         {% endfor %}
                     </td>
                 </tr>
diff --git a/passbook/admin/templates/administration/stage_prompt/list.html b/passbook/admin/templates/administration/stage_prompt/list.html
index 332f2af0d..038cb6188 100644
--- a/passbook/admin/templates/administration/stage_prompt/list.html
+++ b/passbook/admin/templates/administration/stage_prompt/list.html
@@ -92,7 +92,7 @@
                         </pb-modal-button>
                         {% get_links prompt as links %}
                         {% for name, href in links.items %}
-                        <a class="pf-c-button pf-m-tertiary" href="{{ href }}?back={{ request.get_full_path }}">{% trans name %}</a>
+                        <a class="pf-c-button pf-m-tertiary pb-root-link" href="{{ href }}?back={{ request.get_full_path }}">{% trans name %}</a>
                         {% endfor %}
                     </td>
                 </tr>
diff --git a/passbook/admin/templates/administration/user/list.html b/passbook/admin/templates/administration/user/list.html
index 45ae6745f..9a6f075c4 100644
--- a/passbook/admin/templates/administration/user/list.html
+++ b/passbook/admin/templates/administration/user/list.html
@@ -63,7 +63,7 @@
                     <td>
                         <pb-modal-button href="{% url 'passbook_admin:user-update' pk=user.pk %}">
                             <button slot="trigger" class="pf-c-button pf-m-secondary">
-                                {% trans 'Update' %}
+                                {% trans 'Edit' %}
                             </button>
                             <div slot="modal"></div>
                         </pb-modal-button>
@@ -82,8 +82,8 @@
                             <div slot="modal"></div>
                         </pb-modal-button>
                         {% endif %}
-                        <a class="pf-c-button pf-m-tertiary" href="{% url 'passbook_admin:user-password-reset' pk=user.pk %}?back={{ request.get_full_path }}">{% trans 'Reset Password' %}</a>
-                        <a class="pf-c-button pf-m-tertiary" href="{% url 'passbook_core:impersonate-init' user_id=user.pk %}">{% trans 'Impersonate' %}</a>
+                        <a class="pf-c-button pf-m-tertiary pb-root-link" href="{% url 'passbook_admin:user-password-reset' pk=user.pk %}?back={{ request.get_full_path }}">{% trans 'Reset Password' %}</a>
+                        <a class="pf-c-button pf-m-tertiary pb-root-link" href="{% url 'passbook_core:impersonate-init' user_id=user.pk %}">{% trans 'Impersonate' %}</a>
                     </td>
                 </tr>
                 {% endfor %}
diff --git a/passbook/static/static/src/AdminSiteShell.ts b/passbook/static/static/src/AdminSiteShell.ts
index f7eb1d5c2..85cabe080 100644
--- a/passbook/static/static/src/AdminSiteShell.ts
+++ b/passbook/static/static/src/AdminSiteShell.ts
@@ -48,7 +48,7 @@ export class AdminSiteShell extends LitElement {
             this.querySelector("[slot=body]")!.innerHTML = t;
         }).then(() => {
             // Ensure anchors only change the hash
-            this.querySelectorAll("a").forEach(a => {
+            this.querySelectorAll<HTMLAnchorElement>("a:not(.pb-root-link)").forEach(a => {
                 if (a.href === "") {
                     return;
                 }