diff --git a/stylesheets/style.css b/stylesheets/style.css
index ef1abf8b..cd2e931b 100644
--- a/stylesheets/style.css
+++ b/stylesheets/style.css
@@ -620,6 +620,10 @@ pre {
   margin: 0;
 }
 
+.theme-catalog .controls > span {
+  margin-right: 1em;
+}
+
 .theme-catalog div.thread img {
   float: none!important;
   margin: auto;
@@ -629,13 +633,20 @@ pre {
   border: 2px solid rgba(153,153,153,0);
 }
 
+/* Still for the catalog theme */
+#Grid {
+  display: flex;
+  flex-wrap: wrap;
+  justify-content: center;
+  align-content: center;
+  gap: 0.2em;
+}
+
 .theme-catalog div.thread {
   display: inline-block;
   vertical-align: top;
   text-align: center;
   font-weight: normal;
-  margin-top: 2px;
-  margin-bottom: 2px;
   padding: 2px;
   height: 300px;
   width: 205px;
@@ -653,7 +664,6 @@ pre {
 
 .theme-catalog div.threads {
   text-align: center;
-  margin-left: -20px;
 }
 
 .theme-catalog div.thread:hover {
diff --git a/templates/themes/catalog/catalog.html b/templates/themes/catalog/catalog.html
index 62ca7147..0dd3fdd3 100644
--- a/templates/themes/catalog/catalog.html
+++ b/templates/themes/catalog/catalog.html
@@ -19,20 +19,24 @@
 		</div>
 	</header>
 
-	<span>{% trans 'Sort by' %}: </span>
-	<select id="sort_by" style="display: inline-block">
-		<option selected value="bump:desc">{% trans 'Bump order' %}</option>
-		<option value="time:desc">{% trans 'Creation date' %}</option>
-		<option value="reply:desc">{% trans 'Reply count' %}</option>
-		<option value="random:desc">{% trans 'Random' %}</option>
-	</select>
+	<span>
+		<span>{% trans 'Sort by' %}: </span>
+		<select id="sort_by" style="display: inline-block">
+			<option selected value="bump:desc">{% trans 'Bump order' %}</option>
+			<option value="time:desc">{% trans 'Creation date' %}</option>
+			<option value="reply:desc">{% trans 'Reply count' %}</option>
+			<option value="random:desc">{% trans 'Random' %}</option>
+		</select>
+	</span>
 
-	<span>{% trans 'Image size' %}: </span>
-	<select id="image_size" style="display: inline-block">
-		<option value="vsmall">{% trans 'Very small' %}</option>
-		<option selected value="small">{% trans 'Small' %}</option>
-		<option value="large">{% trans 'Large' %}</option>
-	</select>
+	<span>
+		<span>{% trans 'Image size' %}: </span>
+		<select id="image_size" style="display: inline-block">
+			<option value="vsmall">{% trans 'Very small' %}</option>
+			<option selected value="small">{% trans 'Small' %}</option>
+			<option value="large">{% trans 'Large' %}</option>
+		</select>
+	</span>
 	<div class="threads">
 		<div id="Grid">
 		{% for post in recent_posts %}