diff --git a/src/routes/console/organization-[organization]/createProject.svelte b/src/routes/console/organization-[organization]/createProject.svelte
index e0f80e179..ae0dca20c 100644
--- a/src/routes/console/organization-[organization]/createProject.svelte
+++ b/src/routes/console/organization-[organization]/createProject.svelte
@@ -18,15 +18,18 @@
     let name: string;
     let showCustomId = false;
     let error: string;
+    let disabled: boolean = false;
 
     async function create() {
         try {
+            disabled = true;
             const project = await sdk.forConsole.projects.create(
                 id ?? ID.unique(),
                 name,
                 teamId,
                 'default'
             );
+            show = false;
             dispatch('created', project);
             trackEvent(Submit.ProjectCreate, {
                 customId: !!id,
@@ -40,6 +43,7 @@
         } catch (e) {
             error = e.message;
             trackError(e, Submit.ProjectCreate);
+            disabled = false;
         }
     }
 </script>
@@ -61,6 +65,6 @@
     </FormList>
     <svelte:fragment slot="footer">
         <Button secondary on:click={() => (show = false)}>Cancel</Button>
-        <Button submit>Create</Button>
+        <Button submit {disabled}>Create</Button>
     </svelte:fragment>
 </Modal>
diff --git a/src/routes/console/project-[project]/databases/database-[database]/collection-[collection]/document-[document]/attributeItem.svelte b/src/routes/console/project-[project]/databases/database-[database]/collection-[collection]/document-[document]/attributeItem.svelte
index 857e64584..1be558a2d 100644
--- a/src/routes/console/project-[project]/databases/database-[database]/collection-[collection]/document-[document]/attributeItem.svelte
+++ b/src/routes/console/project-[project]/databases/database-[database]/collection-[collection]/document-[document]/attributeItem.svelte
@@ -58,9 +58,9 @@
             </Button>
         </div>
     {:else}
-        <ul class="u-grid u-gap-8">
+        <ul class="u-grid u-gap-4">
             {#each [...formValues[attribute.key].keys()] as index}
-                <li class="form-item is-multiple">
+                <li class="form-item is-multiple u-gap-8">
                     <div class="form-item-part u-stretch">
                         <Attribute
                             {attribute}
diff --git a/src/routes/console/project-[project]/functions/function-[function]/execute.svelte b/src/routes/console/project-[project]/functions/function-[function]/execute.svelte
index 278a3ceab..9f9780139 100644
--- a/src/routes/console/project-[project]/functions/function-[function]/execute.svelte
+++ b/src/routes/console/project-[project]/functions/function-[function]/execute.svelte
@@ -121,11 +121,7 @@
                     </Button>
                 </svelte:fragment>
             </Alert>
-            <InputTextarea
-                label="Body"
-                placeholder={`{ "myKey": "myValue" }`}
-                id="body"
-                bind:value={body} />
+            <InputTextarea label="Body" placeholder={`Hello, World!`} id="body" bind:value={body} />
         {:else}
             <InputText label="Path" id="path" placeholder="/" bind:value={path} required />
 
@@ -214,7 +210,7 @@
 
                         <InputTextarea
                             label="Body"
-                            placeholder={`{ "myKey": "myValue" }`}
+                            placeholder={`Hello, World!`}
                             id="body"
                             bind:value={body} />
                     </FormList>
diff --git a/src/routes/console/project-[project]/settings/smtp/+page.svelte b/src/routes/console/project-[project]/settings/smtp/+page.svelte
index e61255b17..735a0c5f8 100644
--- a/src/routes/console/project-[project]/settings/smtp/+page.svelte
+++ b/src/routes/console/project-[project]/settings/smtp/+page.svelte
@@ -23,6 +23,7 @@
     import { organization } from '$lib/stores/organization';
     import { wizard } from '$lib/stores/wizard';
     import ChangeOrganizationTierCloud from '$routes/console/changeOrganizationTierCloud.svelte';
+    import InputSelect from '$lib/elements/forms/inputSelect.svelte';
 
     let enabled = false;
     let senderName: string;
@@ -32,7 +33,13 @@
     let port: number;
     let username: string;
     let password: string;
-    let secure = false;
+    let secure: string;
+
+    const options = [
+        { value: 'tls', label: 'TLS' },
+        { value: 'ssl', label: 'SSL' },
+        { value: '', label: 'None' }
+    ];
 
     onMount(() => {
         enabled = $project.smtpEnabled ?? false;
@@ -43,7 +50,7 @@
         port = $project.smtpPort;
         username = $project.smtpUsername;
         password = $project.smtpPassword;
-        secure = $project.smtpSecure === 'tls';
+        secure = $project.smtpSecure === 'tls' ? 'tls' : $project.smtpSecure === 'ssl' ? 'ssl' : '';
     });
 
     async function updateSmtp() {
@@ -68,7 +75,7 @@
                 port ? port : undefined,
                 username ? username : undefined,
                 password ? password : undefined,
-                secure ? 'tls' : undefined
+                secure ? secure : undefined
             );
 
             invalidate(Dependencies.PROJECT);
@@ -97,7 +104,7 @@
             port: $project.smtpPort,
             username: $project.smtpUsername,
             password: $project.smtpPassword,
-            secure: $project.smtpSecure === 'tls'
+            secure: $project.smtpSecure
         }
     );
 
@@ -109,7 +116,7 @@
         port = undefined;
         username = undefined;
         password = undefined;
-        secure = false;
+        secure = undefined;
     }
 </script>
 
@@ -189,10 +196,12 @@
                                 label="Password"
                                 bind:value={password}
                                 placeholder="Enter password" />
-
-                            <InputChoice bind:value={secure} id="tls" label="TLS secure protocol">
-                                Enable if TLS is supported on your SMTP server.
-                            </InputChoice>
+                            <InputSelect
+                                id="tls"
+                                label="Secure protocol"
+                                placeholder="Select protocol"
+                                bind:value={secure}
+                                {options} />
                         {/if}
                     </FormList>
                 {/if}