diff --git a/src/routes/(console)/create-organization/+page.svelte b/src/routes/(console)/create-organization/+page.svelte
index 6d37264de4..5599131ceb 100644
--- a/src/routes/(console)/create-organization/+page.svelte
+++ b/src/routes/(console)/create-organization/+page.svelte
@@ -195,18 +195,21 @@
                     required />
             </Fieldset>
             <Fieldset legend="Select plan">
-                <Typography.Text>
-                    For more details on our plans, visit our
-                    <Link.Anchor
-                        href="https://appwrite.io/pricing"
-                        target="_blank"
-                        rel="noopener noreferrer">pricing page</Link.Anchor
-                    >.
-                </Typography.Text>
-                <PlanSelection
-                    bind:billingPlan={selectedPlan}
-                    anyOrgFree={data.hasFreeOrganizations}
-                    isNewOrg />
+                <Layout.Stack>
+                    <Typography.Text>
+                        For more details on our plans, visit our
+                        <Link.Anchor
+                            href="https://appwrite.io/pricing"
+                            target="_blank"
+                            rel="noopener noreferrer">pricing page</Link.Anchor
+                        >.
+                    </Typography.Text>
+
+                    <PlanSelection
+                        bind:billingPlan={selectedPlan}
+                        anyOrgFree={data.hasFreeOrganizations}
+                        isNewOrg />
+                </Layout.Stack>
             </Fieldset>
             {#if selectedPlan !== BillingPlan.FREE}
                 <Fieldset legend="Payment">
diff --git a/src/routes/(console)/project-[region]-[project]/functions/function-[function]/table.svelte b/src/routes/(console)/project-[region]-[project]/functions/function-[function]/table.svelte
index 4bfe5cb624..fdfdfdb145 100644
--- a/src/routes/(console)/project-[region]-[project]/functions/function-[function]/table.svelte
+++ b/src/routes/(console)/project-[region]-[project]/functions/function-[function]/table.svelte
@@ -149,16 +149,18 @@
 
                     <svelte:fragment slot="menu" let:toggle>
                         <ActionMenu.Root>
-                            <ActionMenu.Item.Button
-                                trailingIcon={IconRefresh}
-                                on:click={() => {
-                                    selectedDeployment = deployment;
-                                    showRedeploy = true;
-                                    toggle();
-                                    trackEvent(Click.FunctionsRedeployClick);
-                                }}>
-                                Redeploy
-                            </ActionMenu.Item.Button>
+                            {#if deployment.sourceSize !== 0}
+                                <ActionMenu.Item.Button
+                                    trailingIcon={IconRefresh}
+                                    on:click={() => {
+                                        selectedDeployment = deployment;
+                                        showRedeploy = true;
+                                        toggle();
+                                        trackEvent(Click.FunctionsRedeployClick);
+                                    }}>
+                                    Redeploy
+                                </ActionMenu.Item.Button>
+                            {/if}
                             {#if deployment.status === 'ready' && deployment.$id !== $func.deploymentId}
                                 <ActionMenu.Item.Button
                                     trailingIcon={IconLightningBolt}
diff --git a/src/routes/(console)/project-[region]-[project]/overview/keys/[key]/delete.svelte b/src/routes/(console)/project-[region]-[project]/overview/keys/[key]/delete.svelte
deleted file mode 100644
index 78d94982b6..0000000000
--- a/src/routes/(console)/project-[region]-[project]/overview/keys/[key]/delete.svelte
+++ /dev/null
@@ -1,35 +0,0 @@
-<script lang="ts">
-    import { goto, invalidate } from '$app/navigation';
-    import { base } from '$app/paths';
-    import { Submit, trackEvent, trackError } from '$lib/actions/analytics';
-    import Confirm from '$lib/components/confirm.svelte';
-    import { Dependencies } from '$lib/constants';
-    import { addNotification } from '$lib/stores/notifications';
-    import { sdk } from '$lib/stores/sdk';
-    import { project } from '../../../store';
-    import { key } from './store';
-
-    export let showDelete = false;
-    let error: string;
-
-    async function handleDelete() {
-        try {
-            await sdk.forConsole.projects.deleteKey($project.$id, $key.$id);
-            await invalidate(Dependencies.KEYS);
-            showDelete = false;
-            addNotification({
-                type: 'success',
-                message: `${$key.name} has been deleted`
-            });
-            trackEvent(Submit.KeyDelete);
-            await goto(`${base}/project-${$project.region}-${$project.$id}/overview/keys`);
-        } catch (e) {
-            error = e.message;
-            trackError(e, Submit.KeyDelete);
-        }
-    }
-</script>
-
-<Confirm onSubmit={handleDelete} title="Delete API key" bind:open={showDelete} bind:error>
-    Are you sure you want to delete this execution?
-</Confirm>
diff --git a/src/routes/(console)/project-[region]-[project]/overview/keys/[key]/updateExpirationDate.svelte b/src/routes/(console)/project-[region]-[project]/overview/keys/[key]/updateExpirationDate.svelte
deleted file mode 100644
index e69de29bb2..0000000000