diff --git a/packages/builder/src/pages/builder/portal/email/TemplateLink.svelte b/packages/builder/src/pages/builder/portal/email/TemplateLink.svelte
index 78fa6b031a..060f533bd2 100644
--- a/packages/builder/src/pages/builder/portal/email/TemplateLink.svelte
+++ b/packages/builder/src/pages/builder/portal/email/TemplateLink.svelte
@@ -1,12 +1,10 @@
 <script>
-  import { url } from "@roxi/routify"
-  import { Link } from "@budibase/bbui"
-  import { roles } from "stores/backend"
+  import { goto } from "@roxi/routify"
 
   export let value
 </script>
 
-<Link quiet href={$url(`./${value}`)}><span>{value}</span></Link>
+<span on:click={() => $goto(`./${value}`)}>{value}</span>
 
 <style>
   span {
diff --git a/packages/builder/src/pages/builder/portal/email/[template].svelte b/packages/builder/src/pages/builder/portal/email/[template].svelte
index 0d8813d85b..e819aafae4 100644
--- a/packages/builder/src/pages/builder/portal/email/[template].svelte
+++ b/packages/builder/src/pages/builder/portal/email/[template].svelte
@@ -123,6 +123,8 @@
     display: flex;
     width: 100%;
     justify-content: space-between;
+    margin-bottom: var(--spacing-l);
+    margin-top: var(--spacing-l);
   }
 
   .preview {
diff --git a/packages/cli/src/hosting/makeEnv.js b/packages/cli/src/hosting/makeEnv.js
index e17e3374dc..8806c2e1e6 100644
--- a/packages/cli/src/hosting/makeEnv.js
+++ b/packages/cli/src/hosting/makeEnv.js
@@ -1,4 +1,4 @@
-const { string, number } = require("../questions")
+const { number } = require("../questions")
 const { success } = require("../utils")
 const fs = require("fs")
 const path = require("path")