diff --git a/files/templates/award_modal.html b/files/templates/award_modal.html
index 5f5a17a8d..c2d2ff91d 100644
--- a/files/templates/award_modal.html
+++ b/files/templates/award_modal.html
@@ -1,5 +1,7 @@
 <script src='/assets/js/bundle.js'></script>
 
+<div class="d-none" id="awards">{{awards}}</div>
+
 <input type="hidden" id="awardTarget" value="" />
 <div class="modal fade" id="awardModal" tabindex="-1" role="dialog" aria-labelledby="awardModalTitle" aria-hidden="true">
 </div>
diff --git a/files/templates/comments.html b/files/templates/comments.html
index b0f0053c7..e4cfe158e 100644
--- a/files/templates/comments.html
+++ b/files/templates/comments.html
@@ -9,7 +9,6 @@
 {% set ups=c.upvotes %}
 {% set downs=c.downvotes %}
 {% set score=ups-downs %}
-{% include "emoji_modal.html" %}
 
 {% if v and v.shadowbanned %}
 	{% set replies=c.replies3 %}
@@ -527,4 +526,12 @@
 	</div>
 </div>
 
+{% if v %}
+	{% include "gif_modal.html" %}
+	{% include "emoji_modal.html" %}
+	{% include "award_modal.html" %}
+	{% include "delete_comment_modal.html" %}
+{% endif %}
+{% include "expanded_image_modal.html" %}
+{% include "flag_comment_modal.html" %}
 </body>
\ No newline at end of file
diff --git a/files/templates/default.html b/files/templates/default.html
index 8647c9751..82566c6ad 100644
--- a/files/templates/default.html
+++ b/files/templates/default.html
@@ -1297,7 +1297,7 @@
 </div>
 
 {% block mobilenavbar %}
-{% include "mobile_navigation_bar.html" %}
+	{% include "mobile_navigation_bar.html" %}
 {% endblock %}
 
 {% block actionsModal %}
@@ -1337,17 +1337,6 @@
 	</div>
 </div>
 
-{% if v %}
-{% include "award_modal.html" %}
-{% include "flag_post_modal.html" %}
-{% include "flag_comment_modal.html" %}
-{% include "gif_modal.html" %}
-{% include "delete_comment_modal.html" %}
-{% include "delete_post_modal.html" %}
-{% endif %}
-
-{% include "expanded_image_modal.html" %}
-
 <script src="/assets/js/general26.js"></script>
 
 <!-- ClipboardJS -->
diff --git a/files/templates/submission.html b/files/templates/submission.html
index 4b6ef7b45..83767f63e 100644
--- a/files/templates/submission.html
+++ b/files/templates/submission.html
@@ -669,7 +669,7 @@
 	{% if p.replies %}
 	<div class="comment-section">
 	{% with comments=p.replies %}
-	{% include "comments.html" %}
+		{% include "comments.html" %}
 	{% endwith %}
  </div>
  {% elif not p.replies and p.deleted_utc == 0 %}
@@ -692,11 +692,9 @@
 </div>
 
 {% if v and v.id==p.author_id %}
-{% include "delete_post_modal.html" %}
+	{% include "delete_post_modal.html" %}
 {% endif %}
 
-{% include "delete_comment_modal.html" %}
-
 
 {% endblock %}
 
@@ -709,8 +707,8 @@
 {% endblock %}
 
 {% block GIFpicker %}
-{% if v %}
-{% include "gif_modal.html" %}
-{% include "emoji_modal.html" %}
-{% endif %}
-{% endblock %}
+	{% if v %}
+		{% include "award_modal.html" %}
+	{% endif %}
+	{% include "expanded_image_modal.html" %}
+{% endblock %}
\ No newline at end of file
diff --git a/files/templates/submission_listing.html b/files/templates/submission_listing.html
index 0652025ca..9c09dcb45 100644
--- a/files/templates/submission_listing.html
+++ b/files/templates/submission_listing.html
@@ -496,4 +496,9 @@
 
 {% endfor %}
 
-{% include "delete_post_modal.html" %}
\ No newline at end of file
+{% if v %}
+	{% include "award_modal.html" %}
+	{% include "delete_post_modal.html" %}
+{% endif %}
+{% include "expanded_image_modal.html" %}
+{% include "flag_post_modal.html" %}
\ No newline at end of file