diff --git a/files/templates/comments.html b/files/templates/comments.html
index 793ec7d87..1e9123b3e 100644
--- a/files/templates/comments.html
+++ b/files/templates/comments.html
@@ -26,30 +26,21 @@
 		
 		<div class="comment-body">
 				<div id="comment-{{c.id}}-only" class="comment-{{c.id}}-only"></div>
-	{% if render_replies %} 
-		{% if level <= RENDER_DEPTH_LIMIT - 1 %}
-			<div id="replies-of-{{c.id}}" class="">
-				{% set standalone=False %}
+	{% if render_replies %}
+		<div id="replies-of-{{c.id}}" class="{% if replies and is_notification_page %}d-none d-md-block{% endif %}">
+			{% if level <= RENDER_DEPTH_LIMIT - 1 %}
+				{% set standalone=false %}
 				{% for reply in replies %}
 					{{single_comment(reply, level=level+1)}}
 				{% endfor %}
+			{% endif %}
+		</div>
+		{% if replies and level >= RENDER_DEPTH_LIMIT -%}
+			<div id="morecomment-{{c.id}}" class="{% if is_notification_page %}d-md-none {% endif %}mt-2 more-comments">
+				{% if not is_notification_page %}<button id="btn-{{c.id}}" class="d-none d-md-block btn btn-primary" onclick="morecomments('{{c.id}}')">More comments ({{c.descendant_count}})</button>{% endif %}
+				<a {% if not is_notification_page %}class="d-md-none" {% endif %}href="{{c.morecomments}}">More comments <i class="fas fa-long-arrow-right ml-1"></i></a>
 			</div>
-		{% elif replies and is_notification_page %}
-			<div id="replies-of-{{c.id}}" class="d-none d-md-block">
-				{% set standalone=False %}
-				{% for reply in replies %}
-					{{single_comment(reply, level=level+1)}}
-				{% endfor %}
-			</div>
-			<div id="morecomment-{{c.id}}" class="d-md-none mt-2 more-comments">
-				<a href="{{c.morecomments}}">More comments <i class="fas fa-long-arrow-right ml-1"></i></a>
-			</div>
-		{% elif replies %}
-			<div id="morecomment-{{c.id}}" class="mt-2 more-comments">
-				<button id="btn-{{c.id}}" class="d-none d-md-block btn btn-primary" onclick="morecomments('{{c.id}}')">More comments ({{c.descendant_count}})</button>
-				<a class="d-md-none" href="{{c.morecomments}}">More comments <i class="fas fa-long-arrow-right ml-1"></i></a>
-			</div>
-		{% endif %}
+		{%- endif %}
 	{% endif %}
 		</div>
 </div>