diff --git a/files/templates/submission.html b/files/templates/submission.html
index 0b87a36e62..b250d64500 100644
--- a/files/templates/submission.html
+++ b/files/templates/submission.html
@@ -36,38 +36,6 @@
{% endif %}
-{% if p.award_count("shit") %}
-
-{% set minbugs = 10*p.award_count("shit") if p.award_count("shit") < 3 else 20 %}
-{% set maxbugs = 20*p.award_count("shit") if p.award_count("shit") < 3 else 40 %}
-
-{% endif %}
-
-
-{% if p.award_count("fireflies") %}
-
-{% set minbugs = 10*p.award_count("fireflies") if p.award_count("fireflies") < 3 else 20 %}
-{% set maxbugs = 20*p.award_count("fireflies") if p.award_count("fireflies") < 3 else 40 %}
-
-{% endif %}
-
-
diff --git a/files/templates/submission/SubmissionAwards.html b/files/templates/submission/SubmissionAwards.html
index 49a23da0d2..0cd48fa4e8 100644
--- a/files/templates/submission/SubmissionAwards.html
+++ b/files/templates/submission/SubmissionAwards.html
@@ -1,9 +1,43 @@
-
+
{% if p.award_count("train") %}
{% include "/awards/Trains.html" %}
{% endif %}
+
+{% if p.award_count("shit") %}
+
+{% set minbugs = 10*p.award_count("shit") if p.award_count("shit") < 3 else 20 %}
+{% set maxbugs = 20*p.award_count("shit") if p.award_count("shit") < 3 else 40 %}
+
+{% endif %}
+
+
+{% if p.award_count("fireflies") %}
+
+{% set minbugs = 10*p.award_count("fireflies") if p.award_count("fireflies") < 3 else 20 %}
+{% set maxbugs = 20*p.award_count("fireflies") if p.award_count("fireflies") < 3 else 40 %}
+
+{% endif %}
+
+
+
{% if p.award_count("snow") %}
{% include "/awards/Christmas/Snow.html" %}
{% if p.award_count("snow") > 4 %}
@@ -12,11 +46,11 @@
{% endif %}
+
+
{% if p.award_count("snow") %}
-
{% set snowCount = p.award_count("snow") if p.award_count("snow") < 5 else 5 %}
-
-
{% endif %}
+
+
+{% if p.award_count("mariah") %}
+
+{% else %}
+
+{% endif %}