diff --git a/app/companies/[slug]/events/page.tsx b/app/companies/[slug]/events/page.tsx
index 0ba7e505..c4749602 100644
--- a/app/companies/[slug]/events/page.tsx
+++ b/app/companies/[slug]/events/page.tsx
@@ -356,8 +356,19 @@ export default function CompanyEventsPage() {
                       {/* Card Content */}
                       <div className="flex-1 flex flex-col p-4">
                         <div className="flex items-center gap-3 mb-2">
-                          <div className="w-10 h-10 rounded-full bg-gradient-to-br from-primary to-purple-600 flex items-center justify-center text-white font-bold text-lg shadow-lg">
-                            {event.organizer.split(" ").map((n: string) => n[0]).join("")}
+                          {/* Company Logo/Badge */}
+                          <div className="w-10 h-10 rounded-full bg-gradient-to-br from-primary to-purple-600 flex items-center justify-center text-white font-bold text-sm shadow-lg overflow-hidden">
+                            {company?.logo_url ? (
+                              <Image
+                                src={company.logo_url}
+                                alt={company.name}
+                                width={40}
+                                height={40}
+                                className="object-cover w-full h-full"
+                              />
+                            ) : (
+                              company?.name.substring(0, 2).toUpperCase()
+                            )}
                           </div>
                           <div className="flex-1 min-w-0">
                             <div className="flex items-start justify-between gap-2">
@@ -413,11 +424,10 @@ export default function CompanyEventsPage() {
                           </div>
                           <Badge
                             variant="outline"
-                            className={`text-xs ${
-                              event.payment === "Required" || event.payment === "Paid"
+                            className={`text-xs ${event.payment === "Required" || event.payment === "Paid"
                                 ? "border-green-200 text-green-700 bg-green-50"
                                 : "border-blue-200 text-blue-700 bg-blue-50"
-                            }`}
+                              }`}
                           >
                             {event.payment === "Required" || event.payment === "Paid" ? "Paid" : "Free"}
                           </Badge>
diff --git a/app/companies/[slug]/hackathons/page.tsx b/app/companies/[slug]/hackathons/page.tsx
index dbba5f81..f26272fe 100644
--- a/app/companies/[slug]/hackathons/page.tsx
+++ b/app/companies/[slug]/hackathons/page.tsx
@@ -309,8 +309,19 @@ export default function CompanyHackathonsPage() {
                       {/* Card Content */}
                       <div className="flex-1 flex flex-col p-4">
                         <div className="flex items-center gap-3 mb-2">
-                          <div className="w-10 h-10 rounded-full bg-gradient-to-br from-primary to-purple-600 flex items-center justify-center text-white shadow-lg">
-                            <Trophy className="h-5 w-5" />
+                          {/* Company Logo/Badge */}
+                          <div className="w-10 h-10 rounded-full bg-gradient-to-br from-primary to-purple-600 flex items-center justify-center text-white font-bold text-sm shadow-lg overflow-hidden">
+                            {company?.logo_url ? (
+                              <Image
+                                src={company.logo_url}
+                                alt={company.name}
+                                width={40}
+                                height={40}
+                                className="object-cover w-full h-full"
+                              />
+                            ) : (
+                              company?.name.substring(0, 2).toUpperCase()
+                            )}
                           </div>
                           <div className="flex-1 min-w-0">
                             <div className="flex items-start justify-between gap-2">
@@ -340,19 +351,19 @@ export default function CompanyHackathonsPage() {
                             <Calendar className="h-3 w-3" />
                             {hackathon.date && !isNaN(new Date(hackathon.date).getTime())
                               ? new Date(hackathon.date).toLocaleDateString("en-US", {
-                                  month: "short",
-                                  day: "numeric",
-                                  year: "numeric",
-                                })
+                                month: "short",
+                                day: "numeric",
+                                year: "numeric",
+                              })
                               : "TBA"}
                           </div>
                           <div className="flex items-center gap-1">
                             <Clock className="h-3 w-3" />
                             {hackathon.registration_deadline && !isNaN(new Date(hackathon.registration_deadline).getTime())
                               ? `Reg: ${new Date(hackathon.registration_deadline).toLocaleDateString("en-US", {
-                                  month: "short",
-                                  day: "numeric",
-                                })}`
+                                month: "short",
+                                day: "numeric",
+                              })}`
                               : hackathon.duration || "TBA"}
                           </div>
                           <div className="flex items-center gap-1">
@@ -387,7 +398,7 @@ export default function CompanyHackathonsPage() {
                             className="font-semibold px-6 py-2 rounded-full text-base bg-gradient-to-r from-primary to-purple-600 hover:from-primary/90 hover:to-purple-600/90 shadow-lg"
                             asChild
                           >
-                            <Link href={`/hackathons/${hackathon.id}`}>
+                            <Link href={`/hackathons/${hackathon.slug}`}>
                               View Details <ArrowRight className="ml-1 h-5 w-5" />
                             </Link>
                           </Button>
diff --git a/app/companies/register/page.tsx b/app/companies/register/page.tsx
index 3a4afcba..6244ef9d 100644
--- a/app/companies/register/page.tsx
+++ b/app/companies/register/page.tsx
@@ -72,11 +72,11 @@ export default function CompanyRegisterPage() {
               </CardHeader>
               <CardContent className="text-center space-y-6">
                 <p className="text-sm text-muted-foreground">
-                  You need to be signed in to register your company. This helps us track your 
+                  You need to be signed in to register your company. This helps us track your
                   application and provide better support throughout the verification process.
                 </p>
                 <div className="flex flex-col sm:flex-row gap-4 justify-center">
-                  <Button 
+                  <Button
                     className="bg-gradient-to-r from-blue-500 to-cyan-500 hover:from-blue-600 hover:to-cyan-600 text-white"
                     asChild
                   >
@@ -131,7 +131,7 @@ export default function CompanyRegisterPage() {
                         </p>
                       </div>
                     </div>
-                    
+
                     <div className="flex gap-4">
                       <div className="flex-shrink-0">
                         <div className="w-8 h-8 rounded-full bg-blue-500 text-white flex items-center justify-center font-semibold">
@@ -145,7 +145,7 @@ export default function CompanyRegisterPage() {
                         </p>
                       </div>
                     </div>
-                    
+
                     <div className="flex gap-4">
                       <div className="flex-shrink-0">
                         <div className="w-8 h-8 rounded-full bg-blue-500 text-white flex items-center justify-center font-semibold">
@@ -232,14 +232,14 @@ export default function CompanyRegisterPage() {
             </div>
             <h1 className="text-4xl font-bold tracking-tight">Register Your Company</h1>
             <p className="text-lg text-muted-foreground max-w-2xl mx-auto">
-              Join CodeUnia&apos;s marketplace and start hosting hackathons and events for the developer community
+              Join Codeunia&apos;s marketplace and start hosting hackathons and events for the developer community
             </p>
           </div>
 
           {/* Benefits */}
           <Card className="border-0 shadow-lg bg-gradient-to-r from-blue-50 to-cyan-50 dark:from-blue-900/20 dark:to-cyan-900/20">
             <CardContent className="p-6">
-              <h3 className="font-semibold text-lg mb-4">Why host events on CodeUnia?</h3>
+              <h3 className="font-semibold text-lg mb-4">Why host events on Codeunia?</h3>
               <div className="grid grid-cols-1 md:grid-cols-3 gap-4">
                 <div className="flex gap-3">
                   <CheckCircle2 className="h-5 w-5 text-green-600 dark:text-green-400 flex-shrink-0 mt-0.5" />
diff --git a/app/hackathons/page.tsx b/app/hackathons/page.tsx
index 54ac8ef3..3dd24288 100644
--- a/app/hackathons/page.tsx
+++ b/app/hackathons/page.tsx
@@ -1,4 +1,4 @@
-"use client" 
+"use client"
 
 import { useState, useEffect, useRef } from "react"
 
@@ -26,7 +26,7 @@ import type { Company } from "@/types/company"
 const hackathonCategories = [
   "All",
   "Web Development",
-  "Mobile Apps", 
+  "Mobile Apps",
   "AI/ML",
   "Blockchain",
   "IoT",
@@ -80,7 +80,7 @@ export default function HackathonsPage() {
         if (response.ok) {
           const data = await response.json()
           setCompanies(data.companies || [])
-          
+
           // Extract unique industries from companies
           const uniqueIndustries = Array.from(
             new Set(data.companies.map((c: Company) => c.industry).filter(Boolean))
@@ -263,98 +263,98 @@ export default function HackathonsPage() {
 
   return (
     <div className="flex flex-col overflow-hidden bg-gradient-to-br from-background via-background to-muted/10">
-       <Header/>
-      
+      <Header />
+
       {/* Hero Section */}
       <section className="py-20 md:py-32 relative overflow-hidden">
-                <div
-                    className={cn(
-                        "absolute inset-0",
-                        "[background-size:20px_20px]",
-                        "[background-image:linear-gradient(to_right,rgba(99,102,241,0.8)_1px,transparent_1px),linear-gradient(to_bottom,rgba(99,102,241,0.8)_1px,transparent_1px)]",
-                        "dark:[background-image:linear-gradient(to_right,rgba(139,92,246,0.8)_1px,transparent_1px),linear-gradient(to_bottom,rgba(139,92,246,0.8)_1px,transparent_1px)]"
-                    )}
-                />
-                <div className="pointer-events-none absolute inset-0 flex items-center justify-center bg-background [mask-image:radial-gradient(ellipse_at_center,transparent_20%,black)]"></div>
-                <div className="absolute inset-0 bg-gradient-to-br from-primary/5 via-background to-purple-500/5 animate-gradient"></div>
-                <div className="absolute inset-0">
-                    <div className="absolute top-20 left-10 w-72 h-72 bg-primary/10 rounded-full blur-3xl animate-pulse-slow"></div>
-                    <div
-                        className="absolute bottom-20 right-10 w-96 h-96 bg-purple-500/10 rounded-full blur-3xl animate-pulse-slow"
-                        style={{ animationDelay: "2s" }}
-                    ></div>
-                </div>
+        <div
+          className={cn(
+            "absolute inset-0",
+            "[background-size:20px_20px]",
+            "[background-image:linear-gradient(to_right,rgba(99,102,241,0.8)_1px,transparent_1px),linear-gradient(to_bottom,rgba(99,102,241,0.8)_1px,transparent_1px)]",
+            "dark:[background-image:linear-gradient(to_right,rgba(139,92,246,0.8)_1px,transparent_1px),linear-gradient(to_bottom,rgba(139,92,246,0.8)_1px,transparent_1px)]"
+          )}
+        />
+        <div className="pointer-events-none absolute inset-0 flex items-center justify-center bg-background [mask-image:radial-gradient(ellipse_at_center,transparent_20%,black)]"></div>
+        <div className="absolute inset-0 bg-gradient-to-br from-primary/5 via-background to-purple-500/5 animate-gradient"></div>
+        <div className="absolute inset-0">
+          <div className="absolute top-20 left-10 w-72 h-72 bg-primary/10 rounded-full blur-3xl animate-pulse-slow"></div>
+          <div
+            className="absolute bottom-20 right-10 w-96 h-96 bg-purple-500/10 rounded-full blur-3xl animate-pulse-slow"
+            style={{ animationDelay: "2s" }}
+          ></div>
+        </div>
 
-                <motion.div
-                    initial={{ opacity: 0, y: 20 }}
-                    animate={{ opacity: 1, y: 0 }}
-                    transition={{ duration: 0.5 }}
-                    className="container px-4 mx-auto relative z-10"
-                >
-                    <div className="max-w-4xl mx-auto text-center space-y-8">
-                        <motion.div
-                            initial={{ scale: 0.9 }}
-                            animate={{ scale: 1 }}
-                            transition={{ duration: 0.3 }}
-                        >
-                            <div className="flex flex-col items-center justify-center gap-4">
-                                <button className="bg-slate-800 no-underline group relative shadow-2xl shadow-zinc-900 rounded-full p-px text-sm font-semibold leading-6 text-white inline-block cursor-default">
-                                    <span className="absolute inset-0 overflow-hidden rounded-full">
-                                        <span className="absolute inset-0 rounded-full bg-[image:radial-gradient(75%_100%_at_50%_0%,rgba(56,189,248,0.6)_0%,rgba(56,189,248,0)_75%)] opacity-0 transition-opacity duration-500 group-hover:opacity-100" />
-                                    </span>
-                                    <div className="relative flex space-x-2 items-center z-10 rounded-full bg-zinc-950 py-0.5 px-4 ring-1 ring-white/10">
-                                        <span>Hackathons & Competitions </span>
-                                        <span>
-                                            <Sparkles className="w-3 h-3" />
-                                        </span>
-                                    </div>
-                                    <span className="absolute -bottom-0 left-[1.125rem] h-px w-[calc(100%-2.25rem)] bg-gradient-to-r from-emerald-400/0 via-emerald-400/90 to-emerald-400/0 transition-opacity duration-500 group-hover:opacity-40" />
-                                </button>
-                            </div>
-                        </motion.div>
-                        <motion.h1
-                            initial={{ opacity: 0, y: 20 }}
-                            animate={{ opacity: 1, y: 0 }}
-                            transition={{ duration: 0.5, delay: 0.2 }}
-                            className="text-5xl md:text-6xl font-bold tracking-tight leading-tight"
-                        >
-                            Code, Compete,{" "}
-                            <motion.span
-                                className="gradient-text inline-block"
-                                animate={{
-                                    backgroundPosition: [
-                                        "0% 50%",
-                                        "100% 50%",
-                                        "0% 50%",
-                                    ],
-                                }}
-                                transition={{
-                                    duration: 4,
-                                    repeat: Infinity,
-                                    ease: "linear",
-                                }}
-                                style={{
-                                    background:
-                                        "linear-gradient(90deg, #6366f1, #8b5cf6, #06b6d4, #6366f1)",
-                                    backgroundSize: "300% 100%",
-                                    WebkitBackgroundClip: "text",
-                                    WebkitTextFillColor: "transparent",
-                                }}
-                            >
-                                Win
-                            </motion.span>
-                        </motion.h1>
-                        <motion.p
-                            initial={{ opacity: 0, y: 20 }}
-                            animate={{ opacity: 1, y: 0 }}
-                            transition={{ duration: 0.5, delay: 0.3 }}
-                            className="text-xl md:text-2xl text-muted-foreground max-w-3xl mx-auto leading-relaxed"
-                        >
-                            Discover exciting hackathons and coding competitions. Build innovative solutions, collaborate with talented developers, and win amazing prizes!
-                        </motion.p>
-                    </div>
-                </motion.div>
-            </section>
+        <motion.div
+          initial={{ opacity: 0, y: 20 }}
+          animate={{ opacity: 1, y: 0 }}
+          transition={{ duration: 0.5 }}
+          className="container px-4 mx-auto relative z-10"
+        >
+          <div className="max-w-4xl mx-auto text-center space-y-8">
+            <motion.div
+              initial={{ scale: 0.9 }}
+              animate={{ scale: 1 }}
+              transition={{ duration: 0.3 }}
+            >
+              <div className="flex flex-col items-center justify-center gap-4">
+                <button className="bg-slate-800 no-underline group relative shadow-2xl shadow-zinc-900 rounded-full p-px text-sm font-semibold leading-6 text-white inline-block cursor-default">
+                  <span className="absolute inset-0 overflow-hidden rounded-full">
+                    <span className="absolute inset-0 rounded-full bg-[image:radial-gradient(75%_100%_at_50%_0%,rgba(56,189,248,0.6)_0%,rgba(56,189,248,0)_75%)] opacity-0 transition-opacity duration-500 group-hover:opacity-100" />
+                  </span>
+                  <div className="relative flex space-x-2 items-center z-10 rounded-full bg-zinc-950 py-0.5 px-4 ring-1 ring-white/10">
+                    <span>Hackathons & Competitions </span>
+                    <span>
+                      <Sparkles className="w-3 h-3" />
+                    </span>
+                  </div>
+                  <span className="absolute -bottom-0 left-[1.125rem] h-px w-[calc(100%-2.25rem)] bg-gradient-to-r from-emerald-400/0 via-emerald-400/90 to-emerald-400/0 transition-opacity duration-500 group-hover:opacity-40" />
+                </button>
+              </div>
+            </motion.div>
+            <motion.h1
+              initial={{ opacity: 0, y: 20 }}
+              animate={{ opacity: 1, y: 0 }}
+              transition={{ duration: 0.5, delay: 0.2 }}
+              className="text-5xl md:text-6xl font-bold tracking-tight leading-tight"
+            >
+              Code, Compete,{" "}
+              <motion.span
+                className="gradient-text inline-block"
+                animate={{
+                  backgroundPosition: [
+                    "0% 50%",
+                    "100% 50%",
+                    "0% 50%",
+                  ],
+                }}
+                transition={{
+                  duration: 4,
+                  repeat: Infinity,
+                  ease: "linear",
+                }}
+                style={{
+                  background:
+                    "linear-gradient(90deg, #6366f1, #8b5cf6, #06b6d4, #6366f1)",
+                  backgroundSize: "300% 100%",
+                  WebkitBackgroundClip: "text",
+                  WebkitTextFillColor: "transparent",
+                }}
+              >
+                Win
+              </motion.span>
+            </motion.h1>
+            <motion.p
+              initial={{ opacity: 0, y: 20 }}
+              animate={{ opacity: 1, y: 0 }}
+              transition={{ duration: 0.5, delay: 0.3 }}
+              className="text-xl md:text-2xl text-muted-foreground max-w-3xl mx-auto leading-relaxed"
+            >
+              Discover exciting hackathons and coding competitions. Build innovative solutions, collaborate with talented developers, and win amazing prizes!
+            </motion.p>
+          </div>
+        </motion.div>
+      </section>
 
       {/* Search and Filters - Redesigned */}
       <section className="py-8 bg-gradient-to-b from-muted/30 to-background relative border-b border-primary/10">
@@ -620,7 +620,7 @@ export default function HackathonsPage() {
       {filteredFeaturedHackathons.length > 0 && (
         <section className="py-16 relative">
           <div className="container px-4 mx-auto relative">
-            <motion.div 
+            <motion.div
               className="text-center space-y-4 mb-12"
               initial={{ opacity: 0, y: 20 }}
               animate={{ opacity: 1, y: 0 }}
@@ -705,16 +705,6 @@ export default function HackathonsPage() {
                           className="object-cover w-full h-full group-hover:scale-105 transition-transform duration-500"
                           priority={index < 2}
                         />
-                      ) : hackathon.company?.logo_url ? (
-                        <div className="flex items-center justify-center w-full h-full bg-gradient-to-br from-muted to-muted/50 p-8">
-                          <Image
-                            src={hackathon.company.logo_url}
-                            alt={hackathon.company.name || 'Company logo'}
-                            width={120}
-                            height={120}
-                            className="object-contain"
-                          />
-                        </div>
                       ) : (
                         <div className="flex items-center justify-center w-full h-full bg-gradient-to-br from-muted to-muted/50">
                           <Calendar className="h-16 w-16 text-muted-foreground opacity-40" />
@@ -729,13 +719,13 @@ export default function HackathonsPage() {
                         </CardTitle>
                         <div className="flex items-center gap-2 flex-shrink-0">
                           <button
-                            onClick={() => handleCopyLink(hackathon.slug, String (hackathon.id))}
+                            onClick={() => handleCopyLink(hackathon.slug, String(hackathon.id))}
                             className="p-1 bg-background/80 rounded-full border border-primary/20 hover:bg-primary/10 transition-colors"
                             title="Copy hackathon link"
                           >
                             <LinkIcon className="h-4 w-4 text-primary" />
                           </button>
-                          {copiedHackathonId === String (hackathon.id) && (
+                          {copiedHackathonId === String(hackathon.id) && (
                             <span className="text-xs text-primary bg-background/90 px-2 py-1 rounded shadow">Link copied!</span>
                           )}
                         </div>
@@ -743,9 +733,9 @@ export default function HackathonsPage() {
                       {/* Company Badge */}
                       {hackathon.company && (
                         <div className="mt-2">
-                          <CompanyBadge 
-                            company={hackathon.company} 
-                            size="sm" 
+                          <CompanyBadge
+                            company={hackathon.company}
+                            size="sm"
                             showVerification={true}
                           />
                         </div>
@@ -837,7 +827,7 @@ export default function HackathonsPage() {
       {/* All Hackathons - Redesigned */}
       <section className="py-16 bg-gradient-to-b from-muted/30 to-background relative">
         <div className="container px-4 mx-auto">
-          <motion.div 
+          <motion.div
             className="flex items-center justify-between mb-12"
             initial={{ opacity: 0, y: 20 }}
             animate={{ opacity: 1, y: 0 }}
@@ -878,16 +868,6 @@ export default function HackathonsPage() {
                         className="object-cover w-full h-full group-hover:scale-105 transition-transform duration-500"
                         priority={index < 6}
                       />
-                    ) : hackathon.company?.logo_url ? (
-                      <div className="flex items-center justify-center w-full h-full p-4">
-                        <Image
-                          src={hackathon.company.logo_url}
-                          alt={hackathon.company.name || 'Company logo'}
-                          width={80}
-                          height={80}
-                          className="object-contain"
-                        />
-                      </div>
                     ) : (
                       <div className="flex items-center justify-center w-full h-full">
                         <Calendar className="h-12 w-12 text-muted-foreground opacity-40" />
@@ -931,9 +911,9 @@ export default function HackathonsPage() {
                         {/* Company Badge */}
                         {hackathon.company ? (
                           <div className="mb-2">
-                            <CompanyBadge 
-                              company={hackathon.company} 
-                              size="sm" 
+                            <CompanyBadge
+                              company={hackathon.company}
+                              size="sm"
                               showVerification={true}
                             />
                           </div>
@@ -996,7 +976,7 @@ export default function HackathonsPage() {
           </div>
 
           {regularHackathons.length === 0 && (
-            <motion.div 
+            <motion.div
               className="text-center py-20"
               initial={{ opacity: 0, scale: 0.9 }}
               animate={{ opacity: 1, scale: 1 }}
@@ -1023,7 +1003,7 @@ export default function HackathonsPage() {
         </div>
       </section>
 
-      <Footer/>
+      <Footer />
     </div>
   )
 }
diff --git a/components/companies/VerificationBadge.tsx b/components/companies/VerificationBadge.tsx
index 518dbaef..63902863 100644
--- a/components/companies/VerificationBadge.tsx
+++ b/components/companies/VerificationBadge.tsx
@@ -16,7 +16,7 @@ const statusConfig = {
     label: 'Verified',
     variant: 'default' as const,
     className: 'bg-green-500 hover:bg-green-600 text-white border-green-600',
-    tooltip: 'This company has been verified by CodeUnia',
+    tooltip: 'This company has been verified by Codeunia',
   },
   pending: {
     icon: Clock,
@@ -49,18 +49,18 @@ const sizeClasses = {
   },
 }
 
-export function VerificationBadge({ 
-  status, 
-  size = 'md', 
+export function VerificationBadge({
+  status,
+  size = 'md',
   showLabel = false,
-  className 
+  className
 }: VerificationBadgeProps) {
   const config = statusConfig[status]
   const sizes = sizeClasses[size]
   const Icon = config.icon
 
   const badge = (
-    <Badge 
+    <Badge
       variant={config.variant}
       className={cn(
         sizes.badge,