diff --git a/packages/builder/cypress/support/commands.js b/packages/builder/cypress/support/commands.js
index fc8397f13f..82f87032fa 100644
--- a/packages/builder/cypress/support/commands.js
+++ b/packages/builder/cypress/support/commands.js
@@ -52,7 +52,7 @@ Cypress.Commands.add("createApp", name => {
         .type("test")
       cy.contains("Submit").click()
       cy.contains("Create New Table", {
-        timeout: 10000,
+        timeout: 20000,
       }).should("be.visible")
     })
 })
@@ -143,7 +143,7 @@ Cypress.Commands.add("createScreen", (screenName, route) => {
   if (route) {
     cy.get("[data-cy=new-screen-dialog] input:last").type(route)
   }
-  cy.get(".uk-modal-footer").within(() => {
+  cy.get("[data-cy=create-screen-footer]").within(() => {
     cy.contains("Create Screen").click()
   })
   cy.get(".nav-items-container").within(() => {
diff --git a/packages/builder/src/components/settings/Link.svelte b/packages/builder/src/components/settings/Link.svelte
index 697a1609e4..9d669bc7b2 100644
--- a/packages/builder/src/components/settings/Link.svelte
+++ b/packages/builder/src/components/settings/Link.svelte
@@ -1,4 +1,5 @@
 <script>
+  import Modal from "./Modal.svelte"
   import { SettingsIcon } from "components/common/Icons/"
   import { getContext } from "svelte"
   import { isActive, goto, layout } from "@sveltech/routify"
diff --git a/packages/builder/src/components/userInterface/NewScreen.svelte b/packages/builder/src/components/userInterface/NewScreen.svelte
index 052aa80272..d365ef7eaa 100644
--- a/packages/builder/src/components/userInterface/NewScreen.svelte
+++ b/packages/builder/src/components/userInterface/NewScreen.svelte
@@ -96,7 +96,7 @@
 
   <Spacer extraLarge />
 
-  <div class="modal-footer">
+  <div data-cy="create-screen-footer" class="modal-footer">
     <Button secondary medium on:click={cancel}>Cancel</Button>
     <Button blue medium on:click={save}>Create Screen</Button>
   </div>