diff --git a/src/app.html b/src/app.html
index 23a069a2..290fdb5b 100644
--- a/src/app.html
+++ b/src/app.html
@@ -21,7 +21,8 @@
         %sveltekit.head%
     </head>
     <!-- h-full w-full overflow-auto -->
-    <body data-sveltekit-preload-data="hover" class="h-full w-full overflow-auto">
+    <!-- overflow-x-scroll -->
+    <body data-sveltekit-preload-data="hover" class="h-full w-full">
 
         <div style="display: contents" class="">%sveltekit.body%</div>
 
diff --git a/src/routes/events/+layout.svelte b/src/routes/events/+layout.svelte
index 10256bd1..9d377ff5 100644
--- a/src/routes/events/+layout.svelte
+++ b/src/routes/events/+layout.svelte
@@ -144,7 +144,7 @@ if (browser) {
     class:iframe={$ae_loc?.iframe}
     class="
         ae_events
-        h-full max-h-full max-w-full overflow-auto
+        min-h-full h-full min-w-full w-full overflow-auto container max-w-7xl
         flex flex-col gap-1
         m-auto
         bg-gray-50 dark:bg-gray-900
diff --git a/src/routes/events/[event_id]/presenter/ae_comp__event_presenter_obj_tbl.svelte b/src/routes/events/[event_id]/presenter/ae_comp__event_presenter_obj_tbl.svelte
index d7d3b7ed..3a835290 100644
--- a/src/routes/events/[event_id]/presenter/ae_comp__event_presenter_obj_tbl.svelte
+++ b/src/routes/events/[event_id]/presenter/ae_comp__event_presenter_obj_tbl.svelte
@@ -123,8 +123,10 @@ $effect(() => {
 
 
 <section
-
-    class="ae_comp event_presenter_obj_tbl {container_class_li}"
+    class:border-r-2={horiz_scroll_warning}
+    class:border-dashed={horiz_scroll_warning}
+    class:border-warning-900-100={horiz_scroll_warning}
+    class="ae_comp event_presenter_obj_tbl {container_class_li}  container overflow-auto max-w-screen"
     >
 
 {#if $lq__event_presenter_obj_li && $lq__event_presenter_obj_li?.length}
@@ -132,13 +134,10 @@ $effect(() => {
 <div
     bind:this={horiz_check_element}
     id="tbl_container"
-    class="space-y-2 pb-48"
-    class:border-r-2={horiz_scroll_warning}
-    class:border-dashed={horiz_scroll_warning}
-    class:border-warning-900-100={horiz_scroll_warning}
+    class="space-y-2 pb-8"
     >
 <header
-    class="flex flex-row gap-1 items-center justify-between"
+    class="flex flex-row flex-wrap gap-1 items-center justify-between"
     >
     <h2 class="h3">
         <span class="text-base">
@@ -157,7 +156,7 @@ $effect(() => {
     </h2>
 
     <div
-        class="flex flex-row gap-1 items-center justify-end"
+        class="flex flex-row flex-wrap gap-1 items-center justify-end"
         class:hidden={!$ae_loc.edit_mode}
         >
     <button
diff --git a/src/routes/events/ae_comp__event_file_obj_tbl.svelte b/src/routes/events/ae_comp__event_file_obj_tbl.svelte
index abcb2701..a28abe0a 100644
--- a/src/routes/events/ae_comp__event_file_obj_tbl.svelte
+++ b/src/routes/events/ae_comp__event_file_obj_tbl.svelte
@@ -77,7 +77,11 @@ $effect(() => {
 </script>
 
 
-<section class="ae_comp event_file_obj_tbl {container_class_li}">
+<section
+    class:border-r-2={horiz_scroll_warning}
+    class:border-dashed={horiz_scroll_warning}
+    class:border-warning-900-100={horiz_scroll_warning}
+    class="ae_comp event_file_obj_tbl {container_class_li} container overflow-auto max-w-screen">
 
 
 {#if event_file_id_random_li && $lq_kv__event_file_obj_li && $lq_kv__event_file_obj_li?.length > 0 && $lq_kv__event_file_obj_li?.length == event_file_id_random_li?.length}
@@ -85,10 +89,7 @@ $effect(() => {
 <div
     bind:this={horiz_check_element}
     id="tbl_container"
-    class="space-y-2 pb-48"
-    class:border-r-2={horiz_scroll_warning}
-    class:border-dashed={horiz_scroll_warning}
-    class:border-warning-900-100={horiz_scroll_warning}
+    class="space-y-2 pb-8"
     >
 <h2 class="h3">
     <span class="text-base">
diff --git a/src/routes/events/ae_comp__event_session_obj_tbl.svelte b/src/routes/events/ae_comp__event_session_obj_tbl.svelte
index 249fd21e..79da076e 100644
--- a/src/routes/events/ae_comp__event_session_obj_tbl.svelte
+++ b/src/routes/events/ae_comp__event_session_obj_tbl.svelte
@@ -52,7 +52,11 @@ $effect(() => {
 </script>
 
 
-<section class="ae_comp event_session_obj_tbl {container_class_li}">
+<section
+    class:border-r-2={horiz_scroll_warning}
+    class:border-dashed={horiz_scroll_warning}
+    class:border-warning-900-100={horiz_scroll_warning}
+    class="ae_comp event_session_obj_tbl {container_class_li} container overflow-auto max-w-screen">
 
 {#if $lq__event_session_obj_li && $lq__event_session_obj_li?.length}
 
@@ -60,9 +64,6 @@ $effect(() => {
     bind:this={horiz_check_element}
     id="tbl_container"
     class="space-y-2 pb-48"
-    class:border-r-2={horiz_scroll_warning}
-    class:border-dashed={horiz_scroll_warning}
-    class:border-warning-900-100={horiz_scroll_warning}
     >
 <h2 class="h3">
     <span class="text-base">
