diff --git a/src/lib/components/columnSelector.svelte b/src/lib/components/columnSelector.svelte
index b666b3d20..6acd5b01f 100644
--- a/src/lib/components/columnSelector.svelte
+++ b/src/lib/components/columnSelector.svelte
@@ -195,16 +195,17 @@
                                 bind:value={search} />
 
                             <Layout.Stack
+                                gap="s"
                                 direction="row"
                                 alignItems="center"
                                 style="padding-block-end: 0.5rem">
-                                <Button icon extraCompact on:click={selectAll}>Select all</Button>
+                                <Button size="xs" icon extraCompact on:click={selectAll}>Select all</Button>
 
                                 <div style:height="1rem">
                                     <Divider vertical />
                                 </div>
 
-                                <Button icon extraCompact on:click={deselectAll}
+                                <Button size="xs" icon extraCompact on:click={deselectAll}
                                     >Deselect all</Button>
                             </Layout.Stack>
                         </Layout.Stack>
diff --git a/src/lib/components/customId.svelte b/src/lib/components/customId.svelte
index 37259a620..654df38cf 100644
--- a/src/lib/components/customId.svelte
+++ b/src/lib/components/customId.svelte
@@ -11,13 +11,15 @@
         name,
         id = $bindable(null),
         autofocus = true,
-        isProject = false
+        isProject = false,
+        required = true,
     }: {
         show: boolean;
         name: string;
         id: string;
         autofocus?: boolean;
         isProject?: boolean;
+        required?: boolean;
     } = $props();
 
     $effect(() => {
@@ -32,6 +34,8 @@
         if (show) {
             trackEvent(Click.ShowCustomIdClick);
         }
+
+        console.log(id);
     });
 </script>
 
@@ -59,7 +63,7 @@
             {#if isProject}
                 <InputProjectId on:input bind:value={id} {autofocus} />
             {:else}
-                <InputId required on:input bind:value={id} {autofocus} />
+                <InputId {required} on:input bind:value={id} {autofocus} />
             {/if}
         </Layout.Stack>
     </Card.Base>
diff --git a/src/routes/(console)/project-[region]-[project]/databases/database-[database]/+page.svelte b/src/routes/(console)/project-[region]-[project]/databases/database-[database]/+page.svelte
index 9dd9baecb..726438aca 100644
--- a/src/routes/(console)/project-[region]-[project]/databases/database-[database]/+page.svelte
+++ b/src/routes/(console)/project-[region]-[project]/databases/database-[database]/+page.svelte
@@ -35,8 +35,7 @@
                     ? `${base}/images/empty-database-dark.svg`
                     : `${base}/images/empty-database-light.svg`}>
                 <span slot="description">
-                    Create and manage structured data effortlessly, with the flexibility and control
-                    your app needs.
+                    Create, organize, and query structured data with Tables.
                 </span>
                 <span slot="actions">
                     <Button
diff --git a/src/routes/(console)/project-[region]-[project]/databases/database-[database]/collection-[collection]/+layout.svelte b/src/routes/(console)/project-[region]-[project]/databases/database-[database]/collection-[collection]/+layout.svelte
index 41eb50853..fbe3e5289 100644
--- a/src/routes/(console)/project-[region]-[project]/databases/database-[database]/collection-[collection]/+layout.svelte
+++ b/src/routes/(console)/project-[region]-[project]/databases/database-[database]/collection-[collection]/+layout.svelte
@@ -29,7 +29,8 @@
         databaseRowSheetOptions,
         randomDataModalState,
         reorderItems,
-        showCreateAttributeSheet
+        showCreateAttributeSheet,
+        spreadsheetLoading
     } from './store';
     import { addSubPanel, registerCommands, updateCommandGroupRanks } from '$lib/commandCenter';
     import CreateAttribute from './createAttribute.svelte';
@@ -48,6 +49,7 @@
     import { Button, Seekbar } from '$lib/elements/forms';
     import { generateFakeDocuments, generateAttributes } from '$lib/helpers/faker';
     import { addNotification } from '$lib/stores/notifications';
+    import { sleep } from '$lib/helpers/promises';
 
     let editDocument: EditDocument;
     let createAttribute: CreateAttribute;
@@ -216,6 +218,7 @@
     });
 
     async function createFakeData() {
+        $spreadsheetLoading = true;
         $randomDataModalState.show = false;
 
         let attributes = $collection.attributes;
@@ -233,7 +236,7 @@
                     type: 'error',
                     message: e.message
                 });
-
+                $spreadsheetLoading = false;
                 return;
             }
         }
@@ -256,6 +259,10 @@
                 message: e.message
             });
         }
+
+        /* api is too fast! */
+        await sleep(1250);
+        $spreadsheetLoading = false;
     }
 </script>
 
@@ -314,7 +321,7 @@
 </SideSheet>
 
 <Dialog title="Generate random data" bind:open={$randomDataModalState.show}>
-    <Layout.Stack gap="xl">
+    <Layout.Stack style="gap: 28px;">
         <Typography.Text>
             Select how many random records to generate for testing. This won't delete or replace
             your existing records.
diff --git a/src/routes/(console)/project-[region]-[project]/databases/database-[database]/collection-[collection]/attributes/deleteAttribute.svelte b/src/routes/(console)/project-[region]-[project]/databases/database-[database]/collection-[collection]/attributes/deleteAttribute.svelte
index 54b734d73..95b1a4148 100644
--- a/src/routes/(console)/project-[region]-[project]/databases/database-[database]/collection-[collection]/attributes/deleteAttribute.svelte
+++ b/src/routes/(console)/project-[region]-[project]/databases/database-[database]/collection-[collection]/attributes/deleteAttribute.svelte
@@ -52,7 +52,6 @@
             );
 
             trackEvent(Submit.AttributeDelete);
-            invalidate(Dependencies.COLLECTION);
             addNotification({
                 type: 'success',
                 message:
@@ -61,6 +60,7 @@
                         : `${selectedAttributes.length} attributes have been deleted`
             });
 
+            await invalidate(Dependencies.COLLECTION);
             showDelete = false;
             selectedAttribute = [];
         } catch (e) {
diff --git a/src/routes/(console)/project-[region]-[project]/databases/database-[database]/collection-[collection]/createAttribute.svelte b/src/routes/(console)/project-[region]-[project]/databases/database-[database]/collection-[collection]/createAttribute.svelte
index 1bf9a6f31..654ef91c2 100644
--- a/src/routes/(console)/project-[region]-[project]/databases/database-[database]/collection-[collection]/createAttribute.svelte
+++ b/src/routes/(console)/project-[region]-[project]/databases/database-[database]/collection-[collection]/createAttribute.svelte
@@ -137,6 +137,8 @@
     }
 
     $effect(() => {
+        columnId; /* silences lint check, variable not read */
+
         // correct view
         if (selectedOption) {
             $option = attributeOptions.find((option) => option.name === selectedOption);
diff --git a/src/routes/(console)/project-[region]-[project]/databases/database-[database]/collection-[collection]/layout/emptySheet.svelte b/src/routes/(console)/project-[region]-[project]/databases/database-[database]/collection-[collection]/layout/emptySheet.svelte
index dfe3d7a5b..08c589aef 100644
--- a/src/routes/(console)/project-[region]-[project]/databases/database-[database]/collection-[collection]/layout/emptySheet.svelte
+++ b/src/routes/(console)/project-[region]-[project]/databases/database-[database]/collection-[collection]/layout/emptySheet.svelte
@@ -12,6 +12,7 @@
     import { isSmallViewport } from '$lib/stores/viewport';
     import { SortButton } from '$lib/components';
     import type { Column } from '$lib/helpers/types';
+    import { spreadsheetLoading } from '../store';
 
     type Mode = 'records' | 'indexes';
 
@@ -114,7 +115,9 @@
         allowSelection
         emptyCells={12}
         height="fit-content"
-        columns={spreadsheetColumns}>
+        columns={spreadsheetColumns}
+        loading={$spreadsheetLoading}
+    >
         <svelte:fragment slot="header" let:root>
             {#each spreadsheetColumns as column (column.id)}
                 <Spreadsheet.Header.Cell {root} column={column.id} icon={column.icon ?? undefined}>
diff --git a/src/routes/(console)/project-[region]-[project]/databases/database-[database]/collection-[collection]/spreadsheet.svelte b/src/routes/(console)/project-[region]-[project]/databases/database-[database]/collection-[collection]/spreadsheet.svelte
index 0ddf827fe..ee8d8ee53 100644
--- a/src/routes/(console)/project-[region]-[project]/databases/database-[database]/collection-[collection]/spreadsheet.svelte
+++ b/src/routes/(console)/project-[region]-[project]/databases/database-[database]/collection-[collection]/spreadsheet.svelte
@@ -28,7 +28,7 @@
         reorderItems,
         columnsOrder,
         columnsWidth,
-        randomDataModalState
+        randomDataModalState, spreadsheetLoading
     } from './store';
     import RelationshipsModal from './relationshipsModal.svelte';
     import type { Column, ColumnType } from '$lib/helpers/types';
@@ -252,7 +252,6 @@
         );
     }
 
-    let loading = false;
     let showColumnDelete = false;
     let selectedRows: string[] = [];
 
@@ -260,11 +259,11 @@
     let selectedDocumentForDelete: Models.Document['$id'] | null = null;
 
     async function sort(query: string[]) {
-        loading = true;
+        $spreadsheetLoading = true;
         documents = await sdk
             .forProject(page.params.region, page.params.project)
             .databases.listDocuments(databaseId, collectionId, query);
-        loading = false;
+        $spreadsheetLoading = false;
     }
 
     async function handleDelete() {
@@ -448,11 +447,11 @@
 <SpreadsheetContainer>
     <Spreadsheet.Root
         let:root
-        {loading}
         height="100%"
         allowSelection
         bind:selectedRows
         bind:columns={$columns}
+        loading={$spreadsheetLoading}
         emptyCells={emptyCellsCount}
         bottomActionClick={() => (showRecordsCreateSheet.show = true)}
         on:columnsSwap={(order) => {
diff --git a/src/routes/(console)/project-[region]-[project]/databases/database-[database]/collection-[collection]/store.ts b/src/routes/(console)/project-[region]-[project]/databases/database-[database]/collection-[collection]/store.ts
index af837998b..b8903ea24 100644
--- a/src/routes/(console)/project-[region]-[project]/databases/database-[database]/collection-[collection]/store.ts
+++ b/src/routes/(console)/project-[region]-[project]/databases/database-[database]/collection-[collection]/store.ts
@@ -122,3 +122,5 @@ export const randomDataModalState = writable({
     show: false,
     value: 25 // initial value!
 });
+
+export const spreadsheetLoading = writable(false);
\ No newline at end of file
diff --git a/src/routes/(console)/project-[region]-[project]/databases/database-[database]/createCollection.svelte b/src/routes/(console)/project-[region]-[project]/databases/database-[database]/createCollection.svelte
index 69ccbb679..62ac56c52 100644
--- a/src/routes/(console)/project-[region]-[project]/databases/database-[database]/createCollection.svelte
+++ b/src/routes/(console)/project-[region]-[project]/databases/database-[database]/createCollection.svelte
@@ -87,6 +87,7 @@
     <CustomId
         show
         bind:id
+        required={false}
         autofocus={false}
         name="Collection"
         on:input={() => {