diff --git a/src/lib/layout/containerHeader.svelte b/src/lib/layout/containerHeader.svelte
index 3805cfc80..3ca83f26b 100644
--- a/src/lib/layout/containerHeader.svelte
+++ b/src/lib/layout/containerHeader.svelte
@@ -83,10 +83,10 @@
             <Alert type={alertType} isStandalone>
                 <span class="text">
                     You've reached the {title.toLowerCase()} limit for the {tier} plan.
-                    {#if tier !== 'Scale'}<button
-                            class="link"
-                            type="button"
-                            on:click|preventDefault={upgradeMethod}>Upgrade</button>
+
+                    {#if $organization?.billingPlan === 'tier-0'}
+                        <button class="link" type="button" on:click|preventDefault={upgradeMethod}
+                            >Upgrade</button>
                         for additional {title.toLocaleLowerCase()}.
                     {/if}
                 </span>
@@ -120,7 +120,7 @@
                             <p class="text">
                                 Your are limited to {limit}
                                 {title.toLocaleLowerCase()} per project on the {tier} plan.
-                                {#if tier !== 'Scale'}<button
+                                {#if $organization?.billingPlan === 'tier-0'}<button
                                         class="link"
                                         type="button"
                                         on:click|preventDefault={upgradeMethod}>Upgrade</button>
@@ -138,7 +138,10 @@
         {#if buttonText}
             <div
                 use:tooltip={{
-                    content: `Upgrade to add more ${title.toLocaleLowerCase()}`,
+                    content:
+                        $organization.billingPlan === 'tier-0'
+                            ? `Upgrade to add more ${title.toLocaleLowerCase()}`
+                            : `You've reached the ${title.toLocaleLowerCase()} limit for the ${tier} plan`,
                     disabled: !isButtonDisabled
                 }}>
                 <Button on:click={buttonMethod} event={buttonEvent} disabled={isButtonDisabled}>
diff --git a/src/routes/console/account/payments/billingAddress.svelte b/src/routes/console/account/payments/billingAddress.svelte
index 50f1c8047..40d8b8788 100644
--- a/src/routes/console/account/payments/billingAddress.svelte
+++ b/src/routes/console/account/payments/billingAddress.svelte
@@ -53,6 +53,9 @@
                             <TableCell>
                                 <div class="u-line-height-1-5">
                                     <p class="text">{address.streetAddress}</p>
+                                    {#if address?.addressLine2}
+                                        <p class="text">{address.addressLine2}</p>
+                                    {/if}
                                     <p class="text">{address.city}</p>
                                     <p class="text">{address.state}</p>
                                     <p class="text">{address.postalCode}</p>
diff --git a/src/routes/console/organization-[organization]/billing/availableCredit.svelte b/src/routes/console/organization-[organization]/billing/availableCredit.svelte
index 46440be3d..e2b84b794 100644
--- a/src/routes/console/organization-[organization]/billing/availableCredit.svelte
+++ b/src/routes/console/organization-[organization]/billing/availableCredit.svelte
@@ -76,7 +76,7 @@
     <p class="text">Appwrite credit will automatically be applied to your next invoice.</p>
     <svelte:fragment slot="aside">
         <h4 class="body-text-1 u-bold">
-            Credit balance: <span class="inline-tag">${balance}</span>
+            Credit balance <span class="inline-tag">${balance}</span>
         </h4>
         <Form onSubmit={redeem} noMargin>
             <FormList>
diff --git a/src/routes/console/organization-[organization]/billing/billingAddress.svelte b/src/routes/console/organization-[organization]/billing/billingAddress.svelte
index c3320287d..0b8837eba 100644
--- a/src/routes/console/organization-[organization]/billing/billingAddress.svelte
+++ b/src/routes/console/organization-[organization]/billing/billingAddress.svelte
@@ -59,11 +59,15 @@
                 <div class="u-flex u-main-space-between u-cross-start">
                     <div class="u-line-height-1-5 u-flex u-flex-vertical u-gap-2">
                         <p class="text">{billingAddress.streetAddress}</p>
+                        {#if billingAddress?.addressLine2}
+                            <p class="text">{billingAddress.addressLine2}</p>
+                        {/if}
                         <p class="text">{billingAddress.city}</p>
                         <p class="text">{billingAddress.state}</p>
                         <p class="text">{billingAddress.postalCode}</p>
                         <p class="text">{billingAddress.country}</p>
                     </div>
+
                     <DropList
                         bind:show={showBillingAddressDropdown}
                         placement="bottom-start"
@@ -121,6 +125,9 @@
                                         <DropListItem on:click={() => addAddress(address?.$id)}>
                                             <p class="text">
                                                 <span>{address.streetAddress}</span>,
+                                                {#if address?.addressLine2}
+                                                    <span>{address.addressLine2}</span>,
+                                                {/if}
                                                 <span>{address.city}</span>,
                                                 <span>{address.state}</span>,
                                                 <span>{address.postalCode}</span>,
diff --git a/src/routes/console/organization-[organization]/billing/budgetAlert.svelte b/src/routes/console/organization-[organization]/billing/budgetAlert.svelte
index fad90fd10..7a90b0f6f 100644
--- a/src/routes/console/organization-[organization]/billing/budgetAlert.svelte
+++ b/src/routes/console/organization-[organization]/billing/budgetAlert.svelte
@@ -58,7 +58,7 @@
             addNotification({
                 type: 'success',
                 isHtml: true,
-                message: `<span>Budget cap enabled for <b>${$organization.name}</b></span>`
+                message: `<span>Budget alert condition added to <b>${$organization.name}</b></span>`
             });
             trackEvent(Submit.BudgetAlertsUpdate, {
                 alerts
diff --git a/src/routes/console/organization-[organization]/billing/planSummary.svelte b/src/routes/console/organization-[organization]/billing/planSummary.svelte
index 1e8859fbb..76502539b 100644
--- a/src/routes/console/organization-[organization]/billing/planSummary.svelte
+++ b/src/routes/console/organization-[organization]/billing/planSummary.svelte
@@ -28,7 +28,9 @@
             Your current project plan. For more information on Appwrite plans, <a
                 type="button"
                 class="link"
-                href="https://appwrite.io/pricing">
+                href="https://appwrite.io/pricing"
+                target="_blank"
+                rel="noopener noreferrer">
                 view our pricing guide.
             </a>
         </p>
diff --git a/src/routes/console/project-[project]/storage/bucket-[bucket]/+page.svelte b/src/routes/console/project-[project]/storage/bucket-[bucket]/+page.svelte
index c7f0d4128..77d99fb47 100644
--- a/src/routes/console/project-[project]/storage/bucket-[bucket]/+page.svelte
+++ b/src/routes/console/project-[project]/storage/bucket-[bucket]/+page.svelte
@@ -112,9 +112,13 @@
                 <Alert type="warning" isStandalone>
                     <span class="text">
                         You've reached the storage limit for the {tier} plan.
-                        <button class="link" type="button" on:click|preventDefault={upgradeMethod}
-                            >Upgrade</button>
-                        for additional storage.
+                        {#if tier === 'Starter'}
+                            <button
+                                class="link"
+                                type="button"
+                                on:click|preventDefault={upgradeMethod}>Upgrade</button>
+                            for additional storage.
+                        {/if}
                     </span>
                 </Alert>
             {/if}
diff --git a/src/routes/console/project-[project]/storage/bucket-[bucket]/settings/updateMaxFileSize.svelte b/src/routes/console/project-[project]/storage/bucket-[bucket]/settings/updateMaxFileSize.svelte
index a5d416066..38fc3f811 100644
--- a/src/routes/console/project-[project]/storage/bucket-[bucket]/settings/updateMaxFileSize.svelte
+++ b/src/routes/console/project-[project]/storage/bucket-[bucket]/settings/updateMaxFileSize.svelte
@@ -4,7 +4,7 @@
     import { Button, Form, FormItem, InputNumber, InputSelect } from '$lib/elements/forms';
     import { humanFileSize, sizeToBytes } from '$lib/helpers/sizeConvertion';
     import { createByteUnitPair } from '$lib/helpers/unit';
-    import { getServiceLimit, readOnly } from '$lib/stores/billing';
+    import { getServiceLimit, readOnly, tierToPlan } from '$lib/stores/billing';
     import { organization } from '$lib/stores/organization';
     import { wizard } from '$lib/stores/wizard';
     import { isCloud } from '$lib/system';
@@ -35,11 +35,12 @@
         <Heading tag="h2" size="7">Maximum file size</Heading>
         <p class="text">Set the maximum file size allowed in the bucket.</p>
         <svelte:fragment slot="aside">
-            {#if isCloud && $organization?.billingPlan === 'tier-0'}
+            {#if isCloud}
                 {@const size = humanFileSize(sizeToBytes(service, 'MB', 1000))}
+                {@const plan = tierToPlan($organization?.billingPlan)}
                 <Alert type="info">
                     <p class="text">
-                        The Starter plan has a maximum upload file size limit of {size.value}{size.unit}.
+                        The {plan.name} plan has a maximum upload file size limit of {size.value}{size.unit}.
                         Upgrade to allow files of a larger size.
                     </p>
                     <svelte:fragment slot="action">
diff --git a/src/routes/console/wizard/cloudOrganization/usageRates.svelte b/src/routes/console/wizard/cloudOrganization/usageRates.svelte
index cc3fc7c6a..34a4b626b 100644
--- a/src/routes/console/wizard/cloudOrganization/usageRates.svelte
+++ b/src/routes/console/wizard/cloudOrganization/usageRates.svelte
@@ -57,10 +57,15 @@
         Usage on the Starter plan is limited for the following resources. Next billing period: {toLocaleDate(
             nextDate
         )}.
-    {:else}
+    {:else if tier === 'tier-1'}
         <p>
-            Usage on the Pro plan and Scale plan will be charged at the end of each billing period
-            at the following rates. Next billing period: {toLocaleDate(nextDate)}.
+            Usage on the Pro plan will be charged at the end of each billing period at the following
+            rates. Next billing period: {toLocaleDate(nextDate)}.
+        </p>
+    {:else if tier === 'tier-2'}
+        <p>
+            Usage on the Scale plan will be charged at the end of each billing period at the
+            following rates. Next billing period: {toLocaleDate(nextDate)}.
         </p>
     {/if}
     <Table noStyles>