diff --git a/bun.lockb b/bun.lockb
index dce45b0b..7a133c97 100755
Binary files a/bun.lockb and b/bun.lockb differ
diff --git a/web/components/routes/link/form/manage.tsx b/web/components/routes/link/form/manage.tsx
index 1dc01fb9..7c549971 100644
--- a/web/components/routes/link/form/manage.tsx
+++ b/web/components/routes/link/form/manage.tsx
@@ -121,20 +121,24 @@ interface LinkFormProps extends React.ComponentPropsWithoutRef<"form"> {
 }
 
 const LinkForm = React.forwardRef<HTMLFormElement, LinkFormProps>(({ onSuccess, onCancel, personalLink }, ref) => {
-	const selectedLink = useCoState(PersonalLink, personalLink?.id)
 	const [isFetching, setIsFetching] = useState(false)
 	const { me } = useAccount()
 	const form = useForm<LinkFormValues>({
 		resolver: zodResolver(createLinkSchema),
-		defaultValues: DEFAULT_FORM_VALUES
+		defaultValues: {
+			...DEFAULT_FORM_VALUES,
+			isLink: true
+		}
 	})
-
+	const selectedLink = useCoState(PersonalLink, personalLink?.id)
 	const title = form.watch("title")
+	const [inputValue, setInputValue] = useState("")
 	const [originalLink, setOriginalLink] = useState<string>("")
-	const [linkEntered, setLinkEntered] = useState(false)
+	const [linkValidation, setLinkValidation] = useState<string | null>(null)
+	const [invalidLink, setInvalidLink] = useState(false)
+	const [showLink, setShowLink] = useState(false)
 	const [debouncedText, setDebouncedText] = useState<string>("")
 	useDebounce(() => setDebouncedText(title), 300, [title])
-
 	const [showStatusOptions, setShowStatusOptions] = useState(false)
 	const [selectedStatus, setSelectedStatus] = useState<string | null>(null)
 
@@ -166,11 +170,35 @@ const LinkForm = React.forwardRef<HTMLFormElement, LinkFormProps>(({ onSuccess,
 		}
 	}, [selectedLink, form])
 
+	const changeInput = (e: React.ChangeEvent<HTMLInputElement>) => {
+		const value = e.target.value
+		setInputValue(value)
+		form.setValue("title", value)
+	}
+
+	const pressEnter = (e: React.KeyboardEvent<HTMLInputElement>) => {
+		if (e.key === "Enter" && !showLink) {
+			e.preventDefault()
+			const trimmedValue = inputValue.trim().toLowerCase()
+			if (LibIsUrl(trimmedValue)) {
+				setShowLink(true)
+				setInvalidLink(false)
+				setLinkValidation(trimmedValue)
+				setInputValue(trimmedValue)
+				form.setValue("title", trimmedValue)
+			} else {
+				setInvalidLink(true)
+				setShowLink(true)
+				setLinkValidation(null)
+			}
+		}
+	}
+
 	useEffect(() => {
 		const fetchMetadata = async (url: string) => {
 			setIsFetching(true)
 			try {
-				const res = await fetch(`/api/metadata?url=${encodeURIComponent(url)}`, { cache: "no-store" })
+				const res = await fetch(`/api/metadata?url=${encodeURIComponent(url)}`, { cache: "force-cache" })
 				if (!res.ok) throw new Error("Failed to fetch metadata")
 				const data = await res.json()
 				form.setValue("isLink", true)
@@ -188,19 +216,10 @@ const LinkForm = React.forwardRef<HTMLFormElement, LinkFormProps>(({ onSuccess,
 				setIsFetching(false)
 			}
 		}
-
-		const lowerText = debouncedText.toLowerCase()
-		if (linkEntered && LibIsUrl(lowerText)) {
-			fetchMetadata(ensureUrlProtocol(lowerText))
+		if (showLink && !invalidLink && LibIsUrl(form.getValues("title").toLowerCase())) {
+			fetchMetadata(ensureUrlProtocol(form.getValues("title").toLowerCase()))
 		}
-	}, [debouncedText, form, linkEntered])
-
-	const handleKeyDown = (e: React.KeyboardEvent<HTMLInputElement>) => {
-		if (e.key === "Enter" && LibIsUrl(e.currentTarget.value.toLowerCase())) {
-			e.preventDefault()
-			setLinkEntered(true)
-		}
-	}
+	}, [showLink, invalidLink, form])
 
 	const onSubmit = (values: LinkFormValues) => {
 		if (isFetching) return
@@ -221,11 +240,9 @@ const LinkForm = React.forwardRef<HTMLFormElement, LinkFormProps>(({ onSuccess,
 				selectedLink.description = values.description ?? ""
 				selectedLink.isLink = values.isLink
 
-				if (selectedLink.meta) {
-					Object.assign(selectedLink.meta, values.meta)
+				if (values.isLink && values.meta) {
+					linkMetadata = LinkMetadata.create(values.meta, { owner: me._owner })
 				}
-
-				// toast.success("Todo updated")
 			} else {
 				const newPersonalLink = PersonalLink.create(
 					{
@@ -252,26 +269,26 @@ const LinkForm = React.forwardRef<HTMLFormElement, LinkFormProps>(({ onSuccess,
 		}
 	}
 
-	const handleCancel: () => void = () => {
+	const undoEditing: () => void = () => {
 		form.reset(DEFAULT_FORM_VALUES)
 		onCancel?.()
 	}
 
 	return (
 		<div className="p-3 transition-all">
-			<div className="bg-muted/50 rounded-md border">
+			<div className="rounded-md border bg-muted/50">
 				<Form {...form}>
 					<form onSubmit={form.handleSubmit(onSubmit)} className="relative min-w-0 flex-1" ref={ref}>
 						<div className="flex flex-row p-3">
 							<div className="flex flex-auto flex-col gap-1.5">
 								<div className="flex flex-row items-start justify-between">
 									<div className="flex grow flex-row items-center gap-1.5">
-										<Button
+										{/* <Button
 											type="button"
 											variant="secondary"
 											size="icon"
 											aria-label="Choose icon"
-											className="text-primary/60 size-7"
+											className="size-7 text-primary/60"
 										>
 											{form.watch("isLink") ? (
 												<Image
@@ -284,7 +301,7 @@ const LinkForm = React.forwardRef<HTMLFormElement, LinkFormProps>(({ onSuccess,
 											) : (
 												<BoxIcon size={16} />
 											)}
-										</Button>
+										</Button> */}
 
 										<FormField
 											control={form.control}
@@ -295,45 +312,36 @@ const LinkForm = React.forwardRef<HTMLFormElement, LinkFormProps>(({ onSuccess,
 													<FormControl>
 														<Input
 															{...field}
+															value={inputValue}
 															autoComplete="off"
 															maxLength={100}
 															autoFocus
 															placeholder="Paste a link or write a link"
-															className="placeholder:text-primary/40 h-6 border-none p-1.5 font-medium focus-visible:outline-none focus-visible:ring-0"
-															onKeyDown={handleKeyDown}
+															className={cn(
+																"h-6 border-none p-1.5 font-medium placeholder:text-primary/40 focus-visible:outline-none focus-visible:ring-0",
+																invalidLink ? "text-red-500" : ""
+															)}
+															onKeyDown={pressEnter}
+															onChange={changeInput}
 														/>
 													</FormControl>
 												</FormItem>
 											)}
 										/>
-										<span className="mr-5 max-w-[200px] truncate text-xs text-white/60">
-											{linkEntered
-												? originalLink
-												: LibIsUrl(form.watch("title").toLowerCase())
-													? 'Press "Enter" to confirm URL'
-													: ""}
-										</span>
+										{showLink && (
+											<span className={cn("mr-5 max-w-[200px] truncate text-xs", invalidLink ? "text-red-500" : "")}>
+												{invalidLink ? "Only links are allowed" : linkValidation || originalLink || ""}
+											</span>
+										)}
 									</div>
 
 									<div className="flex min-w-0 shrink-0 cursor-pointer select-none flex-row">
 										<DropdownMenu>
-											<DropdownMenuTrigger asChild>
-												{/* <Button
-                            size="icon"
-                            type="button"
-                            variant="ghost"
-                            className="size-7 gap-x-2 text-sm"
-                          >
-                            <EllipsisIcon
-                              size={16}
-                              className="text-primary/60"
-                            />
-                          </Button> */}
-											</DropdownMenuTrigger>
+											<DropdownMenuTrigger asChild></DropdownMenuTrigger>
 											<DropdownMenuContent align="end">
 												<DropdownMenuLabel>Actions</DropdownMenuLabel>
 												<DropdownMenuItem className="group">
-													<Trash2Icon size={16} className="text-destructive mr-2 group-hover:text-red-500" />
+													<Trash2Icon size={16} className="mr-2 text-destructive group-hover:text-red-500" />
 													<span>Delete</span>
 												</DropdownMenuItem>
 											</DropdownMenuContent>
@@ -393,7 +401,7 @@ const LinkForm = React.forwardRef<HTMLFormElement, LinkFormProps>(({ onSuccess,
 														{...field}
 														autoComplete="off"
 														placeholder="Description (optional)"
-														className="placeholder:text-primary/40 min-h-[24px] resize-none overflow-y-auto border-none p-1.5 text-xs font-medium shadow-none focus-visible:outline-none focus-visible:ring-0"
+														className="min-h-[24px] resize-none overflow-y-auto border-none p-1.5 text-xs font-medium shadow-none placeholder:text-primary/40 focus-visible:outline-none focus-visible:ring-0"
 														onInput={e => {
 															const target = e.target as HTMLTextAreaElement
 															target.style.height = "auto"
@@ -416,10 +424,10 @@ const LinkForm = React.forwardRef<HTMLFormElement, LinkFormProps>(({ onSuccess,
 							</div>
 							<div className="flex w-auto items-center justify-end">
 								<div className="flex min-w-0 shrink-0 cursor-pointer select-none flex-row gap-x-2">
-									<Button size="sm" type="button" variant="ghost" onClick={handleCancel}>
+									<Button size="sm" type="button" variant="ghost" onClick={undoEditing}>
 										Cancel
 									</Button>
-									<Button size="sm" disabled={isFetching}>
+									<Button size="sm" type="submit" disabled={isFetching}>
 										Save
 									</Button>
 								</div>
diff --git a/web/components/routes/link/form/schema.ts b/web/components/routes/link/form/schema.ts
index ace8a90d..1ed6b98b 100644
--- a/web/components/routes/link/form/schema.ts
+++ b/web/components/routes/link/form/schema.ts
@@ -1,16 +1,12 @@
 import { z } from "zod"
+import { isUrl } from "@/lib/utils"
 
 export const createLinkSchema = z.object({
-	title: z
-		.string({
-			message: "Please enter a valid title"
-		})
-		.min(1, {
-			message: "Please enter a valid title"
-		}),
+	title: z.string().min(1, { message: "Title can't be empty" }),
+	originalUrl: z.string().refine(isUrl, { message: "Only links are allowed" }),
 	description: z.string().optional(),
 	topic: z.string().optional(),
-	isLink: z.boolean().default(false),
+	isLink: z.boolean().default(true),
 	meta: z
 		.object({
 			url: z.string(),
diff --git a/web/components/routes/link/header.tsx b/web/components/routes/link/header.tsx
index 879ee29a..339376ef 100644
--- a/web/components/routes/link/header.tsx
+++ b/web/components/routes/link/header.tsx
@@ -25,7 +25,6 @@ export const LinkHeader = () => {
 	return (
 		<>
 			<ContentHeader className="p-4">
-				{/* Toggle and Title */}
 				<div className="flex min-w-0 shrink-0 items-center gap-1.5">
 					<SidebarToggleButton />
 					<div className="flex min-h-0 items-center">
@@ -50,18 +49,25 @@ export const LinkHeader = () => {
 }
 
 const Tabs = () => {
+	const [activeTab, setActiveTab] = React.useState(TABS[0])
+
 	return (
 		<div className="bg-secondary/50 flex items-baseline overflow-x-hidden rounded-md">
 			{TABS.map(tab => (
-				<TabItem key={tab} url="#" label={tab} />
+				<TabItem key={tab} url="#" label={tab} isActive={activeTab === tab} onClick={() => setActiveTab(tab)} />
 			))}
 		</div>
 	)
 }
 
-const TabItem = ({ url, label }: TabItemProps) => {
-	const [isActive, setIsActive] = React.useState(false)
+interface TabItemProps {
+	url: string
+	label: string
+	isActive: boolean
+	onClick: () => void
+}
 
+const TabItem = ({ url, label, isActive, onClick }: TabItemProps) => {
 	return (
 		<div tabIndex={-1} className="rounded-md">
 			<div className="flex flex-row">
@@ -72,8 +78,7 @@ const TabItem = ({ url, label }: TabItemProps) => {
 							type="button"
 							variant="ghost"
 							className={`gap-x-2 truncate text-sm ${isActive ? "bg-accent text-accent-foreground" : ""}`}
-							onClick={() => setIsActive(true)}
-							onBlur={() => setIsActive(false)}
+							onClick={onClick}
 						>
 							{label}
 						</Button>
diff --git a/web/components/routes/link/list-item.tsx b/web/components/routes/link/list-item.tsx
index 551c92fa..419fb520 100644
--- a/web/components/routes/link/list-item.tsx
+++ b/web/components/routes/link/list-item.tsx
@@ -41,6 +41,7 @@ export const ListItem: React.FC<ListItemProps> = ({
 }) => {
 	const { attributes, listeners, setNodeRef, transform, transition } = useSortable({ id: personalLink.id, disabled })
 	const formRef = React.useRef<HTMLFormElement>(null)
+	const [showDeleteIcon, setShowDeleteIcon] = React.useState(false)
 
 	const style = {
 		transform: CSS.Transform.toString(transform),
@@ -77,8 +78,15 @@ export const ListItem: React.FC<ListItemProps> = ({
 		setEditId(null)
 	}
 
+	// const handleRowClick = () => {
+	// 	console.log("Row clicked", personalLink.id)
+	// 	setEditId(personalLink.id)
+	// }
 	const handleRowClick = () => {
-		console.log("Row clicked", personalLink.id)
+		setShowDeleteIcon(!showDeleteIcon)
+	}
+
+	const handleDoubleClick = () => {
 		setEditId(personalLink.id)
 	}
 
@@ -126,6 +134,7 @@ export const ListItem: React.FC<ListItemProps> = ({
 				"bg-muted/50": isFocused
 			})}
 			onClick={handleRowClick}
+			onDoubleClick={handleDoubleClick}
 		>
 			<div className="flex grow justify-between gap-x-6 px-6 max-lg:px-4">
 				<div className="flex min-w-0 items-center gap-x-4">
@@ -177,13 +186,15 @@ export const ListItem: React.FC<ListItemProps> = ({
 
 				<div className="flex shrink-0 items-center gap-x-4">
 					<Badge variant="secondary">Topic Name</Badge>
-					<Button
-						size="icon"
-						className="text-destructive h-auto w-auto bg-transparent hover:bg-transparent hover:text-red-500"
-						onClick={e => handleDelete(e, personalLink)}
-					>
-						<Trash2Icon size={16} />
-					</Button>
+					{showDeleteIcon && (
+						<Button
+							size="icon"
+							className="text-destructive h-auto w-auto bg-transparent hover:bg-transparent hover:text-red-500"
+							onClick={e => handleDelete(e, personalLink)}
+						>
+							<Trash2Icon size={16} />
+						</Button>
+					)}
 				</div>
 			</div>
 		</li>
diff --git a/web/lib/schema/personal-link.ts b/web/lib/schema/personal-link.ts
index 905a09e7..2d21a646 100644
--- a/web/lib/schema/personal-link.ts
+++ b/web/lib/schema/personal-link.ts
@@ -17,7 +17,7 @@ export class LinkMetadata extends CoMap {
 export class PersonalLink extends CoMap {
 	title = co.string
 	slug = co.string
-	description = nullable(co.string)
+	description = co.optional.string
 	completed = co.boolean
 	sequence = co.number
 	isLink = co.boolean