diff --git a/packages/builder/src/builderStore/index.js b/packages/builder/src/builderStore/index.js
index c040403592..101f875e96 100644
--- a/packages/builder/src/builderStore/index.js
+++ b/packages/builder/src/builderStore/index.js
@@ -9,7 +9,7 @@ export const automationStore = getAutomationStore()
 
 export const initialise = async () => {
   try {
-    analytics.activate()
+    await analytics.activate()
     analytics.captureEvent("Builder Started")
   } catch (err) {
     console.log(err)
diff --git a/packages/builder/src/builderStore/store/screenTemplates/recordListScreen.js b/packages/builder/src/builderStore/store/screenTemplates/recordListScreen.js
index 32f4d0696b..0210e7a85e 100644
--- a/packages/builder/src/builderStore/store/screenTemplates/recordListScreen.js
+++ b/packages/builder/src/builderStore/store/screenTemplates/recordListScreen.js
@@ -86,7 +86,7 @@ const createScreen = model => ({
       },
       {
         _id: "",
-        _component: "@budibase/standard-components/datatable",
+        _component: "@budibase/standard-components/datagrid",
         _styles: {
           normal: {},
           hover: {},
@@ -100,10 +100,6 @@ const createScreen = model => ({
           modelId: model._id,
           isModel: true,
         },
-        stripeColor: "",
-        borderColor: "",
-        backgroundColor: "",
-        color: "",
         _instanceName: `${model.name} Table`,
         _children: [],
       },
diff --git a/packages/builder/src/components/userInterface/temporaryPanelStructure.js b/packages/builder/src/components/userInterface/temporaryPanelStructure.js
index e7033f1c8e..50799581f8 100644
--- a/packages/builder/src/components/userInterface/temporaryPanelStructure.js
+++ b/packages/builder/src/components/userInterface/temporaryPanelStructure.js
@@ -346,6 +346,18 @@ export default {
                 ],
                 placeholder: "alpine",
               },
+              {
+                label: "Height",
+                key: "height",
+                defaultValue: "500",
+                control: Input,
+              },
+              {
+                label: "Pagination",
+                key: "pagination",
+                valueKey: "checked",
+                control: Checkbox,
+              },
             ],
           },
           children: [],
diff --git a/packages/server/src/utilities/appDirectoryTemplate/pages/main/page.json b/packages/server/src/utilities/appDirectoryTemplate/pages/main/page.json
index 9e2c3c8e64..916ad5d224 100644
--- a/packages/server/src/utilities/appDirectoryTemplate/pages/main/page.json
+++ b/packages/server/src/utilities/appDirectoryTemplate/pages/main/page.json
@@ -54,34 +54,6 @@
             "_instanceId": "inst_cf8ace4_69efc0d72e6f443db2d4c902c14d9394",
             "_instanceName": "Home Link",
             "_children": []
-          },
-          {
-            "_id": "d3325634-0945-4387-8bb3-d9d9be186c1c",
-            "_component": "@budibase/standard-components/link",
-            "_styles": {
-              "normal": {
-                "font-family": "Inter",
-                "font-weight": "400",
-                "color": "#000000",
-                "text-decoration-line": "none",
-                "font-size": "16px"
-              },
-              "hover": {},
-              "active": {},
-              "selected": {}
-            },
-            "_code": "",
-            "url": "/screen1",
-            "openInNewTab": false,
-            "text": "Screen 1",
-            "color": "",
-            "hoverColor": "",
-            "underline": false,
-            "fontSize": "",
-            "fontFamily": "initial",
-            "_instanceId": "inst_cf8ace4_69efc0d72e6f443db2d4c902c14d9394",
-            "_instanceName": "Screen 1 Link",
-            "_children": []
           }
         ]
       },
diff --git a/packages/standard-components/components.json b/packages/standard-components/components.json
index 76675ac63b..8464729993 100644
--- a/packages/standard-components/components.json
+++ b/packages/standard-components/components.json
@@ -237,7 +237,9 @@
 					"balham-dark",
 					"material"
 				]
-			}
+			},
+			"height": "number",
+			"pagination": "bool"
 		}
 	},
 	"dataform": {
diff --git a/packages/standard-components/src/DataGrid/Component.svelte b/packages/standard-components/src/DataGrid/Component.svelte
index 5d85f66da7..3a0d13d35d 100644
--- a/packages/standard-components/src/DataGrid/Component.svelte
+++ b/packages/standard-components/src/DataGrid/Component.svelte
@@ -18,6 +18,8 @@
   export let datasource = {}
   export let editable
   export let theme = "alpine"
+  export let height
+  export let pagination
 
   let dataLoaded = false
   let data
@@ -32,6 +34,8 @@
     },
     rowSelection: editable ? "multiple" : false,
     suppressRowClickSelection: !editable,
+    paginationAutoPageSize: true,
+    pagination,
   }
   let store = _bb.store
 
@@ -111,7 +115,7 @@
     href="https://cdn.jsdelivr.net/npm/flatpickr/dist/flatpickr.min.css" />
 </svelte:head>
 
-<div class="container">
+<div class="container" style="--grid-height: {height}px">
   {#if dataLoaded}
     {#if editable}
       <div class="controls">