diff --git a/jwql/website/apps/jwql/static/js/jwql.js b/jwql/website/apps/jwql/static/js/jwql.js
index 754908929..96896f4c3 100644
--- a/jwql/website/apps/jwql/static/js/jwql.js
+++ b/jwql/website/apps/jwql/static/js/jwql.js
@@ -1257,7 +1257,7 @@ function update_header_display(extension, num_extensions) {
  */
 function update_obs_options(data, inst, prop, observation) {
     // Build div content
-    var content = 'Available observations:';
+    var content = 'Available obs:';
     content += '<div class="dropdown">';
     content += '<button class="btn btn-primary dropdown-toggle" type="button" id="obs_dropdownMenuButton" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false">Obs' + observation + '</button>';
     content += '<div class="dropdown-menu" aria-labelledby="dropdownMenuButton">';
diff --git a/jwql/website/apps/jwql/templates/query_submit.html b/jwql/website/apps/jwql/templates/query_submit.html
index 585e55111..d10162b4f 100644
--- a/jwql/website/apps/jwql/templates/query_submit.html
+++ b/jwql/website/apps/jwql/templates/query_submit.html
@@ -29,10 +29,12 @@ <h3 id='title'>Images of Queried Instruments</h3>
     	<!-- Filter and sort options -->
 		<div class="d-flex flex-row">
 			<div class="mr-4" id="thumbnail-filter"></div>
-			<div class="mx-4" id="thumbnail-sort"></div>
-            <div class="mx-4 mr-5 ml-auto" id="group-by-exposure"></div>
 		</div>
-
+        <hr>
+        <div class="d-flex flex-row">
+            <div class="mr-4" id="thumbnail-sort"></div>
+            <div class="mr-4" id="group-by-exposure"></div>
+        </div>
 		<hr>
 
         <!-- Loading animation -->
diff --git a/jwql/website/apps/jwql/templates/thumbnails_per_obs.html b/jwql/website/apps/jwql/templates/thumbnails_per_obs.html
index 84e0bc540..6a3fe80bf 100644
--- a/jwql/website/apps/jwql/templates/thumbnails_per_obs.html
+++ b/jwql/website/apps/jwql/templates/thumbnails_per_obs.html
@@ -28,9 +28,12 @@ <h3 id='title'>{{ inst }} Images</h3>
     	<!-- Filter and sort options -->
 		<div class="d-flex flex-row">
             <div class="mr-4" id="thumbnail-filter"></div>
-            <div class="mx-4" id="obs-list"></div>
-            <div class="mx-4" id="thumbnail-sort"></div>
-            <div class="mx-4 mr-5 ml-auto" id="group-by-exposure"></div>
+        </div>
+        <hr>
+        <div class="d-flex flex-row">
+            <div class="mr-4" id="obs-list"></div>
+            <div class="mr-4" id="thumbnail-sort"></div>
+            <div class="mr-4" id="group-by-exposure"></div>
 		</div>
 
         <hr>
@@ -88,8 +91,8 @@ <h4 id='proposal_meta'> Proposal Information for {{ prop }}</h4>
                 {% endif %}
             </span>
         </div>
-    
+
     </main>
 	<script>update_thumbnails_per_observation_page('{{ inst }}', '{{ prop }}', '{{ obs }}', '{{ base_url }}', '{{ sort }}', '{{ group }}');</script>
-    
+
 {% endblock %}