diff --git a/frontends/ycdl_flask/templates/channel.html b/frontends/ycdl_flask/templates/channel.html
index 472ad58..312efc4 100644
--- a/frontends/ycdl_flask/templates/channel.html
+++ b/frontends/ycdl_flask/templates/channel.html
@@ -14,9 +14,10 @@
 <style>
 .tabbed_container .tab
 {
+    display: grid;
+    grid-auto-flow: row;
+    grid-gap: 8px;
     padding: 8px;
-    display: flex;
-    flex-direction: column;
 }
 #video_cards
 {
@@ -169,7 +170,6 @@ https://stackoverflow.com/a/35153397
     <div><button class="refresh_button button_with_spinner" onclick="return refresh_channel_form(false);">Refresh new videos</button></div>
     <div><button class="refresh_button button_with_spinner" onclick="return refresh_channel_form(true);">Refresh everything</button></div>
 
-    <p><!-- spacer --></p>
     {% endif %}
 
     <div>View
@@ -188,8 +188,6 @@ https://stackoverflow.com/a/35153397
     {% endfor %}
     </div>
 
-    <p><!-- spacer --></p>
-
     <div>Sort by
     <a class="merge_params" href="?orderby=published">Date</a>
     <a class="merge_params" href="?orderby=duration">Duration</a>
@@ -197,8 +195,6 @@ https://stackoverflow.com/a/35153397
     <a class="merge_params" href="?orderby=random">Random</a>
     </div>
 
-    <p><!-- spacer --></p>
-
     <div id="video_cards">
         <center><input disabled class="enable_on_pageload" type="text" id="search_filter"/></center>
         <center><span id="search_filter_count">{{videos|length}}</span> items</center>
@@ -269,8 +265,6 @@ https://stackoverflow.com/a/35153397
         <span id="set_automark_spinner" class="hidden">Working...</span>
     </div>
 
-    <p><!-- spacer --></p>
-
     <button class="red_button button_with_confirm"
     data-prompt="Delete channel and all videos?"
     data-onclick="return delete_channel_form();"
diff --git a/frontends/ycdl_flask/templates/channels.html b/frontends/ycdl_flask/templates/channels.html
index 281c594..221ab35 100644
--- a/frontends/ycdl_flask/templates/channels.html
+++ b/frontends/ycdl_flask/templates/channels.html
@@ -12,10 +12,6 @@
     <script src="/static/js/spinner.js"></script>
 
 <style>
-#content_body
-{
-    grid-gap: unset;
-}
 #new_channel_textbox,
 #new_channel_button
 {