diff --git a/apps/builder/app/builder/features/topbar/publish.tsx b/apps/builder/app/builder/features/topbar/publish.tsx
index 6c4cddd76703..66ac15393929 100644
--- a/apps/builder/app/builder/features/topbar/publish.tsx
+++ b/apps/builder/app/builder/features/topbar/publish.tsx
@@ -44,7 +44,6 @@ import {
 import { validateProjectDomain, type Project } from "@webstudio-is/project";
 import {
   $awareness,
-  $selectedPagePath,
   findAwarenessByInstanceId,
   type Awareness,
 } from "~/shared/awareness";
@@ -101,15 +100,11 @@ const ChangeProjectDomain = ({
 }: ChangeProjectDomainProps) => {
   const id = useId();
   const publishedOrigin = useStore($publishedOrigin);
-  const selectedPagePath = useStore($selectedPagePath);
 
   const [domain, setDomain] = useState(project.domain);
   const [error, setError] = useState<string>();
   const [isUpdateInProgress, setIsUpdateInProgress] = useOptimistic(false);
 
-  const pageUrl = new URL(publishedOrigin);
-  pageUrl.pathname = selectedPagePath;
-
   const updateProjectDomain = async () => {
     setIsUpdateInProgress(true);
     const validationResult = validateProjectDomain(domain);
@@ -148,7 +143,7 @@ const ChangeProjectDomain = ({
 
   return (
     <CollapsibleDomainSection
-      title={pageUrl.host}
+      title={new URL(publishedOrigin).host}
       prefix={
         <DomainCheckbox
           defaultChecked={project.latestBuildVirtual?.domain === domain}
@@ -181,18 +176,11 @@ const ChangeProjectDomain = ({
               )}
             </Flex>
           </Tooltip>
-          <Tooltip
-            content={
-              <Text css={{ wordBreak: "break-all" }}>
-                Proceed to ${pageUrl.toString()}
-              </Text>
-            }
-            variant="wrapped"
-          >
+          <Tooltip content={`Proceed to ${publishedOrigin}`}>
             <IconButton
               tabIndex={-1}
               onClick={(event) => {
-                window.open(pageUrl, "_blank");
+                window.open(publishedOrigin, "_blank");
                 event.preventDefault();
               }}
             >
@@ -786,6 +774,108 @@ const buttonLinkClass = css({
   ...textVariants.link,
 }).toString();
 
+const UpgradeBanner = () => {
+  const usedProFeatures = useStore($usedProFeatures);
+  const { canAddDomain, maxDomainsAllowedPerUser } = useCanAddDomain();
+  const { userPublishCount, maxPublishesAllowedPerUser } =
+    useUserPublishCount();
+
+  if (userPublishCount >= maxPublishesAllowedPerUser) {
+    return (
+      <PanelBanner>
+        <Text variant="regularBold">
+          Upgrade to publish more than {maxPublishesAllowedPerUser} times per
+          day:
+        </Text>
+        <Link
+          className={buttonStyle({ color: "gradient" })}
+          color="contrast"
+          underline="none"
+          href="https://webstudio.is/pricing"
+          target="_blank"
+        >
+          Upgrade
+        </Link>
+      </PanelBanner>
+    );
+  }
+
+  if (usedProFeatures.size > 0) {
+    return (
+      <PanelBanner>
+        <img
+          src={cmsUpgradeBanner}
+          alt="Upgrade for CMS"
+          width={rawTheme.spacing[28]}
+          style={{ aspectRatio: "4.1" }}
+        />
+        <Text variant="regularBold">Following Pro features are used:</Text>
+        <Text as="ul" color="destructive" css={{ paddingLeft: "1em" }}>
+          {Array.from(usedProFeatures).map(
+            ([message, { awareness, info } = {}], index) => (
+              <li key={index}>
+                <Flex align="center" gap="1">
+                  {awareness ? (
+                    <button
+                      className={buttonLinkClass}
+                      type="button"
+                      onClick={() => $awareness.set(awareness)}
+                    >
+                      {message}
+                    </button>
+                  ) : (
+                    message
+                  )}
+                  {info && (
+                    <Tooltip variant="wrapped" content={info}>
+                      <SmallIconButton icon={<HelpIcon />} />
+                    </Tooltip>
+                  )}
+                </Flex>
+              </li>
+            )
+          )}
+        </Text>
+        <Text>You can delete these features or upgrade.</Text>
+        <Flex align="center" gap={1}>
+          <UpgradeIcon />
+          <Link
+            color="inherit"
+            target="_blank"
+            href="https://webstudio.is/pricing"
+          >
+            Upgrade to Pro
+          </Link>
+        </Flex>
+      </PanelBanner>
+    );
+  }
+  if (canAddDomain === false) {
+    return (
+      <PanelBanner>
+        <Text variant="regularBold">Free domains limit reached</Text>
+        <Text variant="regular">
+          You have reached the limit of {maxDomainsAllowedPerUser} custom
+          domains on your account.{" "}
+          <Text variant="regularBold" inline>
+            Upgrade to a Pro account
+          </Text>{" "}
+          to add unlimited domains and publish to each domain individually.
+        </Text>
+        <Link
+          className={buttonStyle({ color: "gradient" })}
+          color="contrast"
+          underline="none"
+          href="https://webstudio.is/pricing"
+          target="_blank"
+        >
+          Upgrade
+        </Link>
+      </PanelBanner>
+    );
+  }
+};
+
 const Content = (props: {
   projectId: Project["id"];
   onExportClick: () => void;
@@ -801,99 +891,12 @@ const Content = (props: {
   }
   const projectState = "idle";
 
-  const { canAddDomain, maxDomainsAllowedPerUser } = useCanAddDomain();
   const { userPublishCount, maxPublishesAllowedPerUser } =
     useUserPublishCount();
 
   return (
     <form>
       <ScrollArea>
-        {userPublishCount >= maxPublishesAllowedPerUser ? (
-          <PanelBanner>
-            <Text variant="regularBold">
-              Upgrade to publish more than {maxPublishesAllowedPerUser} times
-              per day:
-            </Text>
-            <Link
-              className={buttonStyle({ color: "gradient" })}
-              color="contrast"
-              underline="none"
-              href="https://webstudio.is/pricing"
-              target="_blank"
-            >
-              Upgrade
-            </Link>
-          </PanelBanner>
-        ) : usedProFeatures.size > 0 && hasProPlan === false ? (
-          <PanelBanner>
-            <img
-              src={cmsUpgradeBanner}
-              alt="Upgrade for CMS"
-              width={rawTheme.spacing[28]}
-              style={{ aspectRatio: "4.1" }}
-            />
-            <Text variant="regularBold">
-              Upgrade to publish with following features:
-            </Text>
-            <Text as="ul">
-              {Array.from(usedProFeatures).map(
-                ([message, { awareness, info } = {}], index) => (
-                  <li key={index}>
-                    <Flex align="center" gap="1">
-                      {awareness ? (
-                        <button
-                          className={buttonLinkClass}
-                          type="button"
-                          onClick={() => $awareness.set(awareness)}
-                        >
-                          {message}
-                        </button>
-                      ) : (
-                        message
-                      )}
-                      {info && (
-                        <Tooltip variant="wrapped" content={info}>
-                          <SmallIconButton icon={<HelpIcon />} />
-                        </Tooltip>
-                      )}
-                    </Flex>
-                  </li>
-                )
-              )}
-            </Text>
-            <Flex align="center" gap={1}>
-              <UpgradeIcon />
-              <Link
-                color="inherit"
-                target="_blank"
-                href="https://webstudio.is/pricing"
-              >
-                Upgrade to Pro
-              </Link>
-            </Flex>
-          </PanelBanner>
-        ) : canAddDomain === false ? (
-          <PanelBanner>
-            <Text variant="regularBold">Free domains limit reached</Text>
-            <Text variant="regular">
-              You have reached the limit of {maxDomainsAllowedPerUser} custom
-              domains on your account.{" "}
-              <Text variant="regularBold" inline>
-                Upgrade to a Pro account
-              </Text>{" "}
-              to add unlimited domains and publish to each domain individually.
-            </Text>
-            <Link
-              className={buttonStyle({ color: "gradient" })}
-              color="contrast"
-              underline="none"
-              href="https://webstudio.is/pricing"
-              target="_blank"
-            >
-              Upgrade
-            </Link>
-          </PanelBanner>
-        ) : null}
         <RadioGroup name="publishDomain">
           <ChangeProjectDomain
             refresh={refreshProject}
@@ -923,6 +926,7 @@ const Content = (props: {
           }}
           onExportClick={props.onExportClick}
         />
+        {hasProPlan === false && <UpgradeBanner />}
         <Publish
           project={project}
           refresh={refreshProject}