diff --git a/src/routes/console/project-[project]/auth/templates/+page.svelte b/src/routes/console/project-[project]/auth/templates/+page.svelte
index c641a3c09..0939afd0b 100644
--- a/src/routes/console/project-[project]/auth/templates/+page.svelte
+++ b/src/routes/console/project-[project]/auth/templates/+page.svelte
@@ -76,7 +76,7 @@
     <div class="u-flex u-gap-8 u-cross-center">
         <Heading tag="h2" size="5">Templates</Heading>
         <div class="tag eyebrow-heading-3">
-            <span class="text u-x-small">Beta</span>
+            <span class="text u-x-small">Experimental</span>
         </div>
     </div>
 
@@ -84,7 +84,6 @@
         <div class="u-margin-block-start-24">
             <Alert
                 isStandalone
-                dismissible
                 type="info"
                 buttons={[
                     {
diff --git a/src/routes/console/project-[project]/functions/function-[function]/+page.svelte b/src/routes/console/project-[project]/functions/function-[function]/+page.svelte
index 1cd79d11d..f99fcec63 100644
--- a/src/routes/console/project-[project]/functions/function-[function]/+page.svelte
+++ b/src/routes/console/project-[project]/functions/function-[function]/+page.svelte
@@ -202,16 +202,19 @@
                                     warning={status === 'pending'}
                                     success={status === 'completed' || status === 'ready'}
                                     info={status === 'processing' || status === 'building'}>
-                                    <span
-                                        class="text u-trim"
-                                        use:tooltip={{
-                                            content: 'Active Deployment',
-                                            placement: 'top'
-                                        }}>
-                                        {#if deployment.$id === $func.deployment}
+                                    {#if deployment.$id === $func.deployment}
+                                        <span
+                                            class="text u-trim"
+                                            use:tooltip={{
+                                                content: 'Active Deployment',
+                                                placement: 'top'
+                                            }}>
                                             <span class="icon-check-circle" aria-hidden="true" />
-                                        {/if}
-                                        <span>{status}</span></span>
+                                            <span>{status}</span>
+                                        </span>
+                                    {:else}
+                                        <span>{status}</span>
+                                    {/if}
                                 </Pill>
                             </TableCell>
                             <TableCellText width={70} title="Source">
@@ -255,8 +258,7 @@
                                             }}>
                                             Redeploy
                                         </DropListItem>
-
-                                        {#if deployment.status === 'ready'}
+                                        {#if deployment.status === 'ready' && deployment.$id !== $func.deployment}
                                             <DropListItem
                                                 icon="lightning-bolt"
                                                 on:click={() => {