diff --git a/apps/app/src/app/[locale]/(app)/(dashboard)/[orgId]/implementation/wizard/[wizardId]/actions/updateWizard.ts b/apps/app/src/app/[locale]/(app)/(dashboard)/[orgId]/implementation/wizard/[wizardId]/actions/updateWizard.ts
index 2cb4b95a65..b193ac11fc 100644
--- a/apps/app/src/app/[locale]/(app)/(dashboard)/[orgId]/implementation/wizard/[wizardId]/actions/updateWizard.ts
+++ b/apps/app/src/app/[locale]/(app)/(dashboard)/[orgId]/implementation/wizard/[wizardId]/actions/updateWizard.ts
@@ -53,31 +53,26 @@ export const updateWizard = async ({
 		where: { organizationId: orgId },
 	});
 
-	if (!onboarding) {
-		await db.onboarding.create({
-			data: {
-				organizationId: orgId,
-				[dbColumn]: {
-					version: parsed.version || companyDetailsLatestVersion,
-					isCompleted: parsed.isCompleted,
-					data: parsed.data,
-				},
+	await db.onboarding.upsert({
+		where: {
+			organizationId: orgId,
+		},
+		create: {
+			organizationId: orgId,
+			[dbColumn]: {
+				version: parsed.version || companyDetailsLatestVersion,
+				isCompleted: parsed.isCompleted,
+				data: parsed.data,
 			},
-		});
-	} else {
-		await db.onboarding.update({
-			where: {
-				organizationId: orgId,
+		},
+		update: {
+			[dbColumn]: {
+				version: parsed.version || companyDetailsLatestVersion,
+				isCompleted: parsed.isCompleted,
+				data: parsed.data,
 			},
-			data: {
-				[dbColumn]: {
-					version: parsed.version || companyDetailsLatestVersion,
-					isCompleted: parsed.isCompleted,
-					data: parsed.data,
-				},
-			},
-		});
-	}
+		},
+	});
 
 	revalidatePath(`/${orgId}/implementation/wizard/${wizardId}`);
 
diff --git a/apps/app/src/app/[locale]/(app)/(dashboard)/[orgId]/implementation/wizard/[wizardId]/components/CompanyDetailsWizardForm.tsx b/apps/app/src/app/[locale]/(app)/(dashboard)/[orgId]/implementation/wizard/[wizardId]/components/CompanyDetailsWizardForm.tsx
index bfd61320db..ee230c0fa2 100644
--- a/apps/app/src/app/[locale]/(app)/(dashboard)/[orgId]/implementation/wizard/[wizardId]/components/CompanyDetailsWizardForm.tsx
+++ b/apps/app/src/app/[locale]/(app)/(dashboard)/[orgId]/implementation/wizard/[wizardId]/components/CompanyDetailsWizardForm.tsx
@@ -29,14 +29,7 @@ import {
 	SelectValue,
 } from "@comp/ui/select";
 import { useParams, useRouter } from "next/navigation";
-import {
-	Breadcrumb,
-	BreadcrumbItem,
-	BreadcrumbLink,
-	BreadcrumbPage,
-	BreadcrumbSeparator,
-} from "@comp/ui/breadcrumb";
-import PageWithBreadcrumb from "@/components/pages/PageWithBreadcrumb";
+import { Card, CardContent, CardHeader, CardTitle } from "@comp/ui/card";
 
 const steps = [
 	"Company identity",
@@ -220,14 +213,14 @@ export const CompanyDetailsWizardForm = ({
 					return (
 						<div className="flex flex-col gap-2">
 							<Label htmlFor="companyWebsite">
-								Public website URL
+								Website
 							</Label>
 							<Input
 								id="companyWebsite"
-								type="url"
 								value={displayValue}
 								onChange={handleChange}
 								placeholder="acme.com"
+								prefix="https://"
 							/>
 							{errors.companyWebsite && (
 								<span className="text-destructive text-sm">
@@ -274,9 +267,9 @@ export const CompanyDetailsWizardForm = ({
 								);
 								return found
 									? {
-											value: found.value,
-											label: found.label,
-										}
+										value: found.value,
+										label: found.label,
+									}
 									: { value: v, label: v };
 							})}
 							placeholder="Select or add one..."
@@ -592,16 +585,24 @@ export const CompanyDetailsWizardForm = ({
 					}
 				}}
 			>
-				<WizardStepper steps={steps} currentStep={step} />
-				<WizardQuestion
-					step={step}
-					totalSteps={steps.length}
-					question={questionNodes[step]}
-					onNext={handleNext}
-					onBack={handleBack}
-					nextDisabled={false}
-					showBack={step > 0}
-				/>
+				<Card>
+					<CardHeader>
+						<CardTitle>
+							<WizardStepper steps={steps} currentStep={step} />
+						</CardTitle>
+					</CardHeader>
+					<CardContent>
+						<WizardQuestion
+							step={step}
+							totalSteps={steps.length}
+							question={questionNodes[step]}
+							onNext={handleNext}
+							onBack={handleBack}
+							nextDisabled={false}
+							showBack={step > 0}
+						/>
+					</CardContent>
+				</Card>
 			</form>
 		</FormProvider>
 	);
diff --git a/apps/app/src/app/[locale]/(app)/(dashboard)/[orgId]/implementation/wizard/[wizardId]/components/WizardQuestion.tsx b/apps/app/src/app/[locale]/(app)/(dashboard)/[orgId]/implementation/wizard/[wizardId]/components/WizardQuestion.tsx
index 53f42546cb..6b9fa2c23d 100644
--- a/apps/app/src/app/[locale]/(app)/(dashboard)/[orgId]/implementation/wizard/[wizardId]/components/WizardQuestion.tsx
+++ b/apps/app/src/app/[locale]/(app)/(dashboard)/[orgId]/implementation/wizard/[wizardId]/components/WizardQuestion.tsx
@@ -35,8 +35,8 @@ export function WizardQuestion({
 						</Button>
 					)}
 				</div>
-				<div className="flex-1 flex justify-center">
-					<span className="text-muted-foreground text-sm select-none">
+				<div className="flex items-center justify-center">
+					<span className="text-muted-foreground text-xs select-none">
 						Step {step + 1} / {totalSteps}
 					</span>
 				</div>
diff --git a/apps/app/src/app/[locale]/(app)/(dashboard)/[orgId]/implementation/wizard/[wizardId]/components/WizardStepper.tsx b/apps/app/src/app/[locale]/(app)/(dashboard)/[orgId]/implementation/wizard/[wizardId]/components/WizardStepper.tsx
index fc8e09afba..6762b96c2d 100644
--- a/apps/app/src/app/[locale]/(app)/(dashboard)/[orgId]/implementation/wizard/[wizardId]/components/WizardStepper.tsx
+++ b/apps/app/src/app/[locale]/(app)/(dashboard)/[orgId]/implementation/wizard/[wizardId]/components/WizardStepper.tsx
@@ -7,8 +7,8 @@ interface WizardStepperProps {
 
 export function WizardStepper({ steps, currentStep }: WizardStepperProps) {
 	return (
-		<div className="mb-8">
-			<div className="text-3xl font-semibold">{steps[currentStep]}</div>
-		</div>
+		<div>
+			<div>{steps[currentStep]}</div>
+		</div >
 	);
 }
diff --git a/apps/app/src/app/[locale]/(app)/(dashboard)/[orgId]/settings/trust-portal/components/TrustPortalSwitch.tsx b/apps/app/src/app/[locale]/(app)/(dashboard)/[orgId]/settings/trust-portal/components/TrustPortalSwitch.tsx
index ccf372cf7d..a37eb5fca9 100644
--- a/apps/app/src/app/[locale]/(app)/(dashboard)/[orgId]/settings/trust-portal/components/TrustPortalSwitch.tsx
+++ b/apps/app/src/app/[locale]/(app)/(dashboard)/[orgId]/settings/trust-portal/components/TrustPortalSwitch.tsx
@@ -1,7 +1,7 @@
 "use client"
 
 import { useI18n } from "@/locales/client"
-import { Card, CardContent, CardFooter, CardHeader, CardTitle } from "@comp/ui/card"
+import { Card, CardContent, CardDescription, CardFooter, CardHeader, CardTitle } from "@comp/ui/card"
 import { Form, FormControl, FormField, FormItem, FormLabel } from "@comp/ui/form"
 import { Switch } from "@comp/ui/switch"
 import { zodResolver } from "@hookform/resolvers/zod"
@@ -11,9 +11,8 @@ import { toast } from "sonner"
 import { z } from "zod"
 import { trustPortalSwitchAction } from "../actions/trust-portal-switch"
 import Link from "next/link"
-import { ExternalLink, Loader2 } from "lucide-react"
+import { ExternalLink } from "lucide-react"
 import { Input } from "@comp/ui/input"
-import { Button } from "@comp/ui/button"
 import { Select, SelectContent, SelectItem, SelectTrigger, SelectValue } from "@comp/ui/select"
 import { updateTrustPortalFrameworks } from "../actions/update-trust-portal-frameworks"
 import { SOC2, ISO27001, GDPR } from "./logos"
@@ -96,14 +95,12 @@ export function TrustPortalSwitch({
 
     const portalUrl = domainVerified ? `https://${domain}` : `https://trust.inc/${slug}`
 
-    // --- Auto-save helpers ---
     const lastSaved = useRef<{ [key: string]: string | boolean }>({
         contactEmail: contactEmail ?? "",
         friendlyUrl: friendlyUrl ?? "",
         enabled: enabled,
     })
 
-    // Save handler
     const autoSave = useCallback(
         async (field: string, value: any) => {
             const current = form.getValues()
@@ -116,11 +113,9 @@ export function TrustPortalSwitch({
         [form, onSubmit]
     )
 
-    // --- Field Handlers ---
-    // Contact Email
     const [contactEmailValue, setContactEmailValue] = useState(form.getValues("contactEmail") || "")
     const debouncedContactEmail = useDebounce(contactEmailValue, 500)
-    // Debounced auto-save
+
     useEffect(() => {
         if (
             debouncedContactEmail !== undefined &&
@@ -129,9 +124,8 @@ export function TrustPortalSwitch({
             form.setValue("contactEmail", debouncedContactEmail)
             autoSave("contactEmail", debouncedContactEmail)
         }
-        // eslint-disable-next-line react-hooks/exhaustive-deps
     }, [debouncedContactEmail])
-    // On blur immediate save
+
     const handleContactEmailBlur = useCallback(
         (e: React.FocusEvent<HTMLInputElement>) => {
             const value = e.target.value
@@ -141,11 +135,10 @@ export function TrustPortalSwitch({
         [form, autoSave]
     )
 
-    // Friendly URL
     const [friendlyUrlValue, setFriendlyUrlValue] = useState(form.getValues("friendlyUrl") || "")
     const debouncedFriendlyUrl = useDebounce(friendlyUrlValue, 500)
     const [friendlyUrlStatus, setFriendlyUrlStatus] = useState<"idle" | "checking" | "available" | "unavailable">("idle")
-    // Check availability on debounce
+
     useEffect(() => {
         if (!debouncedFriendlyUrl || debouncedFriendlyUrl === (friendlyUrl ?? "")) {
             setFriendlyUrlStatus("idle")
@@ -153,13 +146,12 @@ export function TrustPortalSwitch({
         }
         setFriendlyUrlStatus("checking")
         checkFriendlyUrl.execute({ friendlyUrl: debouncedFriendlyUrl, orgId })
-        // eslint-disable-next-line react-hooks/exhaustive-deps
     }, [debouncedFriendlyUrl, orgId, friendlyUrl])
     useEffect(() => {
         if (checkFriendlyUrl.status === "executing") return
         if (checkFriendlyUrl.result?.data?.isAvailable === true) {
             setFriendlyUrlStatus("available")
-            // Auto-save if available and changed
+
             if (debouncedFriendlyUrl !== lastSaved.current.friendlyUrl) {
                 form.setValue("friendlyUrl", debouncedFriendlyUrl)
                 autoSave("friendlyUrl", debouncedFriendlyUrl)
@@ -167,9 +159,8 @@ export function TrustPortalSwitch({
         } else if (checkFriendlyUrl.result?.data?.isAvailable === false) {
             setFriendlyUrlStatus("unavailable")
         }
-        // eslint-disable-next-line react-hooks/exhaustive-deps
     }, [checkFriendlyUrl.status, checkFriendlyUrl.result])
-    // On blur immediate save if available
+
     const handleFriendlyUrlBlur = useCallback(
         (e: React.FocusEvent<HTMLInputElement>) => {
             const value = e.target.value
@@ -181,7 +172,6 @@ export function TrustPortalSwitch({
         [form, autoSave, friendlyUrlStatus]
     )
 
-    // Enabled switch immediate save
     const handleEnabledChange = useCallback(
         (val: boolean) => {
             form.setValue("enabled", val)
@@ -230,7 +220,7 @@ export function TrustPortalSwitch({
                         {form.watch("enabled") && (
                             <div className="pt-2">
                                 <h3 className="text-sm font-medium mb-4">Trust Portal Settings</h3>
-                                <div className="grid grid-cols-1 lg:grid-cols-2 gap-x-6 border rounded-md p-4">
+                                <div className="grid grid-cols-1 lg:grid-cols-2 gap-x-4">
                                     <FormField
                                         control={form.control}
                                         name="friendlyUrl"
@@ -305,12 +295,13 @@ export function TrustPortalSwitch({
                             <div className="">
                                 {/* Compliance Frameworks Section */}
                                 <div>
-                                    <h3 className="text-sm font-medium mb-4">Compliance Frameworks</h3>
-                                    <div className="grid grid-cols-1 lg:grid-cols-2 gap-4">
+                                    <h3 className="text-sm font-medium mb-2">Compliance Frameworks</h3>
+                                    <p className="text-sm text-muted-foreground mb-4">Share the frameworks your organization is compliant with or working towards.</p>
+                                    <div className="grid grid-cols-1 lg:grid-cols-2 xl:grid-cols-3 gap-4">
                                         {/* SOC 2 */}
                                         <ComplianceFramework
                                             title="SOC 2"
-                                            description="Show your SOC 2 compliance status"
+                                            description="A compliance framework focused on data security, availability, and confidentiality."
                                             isEnabled={soc2}
                                             status={soc2Status}
                                             onStatusChange={async (value) => {
@@ -339,7 +330,7 @@ export function TrustPortalSwitch({
                                         {/* ISO 27001 */}
                                         <ComplianceFramework
                                             title="ISO 27001"
-                                            description="Show your ISO 27001 compliance status"
+                                            description="An international standard for managing information security systems."
                                             isEnabled={iso27001}
                                             status={iso27001Status}
                                             onStatusChange={async (value) => {
@@ -368,7 +359,7 @@ export function TrustPortalSwitch({
                                         {/* GDPR */}
                                         <ComplianceFramework
                                             title="GDPR"
-                                            description="Show your GDPR compliance status"
+                                            description="A European regulation that governs personal data protection and user privacy."
                                             isEnabled={gdpr}
                                             status={gdprStatus}
                                             onStatusChange={async (value) => {
@@ -399,15 +390,6 @@ export function TrustPortalSwitch({
                             </div>
                         )}
                     </CardContent>
-                    <CardFooter className="flex justify-between px-6 py-4">
-                        {enabled ? (
-                            <Link href={portalUrl} target="_blank" className="text-xs text-muted-foreground hover:text-foreground">
-                                Click here to visit your trust portal.
-                            </Link>
-                        ) : (
-                            <p className="text-xs text-muted-foreground">Trust portal is currently disabled.</p>
-                        )}
-                    </CardFooter>
                 </Card>
             </form>
         </Form>
@@ -430,31 +412,65 @@ function ComplianceFramework({
     onStatusChange: (value: string) => Promise<void>
     onToggle: (checked: boolean) => Promise<void>
 }) {
-    const logo = title === "SOC 2" ? <SOC2 className="w-10 h-10" /> : title === "ISO 27001" ? <ISO27001 className="w-10 h-10" /> : <GDPR className="w-10 h-10" />
+    const logo = title === "SOC 2" ? <SOC2 className="w-16 h-16" /> : title === "ISO 27001" ? <ISO27001 className="w-16 h-16" /> : <GDPR className="w-16 h-16" />
 
     return (
-        <div className="flex space-y-2 sm:space-y-0 flex-row items-center justify-between rounded-md border p-4">
-            <div className="space-y-0.5">
-                <div className="flex items-center gap-2">
-                    {logo}
-                    <h4 className="text-sm font-medium">{title}</h4>
-                </div>
-            </div>
-            <div className="flex items-center gap-3">
-                {isEnabled && (
-                    <Select defaultValue={status} onValueChange={onStatusChange}>
-                        <SelectTrigger className="w-32">
-                            <SelectValue placeholder="Select status" />
-                        </SelectTrigger>
-                        <SelectContent>
-                            <SelectItem value="started">Started</SelectItem>
-                            <SelectItem value="in_progress">In Progress</SelectItem>
-                            <SelectItem value="compliant">Compliant</SelectItem>
-                        </SelectContent>
-                    </Select>
-                )}
-                <Switch checked={isEnabled} onCheckedChange={onToggle} />
-            </div>
-        </div>
+        <>
+            <Card className="border rounded-lg">
+                <CardHeader className="pb-2">
+                    <div className="flex items-center gap-4">
+                        <div className="flex-shrink-0">{logo}</div>
+                        <div>
+                            <CardTitle className="text-lg font-semibold leading-tight">{title}</CardTitle>
+                            <CardDescription className="mt-1 text-sm text-muted-foreground line-clamp-3">{description}</CardDescription>
+                        </div>
+                    </div>
+                </CardHeader>
+                <div className="border-t mt-4" />
+                <CardContent className="pt-4">
+                    <div className="flex flex-row items-center justify-between gap-6">
+                        <div className="flex-1 min-w-0">
+                            {isEnabled ? (
+                                <Select defaultValue={status} onValueChange={onStatusChange}>
+                                    <SelectTrigger className="text-base font-medium min-w-[180px]">
+                                        <SelectValue
+                                            placeholder="Select status"
+                                            className="w-auto"
+                                        />
+                                    </SelectTrigger>
+                                    <SelectContent>
+                                        <SelectItem value="started">
+                                            <span className="flex items-center gap-2">
+                                                <span className="inline-block w-4 h-4 rounded-sm bg-gray-300" />
+                                                Started
+                                            </span>
+                                        </SelectItem>
+                                        <SelectItem value="in_progress">
+                                            <span className="flex items-center gap-2">
+                                                <span className="inline-block w-4 h-4 rounded-sm bg-yellow-400" />
+                                                In Progress
+                                            </span>
+                                        </SelectItem>
+                                        <SelectItem value="compliant">
+                                            <span className="flex items-center gap-2">
+                                                <span className="inline-block w-4 h-4 rounded-sm bg-green-500" />
+                                                Compliant
+                                            </span>
+                                        </SelectItem>
+                                    </SelectContent>
+                                </Select>
+                            ) : (
+                                <div className="flex items-center gap-2">
+                                    <span className="text-sm font-medium">Disabled</span>
+                                </div>
+                            )}
+                        </div>
+                        <div className="flex-shrink-0 pl-2">
+                            <Switch checked={isEnabled} onCheckedChange={onToggle} />
+                        </div>
+                    </div>
+                </CardContent>
+            </Card>
+        </>
     )
 }
diff --git a/packages/ui/src/components/input.tsx b/packages/ui/src/components/input.tsx
index 35fc1aa294..70535159f6 100644
--- a/packages/ui/src/components/input.tsx
+++ b/packages/ui/src/components/input.tsx
@@ -16,22 +16,9 @@ const Input = React.forwardRef<HTMLInputElement, InputProps>(
 
 		return (
 			<div className={cn("relative w-full", className)}>
-				{isUrl && (
+				{isPrefix && props.prefix && (
 					<span
-						className="absolute left-0 top-0 h-full flex items-center px-3 text-muted-foreground select-none text-base md:text-sm border-r-1 border-input bg-foreground/5 cursor-default font-semibold"
-						style={{
-							width: adornmentWidth,
-							zIndex: 2,
-							borderTopLeftRadius: "0.125rem",
-							borderBottomLeftRadius: "0.125rem",
-						}}
-					>
-						https://
-					</span>
-				)}
-				{isPrefix && (
-					<span
-						className="absolute left-0 top-0 h-full flex items-center px-4 text-muted-foreground select-none text-base md:text-sm border-r-1 border-input bg-foreground/5 cursor-default font-semibold"
+						className="absolute left-0 top-0 h-full flex items-center px-4 text-muted-foreground select-none text-sm md:text-sm border-r-1 border-input bg-foreground/5 cursor-default font-medium"
 						style={{
 							width: adornmentWidth,
 							zIndex: 2,
@@ -57,8 +44,7 @@ const Input = React.forwardRef<HTMLInputElement, InputProps>(
 						"placeholder:text-muted-foreground file:border-0 file:bg-transparent file:text-sm file:font-medium file:text-foreground",
 						"focus-visible:outline-none focus-visible:ring-1 focus-visible:ring-ring focus-visible:ring-offset-0",
 						"disabled:cursor-not-allowed disabled:opacity-50 md:text-sm",
-						isUrl ? "pl-[80px]" : leftIcon ? "pl-[36px]" : "px-3",
-						!isUrl && isPrefix ? "pl-[90px]" : leftIcon ? "pl-[36px]" : "px-3",
+						isPrefix ? "pl-[90px]" : leftIcon ? "pl-[36px]" : "px-3",
 					)}
 					ref={ref}
 					{...props}
diff --git a/packages/ui/src/components/select.tsx b/packages/ui/src/components/select.tsx
index fda7c5dbb3..8ef7fec4b4 100644
--- a/packages/ui/src/components/select.tsx
+++ b/packages/ui/src/components/select.tsx
@@ -2,7 +2,7 @@
 
 import * as React from "react";
 import * as SelectPrimitive from "@radix-ui/react-select";
-import { Check, ChevronDown, ChevronUp } from "lucide-react";
+import { Check, ChevronDown, ChevronsUpDown, ChevronUp } from "lucide-react";
 
 import { cn } from "../utils";
 
@@ -26,7 +26,7 @@ const SelectTrigger = React.forwardRef<
 	>
 		{children}
 		<SelectPrimitive.Icon asChild>
-			<ChevronDown className="h-4 w-4 opacity-50" />
+			<ChevronsUpDown className="h-4 w-4 opacity-50" />
 		</SelectPrimitive.Icon>
 	</SelectPrimitive.Trigger>
 ));
@@ -77,7 +77,7 @@ const SelectContent = React.forwardRef<
 			className={cn(
 				"relative z-50 max-h-[--radix-select-content-available-height] min-w-[8rem] overflow-y-auto overflow-x-hidden rounded-sm border bg-popover text-popover-foreground shadow-md data-[state=open]:animate-in data-[state=closed]:animate-out data-[state=closed]:fade-out-0 data-[state=open]:fade-in-0 data-[state=closed]:zoom-out-95 data-[state=open]:zoom-in-95 data-[side=bottom]:slide-in-from-top-2 data-[side=left]:slide-in-from-right-2 data-[side=right]:slide-in-from-left-2 data-[side=top]:slide-in-from-bottom-2 origin-[--radix-select-content-transform-origin]",
 				position === "popper" &&
-					"data-[side=bottom]:translate-y-1 data-[side=left]:-translate-x-1 data-[side=right]:translate-x-1 data-[side=top]:-translate-y-1",
+				"data-[side=bottom]:translate-y-1 data-[side=left]:-translate-x-1 data-[side=right]:translate-x-1 data-[side=top]:-translate-y-1",
 				className,
 			)}
 			position={position}
@@ -88,7 +88,7 @@ const SelectContent = React.forwardRef<
 				className={cn(
 					"p-1",
 					position === "popper" &&
-						"h-[var(--radix-select-trigger-height)] w-full min-w-[var(--radix-select-trigger-width)]",
+					"h-[var(--radix-select-trigger-height)] w-full min-w-[var(--radix-select-trigger-width)]",
 				)}
 			>
 				{children}