diff --git a/app/views/layouts/public.html.erb b/app/views/layouts/public.html.erb
index 98c42de94..1373a87d5 100644
--- a/app/views/layouts/public.html.erb
+++ b/app/views/layouts/public.html.erb
@@ -11,6 +11,8 @@
           <strong class="txt-medium overflow-ellipsis margin-none">Fizzy</strong>
         <% end %>
       </nav>
+
+      <%= yield :header %>
     </header>
 
     <main id="main">
diff --git a/app/views/public/boards/show.html.erb b/app/views/public/boards/show.html.erb
index ae5b75912..f5585f5e9 100644
--- a/app/views/public/boards/show.html.erb
+++ b/app/views/public/boards/show.html.erb
@@ -13,8 +13,8 @@
 <% end %>
 
 <% content_for :header do %>
-  <h1 class="header__title">
-    <%= @page_title %>
+  <h1 class="header__title divider divider--fade full-width">
+    <span class="overflow-ellipsis"><%= @page_title %></span>
   </h1>
 <% end %>
 
diff --git a/app/views/public/boards/show/_closed.html.erb b/app/views/public/boards/show/_closed.html.erb
index 717f81324..e83f2eae0 100644
--- a/app/views/public/boards/show/_closed.html.erb
+++ b/app/views/public/boards/show/_closed.html.erb
@@ -3,7 +3,11 @@
   data-action="turbo:before-morph-attribute->collapsible-columns#preventToggle"
 >
 
-  <%= render "boards/show/expander", title: "Done", count: board.cards.closed.count, column_id: "closed-cards" %>
+  <div class="cards__transition-container">
+    <header class="cards__header">
+      <%= render "boards/show/expander", title: "Done", count: board.cards.closed.count, column_id: "closed-cards" %>
+    </header>
 
-  <%= column_frame_tag :closed_column, src: public_board_columns_closed_path(board.publication.key) %>
+    <%= column_frame_tag :closed_column, src: public_board_columns_closed_path(board.publication.key) %>
+  </div>
 </section>
diff --git a/app/views/public/boards/show/_column.html.erb b/app/views/public/boards/show/_column.html.erb
index 99e59de0d..ae6b515fd 100644
--- a/app/views/public/boards/show/_column.html.erb
+++ b/app/views/public/boards/show/_column.html.erb
@@ -4,7 +4,11 @@
   data-controller="clicker"
   data-action="turbo:before-morph-attribute->collapsible-columns#preventToggle"
 >
-  <%= render "boards/show/expander", title: column.name, count: column.cards.active.count, column_id: dom_id(column) %>
+  <div class="cards__transition-container">
+    <header class="cards__header">
+      <%= render "boards/show/expander", title: column.name, count: column.cards.active.count, column_id: dom_id(column) %>
+    </header>
 
-  <%= column_frame_tag dom_id(column, :cards), src: public_board_column_path(column.board.publication.key, column) %>
+    <%= column_frame_tag dom_id(column, :cards), src: public_board_column_path(column.board.publication.key, column) %>
+  </div>
 </section>
diff --git a/app/views/public/boards/show/_not_now.html.erb b/app/views/public/boards/show/_not_now.html.erb
index dad3ca0e4..f108596b2 100644
--- a/app/views/public/boards/show/_not_now.html.erb
+++ b/app/views/public/boards/show/_not_now.html.erb
@@ -3,7 +3,11 @@
   data-action="turbo:before-morph-attribute->collapsible-columns#preventToggle"
 >
 
-  <%= render "boards/show/expander", title: "Not Now", count: board.cards.postponed.count, column_id: "not-now" %>
+  <div class="cards__transition-container">
+    <header class="cards__header">
+      <%= render "boards/show/expander", title: "Not Now", count: board.cards.postponed.count, column_id: "not-now" %>
+    </header>
 
-  <%= column_frame_tag :not_now_column, src: public_board_columns_not_now_path(board.publication.key) %>
+    <%= column_frame_tag :not_now_column, src: public_board_columns_not_now_path(board.publication.key) %>
+  </div>
 </section>
diff --git a/app/views/public/cards/show.html.erb b/app/views/public/cards/show.html.erb
index b1201b1f3..2d12431a0 100644
--- a/app/views/public/cards/show.html.erb
+++ b/app/views/public/cards/show.html.erb
@@ -13,12 +13,14 @@
 <% end %>
 
 <% content_for :header do %>
-  <%= link_to published_board_url(@card.board), class: "header__title btn borderless txt-large", style: "--btn-padding: 0.25ch 1ch 0.25ch 0.75ch; view-transistion-name: card-board-title;", data: { controller: "hotkey", action: "keydown.esc@document->hotkey#click" } do %>
-    <span class="overflow-ellipsis">
-      &larr;
-      <strong class="font-black"><%= @card.board.name %></strong>
-    </span>
-  <% end %>
+  <div class="header__actions header__actions--start">
+    <%= link_to published_board_url(@card.board), class: "btn borderless txt-medium", style: "view-transistion-name: card-board-title;", data: { controller: "hotkey", action: "keydown.esc@document->hotkey#click" } do %>
+      <span class="overflow-ellipsis">
+        &larr;
+        <strong class="font-black"><%= @card.board.name %></strong>
+      </span>
+    <% end %>
+  </div>
 <% end %>
 
 <section id="<%= dom_id(@card, :card_container) %>"