diff --git a/files/templates/submission_listing.html b/files/templates/submission_listing.html
index 048c70fd5..bf897986a 100644
--- a/files/templates/submission_listing.html
+++ b/files/templates/submission_listing.html
@@ -251,23 +251,9 @@
 		</div>
 	{% endif %}
 {% endif %}
-
 </div>
-
 {% else %}
-
-{% if request.path.endswith('/admin/queue') %}
-
-<div class="row no-gutters">	
-	<div class="col">			
-		<div class="text-center py-7">
-			<h4 class="p-2">This queue is empty. (That's a good thing.)</h4>
-		</div>			
-	</div>	
-</div>
-
-
-{% elif u %}
+{% if u %}
 {% if v and v.id == u.id %}
 <div class="row no-gutters">	
 	<div class="col">			
@@ -282,8 +268,6 @@
 		</div>			
 	</div>	
 </div>
-
-
 {% else %}
 <div class="row no-gutters">	
 	<div class="col">			
@@ -302,7 +286,7 @@
 {% elif request.path != '/notifications/posts' %}
 <div class="row no-gutters">	
 	<div class="col">
-		{% if request.path.startswith('/search') and error %}{{macros.ghost_box(error, '', 1)}}{% endif %}
+		{{macros.ghost_box(error if request.path.startswith('/search') else '', '', 1)}}{% endif %}
 	</div>	
 </div>
 
diff --git a/files/templates/util/macros.html b/files/templates/util/macros.html
index b080fef01..f509d298a 100644
--- a/files/templates/util/macros.html
+++ b/files/templates/util/macros.html
@@ -162,7 +162,7 @@
 {% macro ghost_box(text1, text2, mode, extra_css) %}
 {# TODO: use in saved (search for "fa-ghost" in source) #}
 {% if mode == 1 %}
-<div class="text-center py-7"{% if extra_css %} style="{{extra_css}}"{% endif %}>
+<div class="text-center py-7 ghost-town-box ghost-town-box-1"{% if extra_css %} style="{{extra_css}}"{% endif %}>
 	<span class="fa-stack fa-2x text-muted mb-4">
 		<i class="fas fa-square text-gray-500 opacity-25 fa-stack-2x"></i>
 		<i class="fas text-gray-500 fa-ghost fa-stack-1x text-lg"></i>
@@ -173,15 +173,10 @@
 	{% endif %}
 	{% if text2 %}
 	<p class="text-muted">{{text2|safe}}</p>
-	{% if v %}
-	<p class="text-muted">This comment section is a ghost town...</p>
-	{% else %}
-	<p class="text-muted">This comment section is a ghost town. <a href="/login?redirect={{request.full_path | urlencode}}">Sign in</a></p>
-	{% endif %}
 	{% endif %}
 </div>
 {% elif mode == 2 %}
-<div class="text-center border-md rounded py-7"{% if extra_css %} style="{{extra_css}}"{% endif %}>
+<div class="text-center border-md rounded py-7 ghost-town-box ghost-town-box-2"{% if extra_css %} style="{{extra_css}}"{% endif %}>
 	<i class="fas fa-ghost text-gray-500 mb-3" style="font-size: 3.5rem;"></i>
 	<p class="font-weight-bold text-gray-500 mb-0">{{text1|safe}}</p>
 </div>