diff --git a/app/(landing)/organizations/[id]/hackathons/[hackathonId]/page.tsx b/app/(landing)/organizations/[id]/hackathons/[hackathonId]/page.tsx
index 346e2a8a..cf532317 100644
--- a/app/(landing)/organizations/[id]/hackathons/[hackathonId]/page.tsx
+++ b/app/(landing)/organizations/[id]/hackathons/[hackathonId]/page.tsx
@@ -29,10 +29,11 @@ export default function HackathonPage() {
       autoFetch: false,
     });
 
-  const { analytics, loading: analyticsLoading } = useHackathonAnalytics(
-    organizationId,
-    hackathonId
-  );
+  const {
+    analytics,
+    loading: analyticsLoading,
+    error: analyticsError,
+  } = useHackathonAnalytics(organizationId, hackathonId);
 
   useEffect(() => {
     if (organizationId && hackathonId) {
@@ -113,6 +114,18 @@ export default function HackathonPage() {
                 Analytics
               </h2>
             </div>
+            {analyticsError && (
+              <Alert
+                variant='destructive'
+                className='mb-6 border-red-900/20 bg-red-950/20'
+              >
+                <AlertCircle className='h-4 w-4' />
+                <AlertTitle>Unable to load analytics</AlertTitle>
+                <AlertDescription className='text-sm text-gray-400'>
+                  {analyticsError}
+                </AlertDescription>
+              </Alert>
+            )}
             <HackathonStatistics
               statistics={statistics}
               loading={analyticsLoading}
diff --git a/components/organization/OrganizationSettings.tsx b/components/organization/OrganizationSettings.tsx
index c8e37e36..b26a3cf5 100644
--- a/components/organization/OrganizationSettings.tsx
+++ b/components/organization/OrganizationSettings.tsx
@@ -14,9 +14,12 @@ interface OrganizationSettingsProps {
   organizationId?: string;
   initialData?: {
     name?: string;
+    slug?: string;
     logo?: string;
-    tagline?: string;
-    about?: string;
+    metadata?: {
+      tagline?: string;
+      about?: string;
+    };
   };
   isCreating?: boolean;
 }
diff --git a/components/organization/hackathons/new/NewHackathonTab.tsx b/components/organization/hackathons/new/NewHackathonTab.tsx
index 438550cb..884f1eee 100644
--- a/components/organization/hackathons/new/NewHackathonTab.tsx
+++ b/components/organization/hackathons/new/NewHackathonTab.tsx
@@ -213,7 +213,7 @@ export default function NewHackathonTab({
 
   if (isLoadingDraft) {
     return (
-      <div className='bg-background-main-bg flex flex-1 items-center justify-center text-white'>
+      <div className='bg-background-main-bg flex min-h-[60vh] flex-1 items-center justify-center text-white'>
         <div className='flex flex-col items-center gap-4'>
           <div className='border-primary h-8 w-8 animate-spin rounded-full border-2 border-t-transparent' />
           <span className='text-sm text-gray-400'>Loading draft...</span>
@@ -224,7 +224,7 @@ export default function NewHackathonTab({
 
   if (currentError) {
     return (
-      <div className='bg-background-main-bg flex flex-1 items-center justify-center text-white'>
+      <div className='bg-background-main-bg flex min-h-[60vh] flex-1 items-center justify-center text-white'>
         <div className='flex flex-col items-center gap-4'>
           <span className='text-sm text-red-400'>{currentError}</span>
         </div>
diff --git a/components/organization/tabs/ProfileTab.tsx b/components/organization/tabs/ProfileTab.tsx
index 3373b2df..2f431811 100644
--- a/components/organization/tabs/ProfileTab.tsx
+++ b/components/organization/tabs/ProfileTab.tsx
@@ -172,18 +172,23 @@ export default function ProfileTab({
       const previousOrgId = previousOrgIdRef.current;
 
       if (currentOrgId && currentOrgId !== previousOrgId) {
+        // Find links either top-level or in metadata
+        const activeLinks =
+          activeOrg.links || (activeOrg as any).metadata?.links;
+
         setFormData({
           name: activeOrg.name || '',
           slug: activeOrg.slug || '',
           logo: activeOrg.logo || '',
           metadata: {
-            tagline: activeOrg.metadata?.tagline || '',
-            about: activeOrg.metadata?.about || '',
+            tagline:
+              activeOrg.tagline || (activeOrg as any).metadata?.tagline || '',
+            about: activeOrg.about || (activeOrg as any).metadata?.about || '',
             links: {
-              website: activeOrg.metadata?.links?.website || '',
-              x: activeOrg.metadata?.links?.x || '',
-              github: activeOrg.metadata?.links?.github || '',
-              others: activeOrg.metadata?.links?.others || '',
+              website: activeLinks?.website || '',
+              x: activeLinks?.x || '',
+              github: activeLinks?.github || '',
+              others: activeLinks?.others || '',
             },
           },
         });
@@ -576,7 +581,7 @@ export default function ProfileTab({
         </label>
 
         <div className='flex items-start gap-2 rounded-lg bg-zinc-900/30 p-3 text-xs text-zinc-500'>
-          <AlertCircle className='h-4 w-4 flex-shrink-0 text-zinc-600' />
+          <AlertCircle className='h-4 w-4 shrink-0 text-zinc-600' />
           <div className='space-y-1'>
             <p>JPEG or PNG, max 2MB</p>
             <p>Recommended: 480 × 480 px</p>
@@ -625,7 +630,7 @@ export default function ProfileTab({
       <div className='space-y-3 pt-2'>
         {hasUserChanges && !isCreating && (
           <div className='flex items-center gap-2 rounded-lg border border-amber-900/50 bg-amber-500/5 px-3 py-2 text-sm text-amber-500'>
-            <div className='h-2 w-2 flex-shrink-0 rounded-full bg-amber-500' />
+            <div className='h-2 w-2 shrink-0 rounded-full bg-amber-500' />
             <span>You have unsaved changes</span>
           </div>
         )}
diff --git a/hooks/use-hackathons.ts b/hooks/use-hackathons.ts
index 3192383d..d95b648d 100644
--- a/hooks/use-hackathons.ts
+++ b/hooks/use-hackathons.ts
@@ -280,8 +280,8 @@ export function useHackathons(
                 totalPages: response.meta.pagination.totalPages,
                 totalItems: response.meta.pagination.total,
                 itemsPerPage: response.meta.pagination.limit,
-                hasNext: false, // Not provided in this pagination structure
-                hasPrev: false, // Not provided in this pagination structure
+                hasNext: false,
+                hasPrev: false,
               }
             : {
                 currentPage: 1,
@@ -415,16 +415,14 @@ export function useHackathons(
           data,
           autoSave
         );
-        if (response.data && response.data.data) {
+        if (response.data) {
           setDrafts(prev =>
-            prev.map(draft =>
-              draft.id === draftId ? response.data!.data : draft
-            )
+            prev.map(draft => (draft.id === draftId ? response.data! : draft))
           );
           if (currentDraft?.id === draftId) {
-            setCurrentDraft(response.data.data);
+            setCurrentDraft(response.data);
           }
-          return response.data.data;
+          return response.data;
         } else {
           throw new Error('No draft data received');
         }
diff --git a/lib/api/hackathons.ts b/lib/api/hackathons.ts
index 252856d3..8c4cabf8 100644
--- a/lib/api/hackathons.ts
+++ b/lib/api/hackathons.ts
@@ -1158,7 +1158,7 @@ export const updateDraftStep = async (
   data: any,
   autoSave?: boolean
 ) => {
-  const res = await api.patch<ApiResponse<UpdateDraftResponse>>(
+  const res = await api.patch<UpdateDraftResponse>(
     `/organizations/${organizationId}/hackathons/draft/${draftId}`,
     {
       step,
@@ -1191,11 +1191,11 @@ export const getDraft = async (
   organizationId: string,
   draftId: string
 ): Promise<GetDraftResponse> => {
-  const res = await api.get<ApiResponse<GetDraftResponse>>(
+  const res = await api.get<GetDraftResponse>(
     `/organizations/${organizationId}/hackathons/draft/${draftId}`
   );
 
-  return res.data.data as GetDraftResponse;
+  return res.data;
 };
 
 /**