diff --git a/apps/studio/src/lib/projects/domains/hosting.ts b/apps/studio/src/lib/projects/domains/hosting.ts
index 4f3a70f13..245ad0cc4 100644
--- a/apps/studio/src/lib/projects/domains/hosting.ts
+++ b/apps/studio/src/lib/projects/domains/hosting.ts
@@ -27,9 +27,6 @@ export class HostingManager {
     ) {
         makeAutoObservable(this);
         this.listenForStateChanges();
-        if (domain.publishedAt) {
-            this.updateState({ status: PublishStatus.PUBLISHED, message: null });
-        }
     }
 
     async listenForStateChanges() {
diff --git a/apps/studio/src/lib/projects/domains/index.ts b/apps/studio/src/lib/projects/domains/index.ts
index 27e31bf05..5097d4ba0 100644
--- a/apps/studio/src/lib/projects/domains/index.ts
+++ b/apps/studio/src/lib/projects/domains/index.ts
@@ -3,7 +3,7 @@ import { HOSTING_DOMAIN, MainChannels } from '@onlook/models/constants';
 import type { GetOwnedDomainsResponse } from '@onlook/models/hosting';
 import { DomainType, type Project } from '@onlook/models/projects';
 import { getValidSubdomain } from '@onlook/utility';
-import { makeAutoObservable, reaction } from 'mobx';
+import { makeAutoObservable } from 'mobx';
 import type { ProjectsManager } from '../index';
 import { HostingManager } from './hosting';
 export class DomainsManager {
@@ -15,42 +15,15 @@ export class DomainsManager {
         private project: Project,
     ) {
         makeAutoObservable(this);
-        this.restore();
-        reaction(
-            () => this.project.domains?.base,
-            () => {
-                if (!this.project.domains?.base) {
-                    this._baseHosting = null;
-                } else {
-                    this._baseHosting = new HostingManager(
-                        this.projectsManager,
-                        this.project,
-                        this.project.domains.base,
-                    );
-                }
-            },
-        );
-        reaction(
-            () => this.project.domains?.custom,
-            () => {
-                if (!this.project.domains?.custom) {
-                    this._customHosting = null;
-                } else {
-                    this._customHosting = new HostingManager(
-                        this.projectsManager,
-                        this.project,
-                        this.project.domains.custom,
-                    );
-                }
-            },
-        );
+        this.setupHostingManagers();
     }
 
     updateProject(project: Project) {
         this.project = project;
+        this.setupHostingManagers();
     }
 
-    restore() {
+    setupHostingManagers() {
         if (!this.project.domains?.base) {
             this._baseHosting = null;
         } else {
diff --git a/apps/studio/src/routes/editor/SettingsModal/Domain/Custom/Verification.tsx b/apps/studio/src/routes/editor/SettingsModal/Domain/Custom/Verification.tsx
index 85c8e027a..7836d2853 100644
--- a/apps/studio/src/routes/editor/SettingsModal/Domain/Custom/Verification.tsx
+++ b/apps/studio/src/routes/editor/SettingsModal/Domain/Custom/Verification.tsx
@@ -43,7 +43,7 @@ export const Verification = observer(() => {
     const [status, setStatus] = useState(VerificationStatus.NO_DOMAIN);
     const [domain, setDomain] = useState('');
     const [records, setRecords] = useState<DNSRecord[]>([]);
-    const [error, setError] = useState<string | null>(null);
+    const [error, setError] = useState<string | null>();
     const [ownedDomains, setOwnedDomains] = useState<string[]>([]);
 
     useEffect(() => {
@@ -129,6 +129,7 @@ export const Verification = observer(() => {
 
         if (!response.success) {
             setError(response.message ?? 'Failed to verify domain');
+            setStatus(VerificationStatus.VERIFYING);
             return;
         }
 
@@ -230,6 +231,11 @@ export const Verification = observer(() => {
                                 onChange={(e) => setDomain(e.target.value)}
                                 placeholder="example.com"
                                 className="bg-background placeholder:text-muted-foreground"
+                                onKeyDown={(e) => {
+                                    if (e.key === 'Enter') {
+                                        setupDomain();
+                                    }
+                                }}
                             />
                             <Button
                                 onClick={() => {
@@ -312,7 +318,7 @@ export const Verification = observer(() => {
                                 </DropdownMenuItem>
                                 <DropdownMenuItem
                                     onClick={removeDomain}
-                                    className="hover:bg-destructive/10 focus:bg-destructive/10 text-destructive cursor-pointer"
+                                    className="hover:bg-destructive/10 focus:bg-destructive/10 text-red-500 cursor-pointer"
                                 >
                                     <Icons.Trash className="mr-2 h-4 w-4" />
                                     Remove Domain
@@ -353,7 +359,7 @@ export const Verification = observer(() => {
             {status === VerificationStatus.VERIFIED && renderVerifiedHeader()}
             {(status === VerificationStatus.VERIFYING || status === VerificationStatus.VERIFIED) &&
                 renderRecords()}
-            {error && <p className="text-sm text-destructive">{error}</p>}
+            {error && <p className="text-sm text-red-500">{error}</p>}
         </div>
     );
 });
diff --git a/apps/studio/src/routes/editor/SettingsModal/Domain/Custom/Verified.tsx b/apps/studio/src/routes/editor/SettingsModal/Domain/Custom/Verified.tsx
index 6a5ce66d7..0f3664bcb 100644
--- a/apps/studio/src/routes/editor/SettingsModal/Domain/Custom/Verified.tsx
+++ b/apps/studio/src/routes/editor/SettingsModal/Domain/Custom/Verified.tsx
@@ -51,7 +51,7 @@ export const Verified = () => {
                             </DropdownMenuItem>
                             <DropdownMenuItem
                                 onClick={removeDomain}
-                                className="hover:bg-destructive/10 focus:bg-destructive/10 text-destructive cursor-pointer"
+                                className="hover:bg-destructive/10 focus:bg-destructive/10 text-red-500 cursor-pointer"
                             >
                                 <Icons.Trash className="mr-2 h-4 w-4" />
                                 Remove Domain
diff --git a/apps/studio/src/routes/editor/SettingsModal/Domain/index.tsx b/apps/studio/src/routes/editor/SettingsModal/Domain/index.tsx
index 4cc92456b..71d7ac35d 100644
--- a/apps/studio/src/routes/editor/SettingsModal/Domain/index.tsx
+++ b/apps/studio/src/routes/editor/SettingsModal/Domain/index.tsx
@@ -3,7 +3,7 @@ import { Separator } from '@onlook/ui/separator';
 import { observer } from 'mobx-react-lite';
 import { useEffect } from 'react';
 import BaseDomain from './Base';
-import { CustomDomain } from './Custom';
+// import { CustomDomain } from './Custom';
 
 export const DomainTab = observer(() => {
     const userManager = useUserManager();
@@ -17,9 +17,28 @@ export const DomainTab = observer(() => {
         <div className="space-y-8">
             <BaseDomain />
             <Separator />
-            <CustomDomain />
+            {/* TODO: Uncomment after freestyle bug is fixed */}
+            {/* <CustomDomain /> */}
+            <Teaser />
         </div>
     );
 });
 
+const Teaser = () => {
+    return (
+        <div className="flex flex-col gap-4">
+            <div className="text-sm flex items-center gap-2">
+                <h2 className="text-lg font-medium">Custom Domain</h2>
+                <span className="bg-blue-500 text-white px-2 py-0.5 rounded-full text-xs">
+                    Coming Soon
+                </span>
+            </div>
+
+            <div className="text-sm text-muted-foreground flex items-center gap-2">
+                <span>Set up your own custom domain for your Onlook apps.</span>
+            </div>
+        </div>
+    );
+};
+
 export default DomainTab;
diff --git a/apps/studio/src/routes/editor/SettingsModal/index.tsx b/apps/studio/src/routes/editor/SettingsModal/index.tsx
index 02d790ff7..9f9afb648 100644
--- a/apps/studio/src/routes/editor/SettingsModal/index.tsx
+++ b/apps/studio/src/routes/editor/SettingsModal/index.tsx
@@ -34,7 +34,7 @@ const SettingsModal = observer(() => {
                         transition={{ duration: 0.15 }}
                         className="fixed inset-0 z-50 flex items-center justify-center pointer-events-none"
                     >
-                        <div className="bg-background border rounded-lg shadow-lg max-w-4xl h-[600px] w-[800px] p-0 pointer-events-auto">
+                        <div className="bg-background border rounded-lg shadow-lg max-w-4xl max-h-screen h-[700px] w-[900px] p-0 pointer-events-auto">
                             <div className="flex flex-col h-full overflow-hidden">
                                 {/* Top bar - fixed height */}
                                 <div className="shrink-0 flex items-center p-6 pb-4">
diff --git a/apps/studio/src/routes/editor/TopBar/Publish/Dropdown/Domain.tsx b/apps/studio/src/routes/editor/TopBar/Publish/Dropdown/Domain.tsx
index 793dbdcd0..ffe3e2b5e 100644
--- a/apps/studio/src/routes/editor/TopBar/Publish/Dropdown/Domain.tsx
+++ b/apps/studio/src/routes/editor/TopBar/Publish/Dropdown/Domain.tsx
@@ -199,7 +199,7 @@ export const DomainSection = observer(
                         </div>
                     )}
                     {state.status === PublishStatus.LOADING && (
-                        <div className="w-full flex flex-col gap-2">
+                        <div className="w-full flex flex-col gap-2 py-1">
                             <p>{state.message}</p>
                             <Progress value={progress} className="w-full" />
                         </div>
diff --git a/apps/studio/src/routes/editor/TopBar/Publish/Dropdown/index.tsx b/apps/studio/src/routes/editor/TopBar/Publish/Dropdown/index.tsx
index cdf63e9dd..8a3715935 100644
--- a/apps/studio/src/routes/editor/TopBar/Publish/Dropdown/index.tsx
+++ b/apps/studio/src/routes/editor/TopBar/Publish/Dropdown/index.tsx
@@ -33,13 +33,15 @@ export const PublishDropdown = observer(
                     type={DomainType.BASE}
                     state={baseDomainState}
                 />
-                <Separator />
+
+                {/* TODO: Uncomment after freestyle bug is fixed */}
+                {/* <Separator />
                 <DomainSection
                     setIsOpen={setIsOpen}
                     domain={customDomain}
                     type={DomainType.CUSTOM}
                     state={customDomainState}
-                />
+                /> */}
                 <Separator />
                 <AdvancedSettingsSection setIsOpen={setIsOpen} />
             </div>
diff --git a/apps/studio/src/routes/editor/TopBar/Publish/TriggerButton.tsx b/apps/studio/src/routes/editor/TopBar/Publish/TriggerButton.tsx
index 5309cb2d4..a74d4780e 100644
--- a/apps/studio/src/routes/editor/TopBar/Publish/TriggerButton.tsx
+++ b/apps/studio/src/routes/editor/TopBar/Publish/TriggerButton.tsx
@@ -35,7 +35,7 @@ export const PublishButton = observer(() => {
     const status: PublishStatus = computeStatus();
 
     let colorClasses = 'border-input bg-background hover:bg-background-onlook text-foreground';
-    let icon: React.ReactNode | null = null;
+    let icon: React.ReactNode | null = <Icons.Globe className="mr-2 h-4 w-4" />;
     let text = 'Publish';
 
     if (status === PublishStatus.PUBLISHED) {