diff --git a/src/lib/element_access_type.svelte b/src/lib/element_access_type.svelte
index ff87abd6..6c47da26 100644
--- a/src/lib/element_access_type.svelte
+++ b/src/lib/element_access_type.svelte
@@ -324,7 +324,7 @@ function handle_clear_access() {
                     $ae_loc.edit_mode = false;
                     // dispatch_edit_mode_changed();
                 }}
-                class="btn btn-sm variant-ghost-success hover:variant-filled-success transition-all"
+                class="btn btn-sm px-2 variant-ghost-success hover:variant-filled-success transition-all"
                 title="Edit mode is currently enabled. Click to disable."
                 >
                 <span class="fas fa-toggle-on mx-1"></span>
@@ -337,11 +337,14 @@ function handle_clear_access() {
                     $ae_loc.edit_mode = true;
                     // dispatch_edit_mode_changed();
                 }}
-                class="btn btn-sm variant-ghost-warning hover:variant-filled-warning transition-all"
+                class="btn btn-sm px-2 variant-ghost-warning hover:variant-filled-warning transition-all space-x-1 *:hover:inline"
                 title="Edit mode is currently disabled. Click to enable."
                 >
                 <span class="fas fa-toggle-off mx-1"></span>
-                Edit Mode?
+                Edit
+                <span class="hidden">
+                    Mode?
+                </span>
             </button>
         {/if}
     {/if}
diff --git a/src/routes/+layout.svelte b/src/routes/+layout.svelte
index 59e14e32..183c50f9 100644
--- a/src/routes/+layout.svelte
+++ b/src/routes/+layout.svelte
@@ -486,7 +486,8 @@ max-w-max -->
         flex flex-col
         items-end justify-center
         gap-1
-        absolute right-0 bottom-10
+        absolute right-0 bottom-16
+        hover:bottom-6
         bg-white dark:bg-gray-800
         border border-transparent
         hover:border hover:border-gray-200 hover:dark:border-gray-700
@@ -495,7 +496,7 @@ max-w-max -->
         *:hover:inline
         opacity-40
         hover:opacity-100
-        duration-100 delay-1000 hover:delay-100 hover:ease-out
+        duration-50 delay-1000 hover:delay-100 hover:ease-out
         transition hover:transition-all
     "
     class:hidden={!$ae_loc?.app_cfg?.show_element__menu_btn}
@@ -516,7 +517,7 @@ max-w-max -->
                 $ae_loc.edit_mode = false;
                 // dispatch_edit_mode_changed();
             }}
-            class="btn btn-sm variant-ghost-success hover:variant-filled-success transition-all *:hidden:inline-block"
+            class="btn btn-md px-2 variant-ghost-success hover:variant-filled-success transition-all *:hover:inline-block"
             title="Edit mode is currently enabled. Click to disable."
             >
             <span class="fas fa-toggle-on mx-1"></span>
@@ -532,11 +533,14 @@ max-w-max -->
                 $ae_loc.edit_mode = true;
                 // dispatch_edit_mode_changed();
             }}
-            class="btn btn-sm variant-ghost-warning hover:variant-filled-warning transition-all"
+            class="btn btn-md px-2 variant-ghost-warning hover:variant-filled-warning transition-all space-x-0 *:hover:inline"
             title="Edit mode is currently disabled. Click to enable."
             >
             <span class="fas fa-toggle-off mx-1"></span>
-            Edit Mode?
+            <span class="">Edit</span>
+            <span class="hidden">
+                Mode?
+            </span>
         </button>
     {/if}
 
@@ -623,7 +627,7 @@ max-w-max -->
 
     <button
         type="button"
-        class="btn btn-sm variant-outline-surface hover:variant-ghost-success *:hover:inline-block w-full hidden"
+        class="btn btn-sm variant-outline-surface hover:variant-ghost-success *:hover:inline-block w-full hidden px-6 py-1"
         title="Sign In"
         onclick={() => {
             if ($ae_loc?.app_cfg?.show_element__menu_btn) {
@@ -637,12 +641,12 @@ max-w-max -->
         }}
         >
         {#if $ae_loc?.app_cfg?.show_element__menu}
-            <CircleX class="mx-1 inline-block" />
+            <CircleX class="inline-block" />
             <!-- <span class="hidden"> -->
                 Hide Menu
             <!-- </span> -->
         {:else}
-            <Menu class="mx-1 inline-block" />
+            <Menu class="inline-block" />
             <span class="hidden">
                 Menu
             </span>
@@ -703,7 +707,7 @@ max-w-max -->
 
     <button
         type="button"
-        class="btn btn-sm variant-outline-surface hover:variant-ghost-warning *:hover:inline w-full"
+        class="btn btn-sm variant-outline-surface hover:variant-ghost-warning *:hover:inline w-full px-6 py-1"
         title="Sign In"
         onclick={() => {
             if ($ae_loc?.app_cfg?.show_element__menu_btn) {