diff --git a/components/ui/button.tsx b/components/ui/button.tsx
index 52c1c8c..04b0efa 100644
--- a/components/ui/button.tsx
+++ b/components/ui/button.tsx
@@ -3,4 +3,3 @@ import { ButtonHTMLAttributes } from "react"
 export function Button(props: ButtonHTMLAttributes<HTMLButtonElement>) {
   return <button {...props} className="px-4 py-2 bg-primary text-white rounded-md hover:bg-secondary transition-colors" />
 }
-
diff --git a/components/ui/card.tsx b/components/ui/card.tsx
index e9d6a81..24e15b4 100644
--- a/components/ui/card.tsx
+++ b/components/ui/card.tsx
@@ -15,4 +15,3 @@ export function CardTitle({ children }: { children: React.ReactNode }) {
 export function CardContent({ children }: { children: React.ReactNode }) {
   return <div className="mt-2">{children}</div>
 }
-
diff --git a/components/ui/input.tsx b/components/ui/input.tsx
index 06ef729..825b504 100644
--- a/components/ui/input.tsx
+++ b/components/ui/input.tsx
@@ -3,4 +3,3 @@ import { InputHTMLAttributes } from "react"
 export function Input(props: InputHTMLAttributes<HTMLInputElement>) {
   return <input {...props} className="border border-gray-300 p-2 rounded-md focus:outline-none focus:ring focus:ring-blue-500" />
 }
-
diff --git a/components/ui/label.tsx b/components/ui/label.tsx
index 80fd796..2499652 100644
--- a/components/ui/label.tsx
+++ b/components/ui/label.tsx
@@ -1,4 +1,3 @@
 export function Label({ htmlFor, children }: { htmlFor: string; children: React.ReactNode }) {
   return <label htmlFor={htmlFor} className="block font-medium text-mdc-dark">{children}</label>
 }
-
diff --git a/components/ui/select.tsx b/components/ui/select.tsx
index 2cf2cfb..3c6b76f 100644
--- a/components/ui/select.tsx
+++ b/components/ui/select.tsx
@@ -7,4 +7,3 @@ export function Select({ children, ...props }: React.SelectHTMLAttributes<HTMLSe
     </select>
   )
 }
-
diff --git a/components/ui/toast.tsx b/components/ui/toast.tsx
index 92191b5..ddd10cc 100644
--- a/components/ui/toast.tsx
+++ b/components/ui/toast.tsx
@@ -26,4 +26,3 @@ export const ToastClose = ({ onClick }: { onClick: () => void }) => {
 export const ToastViewport = () => {
   return <div className="fixed bottom-0 right-0 w-80 flex flex-col gap-2 p-4" />
 }
-
diff --git a/components/ui/toaster.tsx b/components/ui/toaster.tsx
index 655e950..c4f8615 100644
--- a/components/ui/toaster.tsx
+++ b/components/ui/toaster.tsx
@@ -1,23 +1,17 @@
 "use client"
 
-import { Toast, ToastClose, ToastDescription, ToastProvider, ToastTitle, ToastViewport } from "@/components/ui/toast"
+import { Toast, ToastClose, ToastDescription, ToastTitle, ToastViewport } from "@/components/ui/toast"
 import { useToast } from "@/components/ui/use-toast"
 
 export function Toaster() {
-  const { toasts } = useToast()
+  const { message } = useToast()
 
-  return (
-    <ToastProvider>
-      {toasts.map(({ id, title, description, action, ...props }) => (
-        <Toast key={id} {...props} className="bg-white border-primary">
-          {title && <ToastTitle className="font-vollkorn">{title}</ToastTitle>}
-          {description && <ToastDescription className="font-open-sans">{description}</ToastDescription>}
-          {action}
-          <ToastClose />
-        </Toast>
-      ))}
+  return message ? (
+    <Toast>
+      <ToastTitle>Notification</ToastTitle>
+      <ToastDescription>{message}</ToastDescription>
+      <ToastClose onClick={() => console.log("Close Toast")} />
       <ToastViewport />
-    </ToastProvider>
-  )
+    </Toast>
+  ) : null
 }
-
diff --git a/components/ui/use-toast.tsx b/components/ui/use-toast.tsx
index 870313f..c95014a 100644
--- a/components/ui/use-toast.tsx
+++ b/components/ui/use-toast.tsx
@@ -1,14 +1,13 @@
-import { useState } from "react";
+import { useState } from "react"
 
 export function useToast() {
-  const [message, setMessage] = useState<string | null>(null);
+  const [message, setMessage] = useState<string | null>(null)
 
   const toast = ({ title, description, variant }: { title: string; description: string; variant?: "default" | "destructive" }) => {
-    console.log(`${variant === "destructive" ? "[ERROR]" : "[INFO]"} ${title}: ${description}`);
-    setMessage(`${title}: ${description}`);
-    setTimeout(() => setMessage(null), 3000);
-  };
+    console.log(`${variant === "destructive" ? "[ERROR]" : "[INFO]"} ${title}: ${description}`)
+    setMessage(`${title}: ${description}`)
+    setTimeout(() => setMessage(null), 3000)
+  }
 
-  return { toast, message };
+  return { toast, message }
 }
-
diff --git a/lib/utils.ts b/lib/utils.ts
new file mode 100644
index 0000000..40e075e
--- /dev/null
+++ b/lib/utils.ts
@@ -0,0 +1,3 @@
+export function cn(...classes: (string | undefined | null | false)[]): string {
+  return classes.filter(Boolean).join(" ");
+}
diff --git a/tsconfig.json b/tsconfig.json
index cf742eb..65ca62e 100644
--- a/tsconfig.json
+++ b/tsconfig.json
@@ -17,13 +17,11 @@
     "isolatedModules": true,
     "jsx": "preserve",
     "baseUrl": ".", // ✅ Add this
-    "paths": { // ✅ Add this
-      "@/*": [
-        "./*"
-      ], // ✅ Ensures "@/components/..." resolves correctly
-      "@/components/*": [
-        "components/*"
-      ]
+    "paths": {
+    "@/*": ["./*"],
+    "@/lib/*": ["lib/*"],
+    "@/components/*": ["components/*"],
+    "@/components/ui/*": ["components/ui/*"]
     },
     "plugins": [
       {