diff --git a/app/assets/stylesheets/filters.css b/app/assets/stylesheets/filters.css
index e76311dbb..d573e179b 100644
--- a/app/assets/stylesheets/filters.css
+++ b/app/assets/stylesheets/filters.css
@@ -1,7 +1,4 @@
 .filters {
-  position: absolute;
-  inset: auto auto -5.25em;
-
   #header:has(&) {
     position: relative;
     z-index: 1;
diff --git a/app/views/bubbles/_card.html.erb b/app/views/bubbles/_card.html.erb
index 3807f5238..177b84b39 100644
--- a/app/views/bubbles/_card.html.erb
+++ b/app/views/bubbles/_card.html.erb
@@ -39,7 +39,7 @@
     </footer>
 
     <div class="card__background">
-      <%= image_tag bubble.image.presence || "", size: 120, class: "borderless",data: { upload_preview_target: "image" } %>
+      <%= image_tag bubble.image.presence || "", size: 120, data: { upload_preview_target: "image" } %>
     </div>
 
     <% if bubble.popped? %>
diff --git a/app/views/filters/_dialog.html.erb b/app/views/filters/_dialog.html.erb
index 0cc954b20..68831f8a8 100644
--- a/app/views/filters/_dialog.html.erb
+++ b/app/views/filters/_dialog.html.erb
@@ -77,6 +77,95 @@
             </li>
           <% end %>
         </menu>
+
+        <% if workflow = Current.account.workflows.first %>
+          <menu class="filter__menu">
+            <li class="filter__label"><strong>In Stage</strong></li>
+            <% workflow.stages.each do |stage| %>
+              <li>
+                <%= label_tag "stage_ids_#{stage.id}", class: "btn filter__button" do %>
+                  <%= check_box_tag "stage_ids[]", stage.id, filter.stages.include?(stage), id: "stage_ids_#{stage.id}", hidden: true %>
+                  <span><%= stage.name %></span>
+                  <%= icon_tag "close" %>
+                <% end %>
+              </li>
+            <% end %>
+          </menu>
+        <% end %>
+
+        <% if (tags = Current.account.tags.order(:title)).any? %>
+          <div class="filter__menu" role="group" aria-label="Tagged">
+            <div class="filter__label"><strong>Tagged</strong></div>
+
+            <% tags.each do |tag| %>
+              <div>
+                <label class="btn filter__button">
+                  <%= check_box_tag "tag_ids[]", tag.id, filter.tags.include?(tag), class: "visually-hidden" %>
+                  <span><%= tag.hashtag %></span>
+                  <%= icon_tag "close" %>
+                </label>
+              </div>
+            <% end %>
+          </div>
+        <% end %>
+
+        <div class="filter__menu" role="group" aria-label="Assigned to…">
+          <div class="filter__label"><strong>Assigned to…</strong></div>
+
+          <div>
+            <label class="btn filter__button">
+              <%= check_box_tag "assignment_status", "unassigned", filter.assignment_status.unassigned?,
+                    class: "visually-hidden", data: {
+                      action: "filter-form#clearCategory", 
+                      filter_form_name_param: "assignee_ids[],assigner_ids[]" } %>
+              <span>No one</span>
+              <%= icon_tag "close" %>
+            </label>
+          </div>
+
+          <div>
+            <label class="btn filter__button">
+              <%= check_box_tag "assignee_ids[]", Current.user.id, filter.assignees.include?(Current.user),
+                    class: "visually-hidden",
+                    data: { action: "filter-form#clearCategory", filter_form_name_param: "assignment_status" } %>
+              <span>Me</span>
+              <%= icon_tag "close" %>
+            </label>
+          </div>
+
+          <% Current.account.users.active.without(Current.user).order(:name).each do |user| %>
+            <div>
+              <label class="btn filter__button">
+                <%= check_box_tag "assignee_ids[]", user.id, filter.assignees.include?(user), class: "visually-hidden",
+                      data: { action: "filter-form#clearCategory", filter_form_name_param: "assignment_status" } %>
+                <span><%= user.name %></span>
+                <%= icon_tag "close" %>
+              </label>
+            </div>
+          <% end %>
+        </div>
+
+        <div class="filter__menu" role="group" aria-label="Added by…">
+          <div class="filter__label"><strong>Added by…</strong></div>
+
+          <div>
+            <label class="btn filter__button">
+              <%= check_box_tag "creator_ids[]", Current.user.id, filter.creators.include?(Current.user),
+                    class: "visually-hidden" %>
+              <span>Me</span>
+              <%= icon_tag "close" %>
+            </label>
+          </div>
+
+          <% Current.account.users.active.without(Current.user).order(:name).each do |user| %>
+            <div>
+              <label class="btn filter__button">
+                <%= check_box_tag "creator_ids[]", user.id, filter.creators.include?(user), class: "visually-hidden" %>
+                <span><%= user.name %></span>
+                <%= icon_tag "close" %>
+              </label>
+            </div>
+          <% end %>
         </menu>
       </div>
     <% end %>
@@ -93,4 +182,4 @@
       <%= icon_tag "arrow-right" %>
     </button>
   </div>
-</dialog>
+</dialog>
\ No newline at end of file
diff --git a/app/views/filters/_settings.html.erb b/app/views/filters/_settings.html.erb
index e2de05157..e764fb7c8 100644
--- a/app/views/filters/_settings.html.erb
+++ b/app/views/filters/_settings.html.erb
@@ -1,26 +1,26 @@
 <div class="filters flex-inline align-center gap-half margin-block-end margin-block-start-half">
-  <button class="btn borderless txt-medium" data-action="click->dialog#toggle">
+  <button class="btn btn--plain txt-small" data-action="click->dialog#toggle">
     <%= icon_tag "filter" %>
     <span class="for-screen-reader">Filter</span>
   </button>
 
   <div class="flex-inline center align-center gap-half">
-    <%#= render "filters/buckets", filter: filter %>
-    <%#= render "filters/indexed_by", filter: filter %>
-    <%#= render "filters/stages", filter: filter %>
-    <%#= render "filters/tags", filter: filter %>
-    <%#= render "filters/assignees", filter: filter %>
-    <%#= render "filters/creators", filter: filter %>
+    <%= render "filters/buckets", filter: filter %>
+    <%= render "filters/indexed_by", filter: filter %>
+    <%= render "filters/stages", filter: filter %>
+    <%= render "filters/tags", filter: filter %>
+    <%= render "filters/assignees", filter: filter %>
+    <%= render "filters/creators", filter: filter %>
 
     <% filter.terms.each do |term| %>
-      <%#= filter_chip_tag %Q("#{term}"), filter.as_params_without(:terms, term) %>
+      <%= filter_chip_tag %Q("#{term}"), filter.as_params_without(:terms, term) %>
     <% end %>
 
     <% if any_filters?(filter) %>
-      <%= link_to bubbles_path, class: "btn btn--remove txt-small", hidden: true do %>
+      <%= link_to bubbles_path, class: "btn btn--remove txt-small" do %>
         <%= icon_tag "close" %>
         <span class="for-screen-reader">Clear all</span>
       <% end %>
     <% end %>
   </div>
-</div>
+</div>
\ No newline at end of file