diff --git a/magprime/forms.py b/magprime/forms.py
index dc61073..ef9ad4c 100644
--- a/magprime/forms.py
+++ b/magprime/forms.py
@@ -114,7 +114,7 @@ class BadgeExtras:
         ], widget=NumberInputWithChoices(choices=c.SUPERSTAR_DONATION_OPTS))
     
     def extra_donation_label(self):
-        return Markup("Superstar Donation ({})".format(popup_link("../static_views/givingExtra.html", "Learn more")))
+        return Markup("Superstar Donation ({})".format(popup_link("https://super.magfest.org/superstars", "Learn more")))
 
 @MagForm.form_mixin
 class AdminBadgeExtras:
diff --git a/magprime/templates/forms/attendee/badge_extras.html b/magprime/templates/forms/attendee/badge_extras.html
index 58cb2f2..86a2bdf 100644
--- a/magprime/templates/forms/attendee/badge_extras.html
+++ b/magprime/templates/forms/attendee/badge_extras.html
@@ -1,37 +1,46 @@
 {% extends 'uber/templates/forms/attendee/badge_extras.html' %}
 
 {% block donation %}
-<div class="row g-sm-3">
-    {% if not admin_area and c.BEFORE_SUPERSTAR_DEADLINE %}
+{% set show_full_desc = not admin_area and (not receipt or upgrade_modal) %}
+
+{% if show_full_desc and c.BEFORE_SUPERSTAR_DEADLINE %}
+  <div class="row g-sm-3">
+  <div class="col-12">
+      <a href="https://super.magfest.org/superstars" target="_blank">
+          <img src="../static/images/superstar.png" width="100%" alt="Become a Superstar" />
+      </a>
+  </div>
+  </div>
+{% endif %}
+  {% if show_full_desc %}
+  <div class="row g-sm-3">
+    <div class="col-12">{{ form_macros.form_input(badge_extras.extra_donation, id=id_upgrade_prepend ~ "extra_donation") }}</div>
+  </div>
+  <div class="row g-sm-3">
     <div class="col-12">
-        <a href="https://super.magfest.org/superstars" target="_blank">
-            <img src="../static/images/superstar.png" width="100%" alt="Become a Superstar" />
-        </a>
-    </div>
-    {% endif %}
-    <div class="col-12{% if receipt and not upgrade_modal and not admin_area %} col-sm-10{% endif %}">{{ form_macros.form_input(badge_extras.extra_donation, id=id_upgrade_prepend ~ "extra_donation") }}</div>
-    {% if receipt and not upgrade_modal and not admin_area %}
-        <div class="col-12 col-sm-2">
-            <div class="form-text">&nbsp;</div>{{ macros.upgrade_button('extra-donation', extra_classes="") }}</div>
-    {% endif %}
-    {% if not admin_area %}
-    <div class="col-12 mt-0">
-        {% if c.BEFORE_SUPERSTAR_DEADLINE %}
-          <p>Donate to MAGFest and <a href="https://super.magfest.org/superstars" target="_blank">become a Superstar</a>!
-            With a donation of $30 or more, you'll be listed as a Superstar donor on our website, have your name and 
-            pet appear on the at-event Jumbotron, gain an exclusive Superstar role on our Discord server, and more.</p>
-          
-          <p>Feeling even more generous or want additional info? Check out our expanded tiers and benefits
-          (including sponsoring your own Graffiti Banner) on our Superstar page above.</p>
-        {% else %}
-          <p>The deadline for <a href="https://super.magfest.org/superstars" target="_blank">becoming a Superstar</a>
-            has passed, but we always appreciate any extra donations!</p>
-        {% endif %}
+      {% if c.BEFORE_SUPERSTAR_DEADLINE %}
+        <p>Donate to MAGFest and <a href="https://super.magfest.org/superstars" target="_blank">become a Superstar</a>!
+          With a donation of $30 or more, you'll be listed as a Superstar donor on our website, have your name and 
+          pet appear on the at-event Jumbotron, gain an exclusive Superstar role on our Discord server, and more.</p>
+        
+        <p>Feeling even more generous or want additional info? Check out our expanded tiers and benefits
+        (including sponsoring your own Graffiti Banner) on our Superstar page above.</p>
+      {% else %}
+        <p>The deadline for <a href="https://super.magfest.org/superstars" target="_blank">becoming a Superstar</a>
+          has passed, but we always appreciate any extra donations!</p>
+      {% endif %}
 
-          <p><strong>Donations are not merch packages and do not come with merchandise.</strong>
-          MAGFest, Inc. is a 501(c)(3) charitable organization, so your donation is tax-deductible. 
-          For more information, please contact {{ "accounting@magfest.org"|email_to_link }}.</p>
+        <p><strong>Donations are not merch packages and do not come with merchandise.</strong>
+        MAGFest, Inc. is a 501(c)(3) charitable organization, so your donation is tax-deductible. 
+        For more information, please contact {{ "accounting@magfest.org"|email_to_link }}.</p>
+    </div>
+  </div>
+  {% else %}
+  <div class="row g-sm-3">
+    <div class="col-12 col-sm-6 mb-3">
+      <div class="form-text">{{ badge_extras.extra_donation.label.text }}</div>
+      <div class="form-control-plaintext h5">{{ attendee.extra_donation|format_currency }} {{ macros.upgrade_button('extra-donation') }}</div>
     </div>
-    {% endif %}
-</div>
+  </div>
+  {% endif %}
 {% endblock %}
\ No newline at end of file