diff --git a/files/templates/submission.html b/files/templates/submission.html
index 1811cd738e..91568bcc8f 100644
--- a/files/templates/submission.html
+++ b/files/templates/submission.html
@@ -151,44 +151,6 @@
 
 {% block pagetype %}thread{% endblock %}
 
-{% block actionsModal %}
-
-<div style="display:none" id="popover-{{p.id}}">
-	<div class="popover-user-profile" role="tooltip">
-		<img class="w-100 h-64 object-cover" src="{{p.author.banner_url}}">
-		<div class="d-flex align-items-end px-3 mt-n6 mb-3">
-			<img class="avatar-72 rounded img-thumbnail shadow-sm" src="{{p.author.profile_url}}">
-			<div class="px-3 text-truncate">
-				<h5 class="text-truncate text-black">{{p.author.username}}</h5>
-			</div>
-		</div>
-		<div class="px-3">
-			<span class="popover-bio text-black">{% if p.author.bio_html %}{{p.author.bio_html_eager | safe}}{% endif %}</span>
-		</div>
-		<div class="border-top d-flex align-items-center p-3 gap-3 smol">
-			<span>
-				<strong class="text-black">{{p.author.post_count}}</strong>
-				<span class="text-black">posts</span>
-			</span>
-			<span class="ml-3">
-				<strong class="text-black">{{p.author.comment_count}}</strong>
-				<span class="text-black">comments</span>
-			</span>
-			<span class="ml-3">
-				<strong class="text-black">{{p.author.coins}}</strong>
-				<span class="text-black">coins</span>
-			</span>  
-			&nbsp;&nbsp;&nbsp;&nbsp;
-			<a {% if v %}href="{{p.author.url}}"{% else %}href="/logged_out{{p.author.url}}"{% endif %} target="_blank" class="ml-auto text-decoration-none">
-				View
-				<i class="fas fa-arrow-right fa-sm px-1"></i>
-			</a>
-		</div>
-	</div>
-</div>
-
-{% endblock %}
-
 {% block subHeader %}
 	<div class="relative max-w-screen-2xl mx-auto px-4 py-4 grid grid-cols-12 rounded-t">
 		<div class="absolute top-0 left-0 w-full h-full bg-gradient-to-t from-gray-300 to-gray-200 rounded-t sub-header-shadow"></div>
@@ -633,6 +595,11 @@
 			{% endif %}
 
 			{% if p.replies %}
+			<div class="comment-section px-2.5 md:px-0" id="comment-section">
+				{% with comments=p.replies %}
+				{% include "comments.html" %}
+				{% endwith %}
+			</div>
 			{% elif not p.replies and p.deleted_utc == 0 %}
 			<div class="comment-section px-2.5 md:px-0 text-center py-7">
 				<span class="fa-stack fa-2x text-muted mb-4">
@@ -648,6 +615,10 @@
 			</div>
 			{% endif %}
 
+			{% if offset %}
+				<script src="/assets/js/viewmore.js?v=7"></script>
+			{% endif %}
+
 	</div>
 
 	</div>