diff --git a/lib/mv_web/components/core_components.ex b/lib/mv_web/components/core_components.ex
index 3f744c0..08133b5 100644
--- a/lib/mv_web/components/core_components.ex
+++ b/lib/mv_web/components/core_components.ex
@@ -368,61 +368,63 @@ defmodule MvWeb.CoreComponents do
       end
 
     ~H"""
-    <table class="table table-zebra">
-      <thead>
-        <tr>
-          <th :for={col <- @col}>{col[:label]}</th>
-          <th :for={dyn_col <- @dynamic_cols}>
-            <.live_component
-              module={MvWeb.Components.SortHeaderComponent}
-              id={:"sort_custom_field_#{dyn_col[:custom_field].id}"}
-              field={"custom_field_#{dyn_col[:custom_field].id}"}
-              label={dyn_col[:custom_field].name}
-              sort_field={@sort_field}
-              sort_order={@sort_order}
-            />
-          </th>
-          <th :if={@action != []}>
-            <span class="sr-only">{gettext("Actions")}</span>
-          </th>
-        </tr>
-      </thead>
-      <tbody id={@id} phx-update={is_struct(@rows, Phoenix.LiveView.LiveStream) && "stream"}>
-        <tr :for={row <- @rows} id={@row_id && @row_id.(row)}>
-          <td
-            :for={col <- @col}
-            phx-click={@row_click && @row_click.(row)}
-            class={["max-w-xs truncate", @row_click && "hover:cursor-pointer"]}
-          >
-            {render_slot(col, @row_item.(row))}
-          </td>
-          <td
-            :for={dyn_col <- @dynamic_cols}
-            phx-click={@row_click && @row_click.(row)}
-            class={["max-w-xs truncate", @row_click && "hover:cursor-pointer"]}
-          >
-            {if dyn_col[:render] do
-              rendered = dyn_col[:render].(@row_item.(row))
+    <div class="overflow-auto">
+      <table class="table table-zebra">
+        <thead>
+          <tr>
+            <th :for={col <- @col}>{col[:label]}</th>
+            <th :for={dyn_col <- @dynamic_cols}>
+              <.live_component
+                module={MvWeb.Components.SortHeaderComponent}
+                id={:"sort_custom_field_#{dyn_col[:custom_field].id}"}
+                field={"custom_field_#{dyn_col[:custom_field].id}"}
+                label={dyn_col[:custom_field].name}
+                sort_field={@sort_field}
+                sort_order={@sort_order}
+              />
+            </th>
+            <th :if={@action != []}>
+              <span class="sr-only">{gettext("Actions")}</span>
+            </th>
+          </tr>
+        </thead>
+        <tbody id={@id} phx-update={is_struct(@rows, Phoenix.LiveView.LiveStream) && "stream"}>
+          <tr :for={row <- @rows} id={@row_id && @row_id.(row)}>
+            <td
+              :for={col <- @col}
+              phx-click={@row_click && @row_click.(row)}
+              class={["max-w-xs truncate", @row_click && "hover:cursor-pointer"]}
+            >
+              {render_slot(col, @row_item.(row))}
+            </td>
+            <td
+              :for={dyn_col <- @dynamic_cols}
+              phx-click={@row_click && @row_click.(row)}
+              class={["max-w-xs truncate", @row_click && "hover:cursor-pointer"]}
+            >
+              {if dyn_col[:render] do
+                rendered = dyn_col[:render].(@row_item.(row))
 
-              if rendered == "" do
-                ""
+                if rendered == "" do
+                  ""
+                else
+                  rendered
+                end
               else
-                rendered
-              end
-            else
-              ""
-            end}
-          </td>
-          <td :if={@action != []} class="w-0 font-semibold">
-            <div class="flex gap-4">
-              <%= for action <- @action do %>
-                {render_slot(action, @row_item.(row))}
-              <% end %>
-            </div>
-          </td>
-        </tr>
-      </tbody>
-    </table>
+                ""
+              end}
+            </td>
+            <td :if={@action != []} class="w-0 font-semibold">
+              <div class="flex gap-4">
+                <%= for action <- @action do %>
+                  {render_slot(action, @row_item.(row))}
+                <% end %>
+              </div>
+            </td>
+          </tr>
+        </tbody>
+      </table>
+    </div>
     """
   end
 
diff --git a/lib/mv_web/live/components/sort_header_component.ex b/lib/mv_web/live/components/sort_header_component.ex
index b847308..3817d90 100644
--- a/lib/mv_web/live/components/sort_header_component.ex
+++ b/lib/mv_web/live/components/sort_header_component.ex
@@ -19,7 +19,7 @@ defmodule MvWeb.Components.SortHeaderComponent do
   @impl true
   def render(assigns) do
     ~H"""
-    <div class="tooltip" data-tip={aria_sort(@field, @sort_field, @sort_order)}>
+    <div class="tooltip tooltip-bottom" data-tip={aria_sort(@field, @sort_field, @sort_order)}>
       <button
         type="button"
         aria-label={aria_sort(@field, @sort_field, @sort_order)}