diff --git a/app/layout.tsx b/app/layout.tsx
index ae26b1c7..df6a17b5 100644
--- a/app/layout.tsx
+++ b/app/layout.tsx
@@ -82,12 +82,13 @@ export default function RootLayout({
                 '3xl:mx-auto 3xl:w-[1280px]',
               )}>
                 <Nav siteDomainOrTitle={SITE_DOMAIN_OR_TITLE} />
-                <AdminBatchEditPanel />
+                <ShareModals />
                 <div className={clsx(
                   'min-h-[16rem] sm:min-h-[30rem]',
                   'mb-12',
+                  'space-y-5',
                 )}>
-                  <ShareModals />
+                  <AdminBatchEditPanel />
                   {children}
                 </div>
                 <Footer />
diff --git a/src/admin/AdminBatchEditPanelClient.tsx b/src/admin/AdminBatchEditPanelClient.tsx
index 6a20b791..4bc4304b 100644
--- a/src/admin/AdminBatchEditPanelClient.tsx
+++ b/src/admin/AdminBatchEditPanelClient.tsx
@@ -150,7 +150,7 @@ export default function AdminBatchEditPanelClient({
     selectedPhotoIds !== undefined
   )
     ? <SiteGrid
-      className="sticky top-0 z-10 mb-5 -mt-2 pt-2"
+      className="sticky top-0 z-10 -mt-2 pt-2"
       contentMain={<div className="flex flex-col gap-2">
         <Note
           color="gray"
diff --git a/src/components/Container.tsx b/src/components/Container.tsx
index b2db8062..48bbf7b7 100644
--- a/src/components/Container.tsx
+++ b/src/components/Container.tsx
@@ -25,23 +25,19 @@ export default function Container({
     switch (color) {
     case 'gray': return [
       'text-medium',
-      'bg-gray-50 dark:bg-gray-900/40',
-      'border-medium',
+      'bg-dim',
     ];
     case 'blue': return [
       'text-blue-900 dark:text-blue-300',
       'bg-blue-100/35 dark:bg-blue-950/60',
-      'border-transparent',
     ];
     case 'red': return [
       'text-red-700 dark:text-red-400',
       'bg-red-100/50 dark:bg-red-950/55',
-      'border-transparent',
     ];
     case 'yellow': return [
       'text-amber-700 dark:text-amber-500',
       'bg-amber-100/55 dark:bg-amber-950/55',
-      'border-transparent',
     ];
     }
   };
@@ -59,7 +55,7 @@ export default function Container({
   return (
     <div className={clsx(
       'flex flex-col items-center justify-center',
-      'rounded-lg border',
+      'rounded-lg',
       ...getColorClasses(),
       getPaddingClasses(),
       className,
diff --git a/src/state/AppStateProvider.tsx b/src/state/AppStateProvider.tsx
index 83452742..bfb2f658 100644
--- a/src/state/AppStateProvider.tsx
+++ b/src/state/AppStateProvider.tsx
@@ -99,7 +99,7 @@ export default function AppStateProvider({
   const { data: adminData, error: adminError } = useSWR(
     isUserSignedIn ? 'getAdminData' : null,
     getAdminDataAction, {
-      refreshInterval: 1000 * 60 * 5,
+      refreshInterval: 1000 * 60,
     },
   );