diff --git a/src/app/admin/page.tsx b/src/app/admin/page.tsx
index 7b51e5c1..fda3c2c4 100644
--- a/src/app/admin/page.tsx
+++ b/src/app/admin/page.tsx
@@ -38,7 +38,11 @@ export default function AdminPanel() {
   const [roleFilter, setRoleFilter] = useState<UserRole | "All">("All");
   const [isAdmin, setIsAdmin] = useState<boolean>(false);
   const [editingProfile, setEditingProfile] = useState<{
-    [key: string]: { assigned_agent_address: string; account_index: string };
+    [key: string]: {
+      assigned_agent_address: string;
+      account_index: string;
+      role: UserRole;
+    };
   }>({});
   const [sortOrder, setSortOrder] = useState<SortOrder>(null);
 
@@ -89,9 +93,10 @@ export default function AdminPanel() {
           acc[profile.id] = {
             assigned_agent_address: profile.assigned_agent_address || "",
             account_index: profile.account_index?.toString() || "",
+            role: profile.role,
           };
           return acc;
-        }, {} as { [key: string]: { assigned_agent_address: string; account_index: string } });
+        }, {} as { [key: string]: { assigned_agent_address: string; account_index: string; role: UserRole } });
         setEditingProfile(initialEditingState);
       }
     } catch (error) {
@@ -117,6 +122,7 @@ export default function AdminPanel() {
           editingProfile[userId].account_index === ""
             ? 0
             : parseInt(editingProfile[userId].account_index, 10),
+        role: editingProfile[userId].role,
       };
       const { error } = await supabase
         .from("profiles")
@@ -133,7 +139,7 @@ export default function AdminPanel() {
 
   const handleInputChange = (
     userId: string,
-    field: "assigned_agent_address" | "account_index",
+    field: "assigned_agent_address" | "account_index" | "role",
     value: string
   ) => {
     setEditingProfile((prev) => ({
@@ -269,7 +275,7 @@ export default function AdminPanel() {
                     ({getSortText()})
                   </span>
                 </th>
-                <th className="px-4 py-2 text-left">Stack Address</th>
+                <th className="px-4 py-2 text-left">Stacks Addresses</th>
                 <th className="px-4 py-2 text-left">Role</th>
                 <th className="px-4 py-2 text-left">Agent Address</th>
                 <th className="px-4 py-2 text-left">Actions</th>
@@ -298,8 +304,14 @@ export default function AdminPanel() {
                   <td className="px-4 py-2">
                     <select
                       className="w-full p-2 border rounded-md"
-                      value={profile.role}
-                      onChange={() => updateProfile(profile.id)}
+                      value={editingProfile[profile.id]?.role || profile.role}
+                      onChange={(e) =>
+                        handleInputChange(
+                          profile.id,
+                          "role",
+                          e.target.value as UserRole
+                        )
+                      }
                     >
                       <option value="Normal">Normal</option>
                       <option value="Admin">Admin</option>
diff --git a/src/app/crew/[id]/manage/page.tsx b/src/app/crew/[id]/manage/page.tsx
index 4a8c8966..777d3efa 100644
--- a/src/app/crew/[id]/manage/page.tsx
+++ b/src/app/crew/[id]/manage/page.tsx
@@ -97,7 +97,10 @@ export default function CrewDetails() {
 
   return (
     <div className="space-y-8">
-      <h1 className="text-3xl font-bold pt-4">Crew: {crew.name}</h1>
+      <h1 className="text-primary text-3xl font-bold pt-4">
+        Crew: {crew.name}
+      </h1>
+      <p className="text-ghost">{crew.description}</p>
       <div className="space-y-8">
         <Card>
           <CardContent>
diff --git a/src/app/leaderboard/page.tsx b/src/app/leaderboard/page.tsx
index ce5b5f91..772118e0 100644
--- a/src/app/leaderboard/page.tsx
+++ b/src/app/leaderboard/page.tsx
@@ -1,7 +1,7 @@
 "use client";
 
-import React, { useState } from "react";
-import { Loader2, Search, Trophy } from "lucide-react";
+import React, { useState, useMemo } from "react";
+import { Loader2, Search, Trophy, User } from "lucide-react";
 import { Alert, AlertDescription } from "@/components/ui/alert";
 import { Card, CardHeader, CardTitle, CardContent } from "@/components/ui/card";
 import {
@@ -15,18 +15,46 @@ import {
 import { Badge } from "@/components/ui/badge";
 import { Input } from "@/components/ui/input";
 import { useLeaderboardData } from "@/hooks/useLeaderBoardData";
+import { useUserData } from "@/hooks/useUserData";
 
 export default function LeaderBoard() {
   const { data: profiles, isLoading, error } = useLeaderboardData();
+  const { data: userData } = useUserData();
   const [searchTerm, setSearchTerm] = useState<string>("");
 
-  const filteredProfiles = React.useMemo(() => {
+  const sortedProfiles = useMemo(() => {
     if (!profiles) return [];
-    return profiles.filter((profile) => {
+    return [...profiles].sort((a, b) => {
+      const balanceA = a.agentBalance || 0;
+      const balanceB = b.agentBalance || 0;
+      return balanceB - balanceA;
+    });
+  }, [profiles]);
+
+  const filteredProfiles = useMemo(() => {
+    return sortedProfiles.filter((profile) => {
       const stacksAddress = profile.email.split("@")[0].toLowerCase();
       return stacksAddress.includes(searchTerm.toLowerCase());
     });
-  }, [searchTerm, profiles]);
+  }, [searchTerm, sortedProfiles]);
+
+  const authenticatedUserProfile = useMemo(() => {
+    if (!sortedProfiles || !userData) return null;
+    return sortedProfiles.find(
+      (profile) =>
+        profile.email.split("@")[0].toLowerCase() ===
+        userData.stxAddress.toLowerCase()
+    );
+  }, [sortedProfiles, userData]);
+
+  const authenticatedUserRank = useMemo(() => {
+    if (!authenticatedUserProfile) return null;
+    return (
+      sortedProfiles.findIndex(
+        (profile) => profile.email === authenticatedUserProfile.email
+      ) + 1
+    );
+  }, [sortedProfiles, authenticatedUserProfile]);
 
   if (isLoading) {
     return (
@@ -64,6 +92,49 @@ export default function LeaderBoard() {
         </div>
       </CardHeader>
       <CardContent>
+        {authenticatedUserProfile && (
+          <Card className="mb-6 bg-primary/10">
+            <CardContent className="p-4">
+              <div className="flex items-center justify-between mb-2">
+                <div className="flex items-center gap-2">
+                  <User className="h-5 w-5" />
+                  <span className="font-bold">Your Position</span>
+                </div>
+                <Badge variant="secondary">Rank: {authenticatedUserRank}</Badge>
+              </div>
+              <Table>
+                <TableHeader>
+                  <TableRow>
+                    <TableHead>Participant</TableHead>
+                    <TableHead>Agent Address</TableHead>
+                    <TableHead className="text-right">Agent Balance</TableHead>
+                  </TableRow>
+                </TableHeader>
+                <TableBody>
+                  <TableRow>
+                    <TableCell className="font-mono">
+                      {authenticatedUserProfile.email
+                        .split("@")[0]
+                        .toUpperCase()}
+                    </TableCell>
+                    <TableCell className="font-mono text-sm">
+                      {authenticatedUserProfile.assigned_agent_address || (
+                        <Badge variant="outline">No agent assigned</Badge>
+                      )}
+                    </TableCell>
+                    <TableCell className="text-right font-bold">
+                      {authenticatedUserProfile.agentBalance !== undefined
+                        ? `${authenticatedUserProfile.agentBalance.toFixed(
+                            2
+                          )} STX`
+                        : "-"}
+                    </TableCell>
+                  </TableRow>
+                </TableBody>
+              </Table>
+            </CardContent>
+          </Card>
+        )}
         <Table>
           <TableHeader>
             <TableRow>
@@ -75,7 +146,14 @@ export default function LeaderBoard() {
           </TableHeader>
           <TableBody>
             {filteredProfiles.map((profile, index) => (
-              <TableRow key={profile.email}>
+              <TableRow
+                key={profile.email}
+                className={
+                  profile.email === authenticatedUserProfile?.email
+                    ? "bg-primary/10"
+                    : undefined
+                }
+              >
                 <TableCell className="font-medium">
                   {index < 3 ? (
                     <Trophy
diff --git a/src/components/crews/CloneTradingAnalyzer.tsx b/src/components/crews/CloneTradingAnalyzer.tsx
index dccd729f..754ca1ef 100644
--- a/src/components/crews/CloneTradingAnalyzer.tsx
+++ b/src/components/crews/CloneTradingAnalyzer.tsx
@@ -16,44 +16,44 @@ const getDefaultAgents = async (): Promise<CloneAgent[]> => {
   const webSearchTools = await getToolsByCategory("web_search");
 
   return [
-  {
-    name: "Research agent for ALEX",
-    role: "Market Researcher",
-    goal: "Analyze and provide insights on market trends using ALEX data",
-    backstory:
-      "Specialized in processing and analyzing ALEX market data to identify trading opportunities and market patterns",
-    agent_tools: [
-      ...alexTools.map((t) => t.id),
-      ...webSearchTools.map((t) => t.id),
-    ],
-  },
-  {
-    name: "Research agent for bitflow",
-    role: "Bitflow Analyst",
-    goal: "Monitor and analyze Bitflow trading signals and market data",
-    backstory:
-      "Expert in interpreting Bitflow signals and correlating them with market movements",
-    agent_tools: [
-      ...bitflowTools.map((t) => t.id),
-      ...webSearchTools.map((t) => t.id),
-    ],
-  },
-  {
-    name: "Research agent for lunarcrush",
-    role: "Social Sentiment Analyst",
-    goal: "Track and analyze social sentiment data from LunarCrush",
-    backstory:
-      "Specialized in social media sentiment analysis and its correlation with crypto markets",
-    agent_tools: [...lunarcrushTools.map((t) => t.id)],
-  },
-  {
-    name: "Trade executor for bitflow",
-    role: "Trade Executor",
-    goal: "Execute trades based on analyzed signals and market conditions",
-    backstory:
-      "Experienced in implementing trading strategies and managing trade execution",
-    agent_tools: [...bitflowTools.map((t) => t.id)],
-  },
+    {
+      name: "Research agent for ALEX",
+      role: "Market Researcher",
+      goal: "Analyze and provide insights on market trends using ALEX data",
+      backstory:
+        "Specialized in processing and analyzing ALEX market data to identify trading opportunities and market patterns",
+      agent_tools: [
+        ...alexTools.map((t) => t.id),
+        ...webSearchTools.map((t) => t.id),
+      ],
+    },
+    {
+      name: "Research agent for bitflow",
+      role: "Bitflow Analyst",
+      goal: "Monitor and analyze Bitflow trading signals and market data",
+      backstory:
+        "Expert in interpreting Bitflow signals and correlating them with market movements",
+      agent_tools: [
+        ...bitflowTools.map((t) => t.id),
+        ...webSearchTools.map((t) => t.id),
+      ],
+    },
+    {
+      name: "Research agent for lunarcrush",
+      role: "Social Sentiment Analyst",
+      goal: "Track and analyze social sentiment data from LunarCrush",
+      backstory:
+        "Specialized in social media sentiment analysis and its correlation with crypto markets",
+      agent_tools: [...lunarcrushTools.map((t) => t.id)],
+    },
+    {
+      name: "Trade executor for bitflow",
+      role: "Trade Executor",
+      goal: "Execute trades based on analyzed signals and market conditions",
+      backstory:
+        "Experienced in implementing trading strategies and managing trade execution",
+      agent_tools: [...bitflowTools.map((t) => t.id)],
+    },
   ];
 };
 
@@ -95,10 +95,12 @@ const createTaskForAgent = (agent: CloneAgent): CloneTask => {
 
 interface CloneTradingAnalyzerProps {
   onCloneComplete: () => void;
+  disabled: boolean;
 }
 
-export function CloneTradingAnalyzer({ 
+export function CloneTradingAnalyzer({
   onCloneComplete,
+  disabled,
 }: CloneTradingAnalyzerProps) {
   const [isCloning, setIsCloning] = useState(false);
   const [error, setError] = useState<string | null>(null);
@@ -226,7 +228,7 @@ export function CloneTradingAnalyzer({
       )}
       <Button
         onClick={createTradingAnalyzer}
-        disabled={isCloning || hasCloned}
+        disabled={isCloning || hasCloned || disabled}
         variant="outline"
         className="w-full"
       >
diff --git a/src/components/crews/CrewForm.tsx b/src/components/crews/CrewForm.tsx
index 8e8f9938..e8405005 100644
--- a/src/components/crews/CrewForm.tsx
+++ b/src/components/crews/CrewForm.tsx
@@ -7,7 +7,7 @@ import { Input } from "@/components/ui/input";
 import { Label } from "@/components/ui/label";
 import { Textarea } from "@/components/ui/textarea";
 import { toast } from "@/hooks/use-toast";
-import { CrewFormProps } from "@/types/supabase";
+import { CrewFormProps, Crew } from "@/types/supabase";
 
 export default function CrewForm({ onCrewCreated, onClose }: CrewFormProps) {
   const [crewName, setCrewName] = useState("");
@@ -29,18 +29,29 @@ export default function CrewForm({ onCrewCreated, onClose }: CrewFormProps) {
         throw new Error("No authenticated user found");
       }
 
-      const { error } = await supabase.from("crews").insert({
-        name: crewName,
-        description: crewDescription,
-        profile_id: user.id,
-      });
+      const { data, error } = await supabase
+        .from("crews")
+        .insert({
+          name: crewName,
+          description: crewDescription,
+          profile_id: user.id,
+        })
+        .select()
+        .single();
 
       if (error) throw error;
 
+      const newCrew: Crew = {
+        id: data.id,
+        name: data.name,
+        description: data.description,
+        created_at: data.created_at,
+      };
+
       setCrewName("");
       setCrewDescription("");
       onClose();
-      onCrewCreated();
+      onCrewCreated(newCrew);
       toast({
         title: "Crew created",
         description: "The new crew has been successfully created.",
diff --git a/src/components/crews/CrewManagement.tsx b/src/components/crews/CrewManagement.tsx
index d5c616ae..9c7d47f4 100644
--- a/src/components/crews/CrewManagement.tsx
+++ b/src/components/crews/CrewManagement.tsx
@@ -20,23 +20,24 @@ import {
   TableHeader,
   TableRow,
 } from "@/components/ui/table";
-import { PlusIcon, Trash2Icon, UserIcon, Settings, Check, CheckCircle2 } from "lucide-react";
+import {
+  PlusIcon,
+  Trash2Icon,
+  UserIcon,
+  Settings,
+  Check,
+  CheckCircle2,
+} from "lucide-react";
 import CrewForm from "./CrewForm";
-import { Crew } from "@/types/supabase";
-
-interface CrewManagementProps {
-  crews: Crew[];
-  onCrewSelect: (crew: Crew | null) => void;
-  onCrewUpdate: () => void;
-  selectedCrew: Crew | null;
-}
+import { Crew, CrewManagementProps } from "@/types/supabase";
 
-export function CrewManagement({ 
-  crews,
+export function CrewManagement({
+  initialCrews,
   onCrewSelect,
   onCrewUpdate,
   selectedCrew,
 }: CrewManagementProps) {
+  const [crews, setCrews] = useState<Crew[]>(initialCrews);
   const [isDialogOpen, setIsDialogOpen] = useState(false);
   const [loading, setLoading] = useState(false);
   const { toast } = useToast();
@@ -69,12 +70,16 @@ export function CrewManagement({
 
       if (crewError) throw crewError;
 
+      // Update the local state to remove the deleted crew
+      const updatedCrews = crews.filter((crew) => crew.id !== id);
+      setCrews(updatedCrews);
+
       // Clear selected crew if we're deleting it
       if (selectedCrew?.id === id) {
         onCrewSelect(null);
       }
-      
-      onCrewUpdate();
+
+      onCrewUpdate(updatedCrews);
       toast({
         title: "Crew deleted",
         description:
@@ -92,6 +97,12 @@ export function CrewManagement({
     }
   };
 
+  const handleCrewCreated = (newCrew: Crew) => {
+    const updatedCrews = [...crews, newCrew];
+    setCrews(updatedCrews);
+    onCrewUpdate(updatedCrews);
+  };
+
   return (
     <div className="space-y-6">
       <div className="flex justify-between items-center">
@@ -108,7 +119,7 @@ export function CrewManagement({
               <DialogTitle>Create New Crew</DialogTitle>
             </DialogHeader>
             <CrewForm
-              onCrewCreated={onCrewUpdate}
+              onCrewCreated={handleCrewCreated}
               onClose={() => setIsDialogOpen(false)}
             />
           </DialogContent>
@@ -142,7 +153,9 @@ export function CrewManagement({
                 <TableCell>
                   <div className="flex gap-2">
                     <Button
-                      variant={selectedCrew?.id === crew.id ? "secondary" : "outline"}
+                      variant={
+                        selectedCrew?.id === crew.id ? "secondary" : "outline"
+                      }
                       size="sm"
                       onClick={() => onCrewSelect(crew)}
                       className="min-w-[100px]"
diff --git a/src/components/dashboard/Dashboard.tsx b/src/components/dashboard/Dashboard.tsx
index 3a4a6358..4ec2d4cf 100644
--- a/src/components/dashboard/Dashboard.tsx
+++ b/src/components/dashboard/Dashboard.tsx
@@ -14,12 +14,15 @@ import {
 import DashboardChat from "./DashboardChat";
 import { Crew } from "@/types/supabase";
 
-export default function Component() {
+export default function Dashboard() {
   const [crews, setCrews] = useState<Crew[]>([]);
   const [hasClonedAnalyzer, setHasClonedAnalyzer] = useState(false);
   const [error, setError] = useState<string | null>(null);
+  const [isLoading, setIsLoading] = useState(true);
+  const [selectedCrew, setSelectedCrew] = useState<Crew | null>(null);
 
   const fetchCrews = useCallback(async () => {
+    setIsLoading(true);
     try {
       const { data, error } = await supabase
         .from("crews")
@@ -34,12 +37,12 @@ export default function Component() {
     } catch (err) {
       console.error("Error fetching crews:", err);
       setError("Failed to fetch crews");
+    } finally {
+      setIsLoading(false);
     }
   }, []);
 
   const checkClonedAnalyzer = useCallback(async () => {
-    if (hasClonedAnalyzer) return;
-
     try {
       const {
         data: { user },
@@ -55,7 +58,7 @@ export default function Component() {
         .from("crews")
         .select("*")
         .eq("profile_id", user.id)
-        .eq("name", "TradingAnalyzer");
+        .eq("name", "Trading Analyzer");
 
       if (error) {
         throw error;
@@ -66,7 +69,7 @@ export default function Component() {
       console.error("Error checking for cloned analyzer:", err);
       setError("Failed to check cloned analyzer status");
     }
-  }, [hasClonedAnalyzer]);
+  }, []);
 
   useEffect(() => {
     const initializeDashboard = async () => {
@@ -76,8 +79,6 @@ export default function Component() {
     initializeDashboard();
   }, [fetchCrews, checkClonedAnalyzer]);
 
-  const [selectedCrew, setSelectedCrew] = useState<Crew | null>(null);
-
   const handleCrewSelect = useCallback((crew: Crew | null) => {
     setSelectedCrew(crew);
   }, []);
@@ -87,6 +88,17 @@ export default function Component() {
     fetchCrews();
   }, [fetchCrews]);
 
+  const handleCrewsUpdated = useCallback(
+    (updatedCrews: Crew[]) => {
+      setCrews(updatedCrews);
+      if (updatedCrews.length === 0) {
+        setSelectedCrew(null);
+      }
+      checkClonedAnalyzer();
+    },
+    [checkClonedAnalyzer]
+  );
+
   return (
     <div className="container mx-auto p-4 space-y-8">
       <h1 className="text-3xl font-bold mb-6">Dashboard</h1>
@@ -108,21 +120,28 @@ export default function Component() {
 
       <Card className="w-full">
         <CardContent className="mt-4">
-          {crews.length > 0 ? (
+          {isLoading ? (
+            <p className="text-muted-foreground">Loading crews...</p>
+          ) : crews.length > 0 ? (
             <CrewManagement
-              crews={crews}
+              initialCrews={crews}
               onCrewSelect={handleCrewSelect}
-              onCrewUpdate={fetchCrews}
+              onCrewUpdate={handleCrewsUpdated}
               selectedCrew={selectedCrew}
             />
           ) : (
             <p className="text-muted-foreground">
-              You haven&apos;t created any crews yet.
+              You don&apos;t have any crews yet. Clone our starter crew.
             </p>
           )}
         </CardContent>
         <CardFooter className="flex flex-col items-start space-y-4">
-          <CloneTradingAnalyzer onCloneComplete={handleCloneComplete} />
+          {!isLoading && crews.length === 0 && !hasClonedAnalyzer && (
+            <CloneTradingAnalyzer
+              onCloneComplete={handleCloneComplete}
+              disabled={false}
+            />
+          )}
         </CardFooter>
       </Card>
     </div>
diff --git a/src/components/reusables/Navbar.tsx b/src/components/reusables/Navbar.tsx
index b6038333..b3507d74 100644
--- a/src/components/reusables/Navbar.tsx
+++ b/src/components/reusables/Navbar.tsx
@@ -29,6 +29,17 @@ export function Nav() {
 
   const displayAgentAddress = userData?.agentAddress || null;
 
+  const displayRole = React.useMemo(() => {
+    if (
+      !userData?.role ||
+      userData.role === "" ||
+      userData.role.toLowerCase() === "normal"
+    ) {
+      return "Normal User";
+    }
+    return userData.role;
+  }, [userData?.role]);
+
   return (
     <header className="px-4 lg:px-6 h-auto flex flex-col md:flex-row items-center justify-between mt-4 mb-8 gap-4 md:gap-0">
       <div className="flex items-center gap-4 order-2 md:order-1">
@@ -50,7 +61,7 @@ export function Nav() {
                 <>
                   <span className="font-mono">{displayAddress}</span>
                   <Badge variant="secondary" className="ml-2">
-                    {userData?.role}
+                    {displayRole}
                   </Badge>
                 </>
               )}
diff --git a/src/types/supabase.ts b/src/types/supabase.ts
index b529de99..f32147a4 100644
--- a/src/types/supabase.ts
+++ b/src/types/supabase.ts
@@ -8,14 +8,15 @@ export interface Crew {
 
 // Interface for props of the CrewManagement component
 export interface CrewManagementProps {
-    crews: Crew[]; // Array of crew members
-    onCrewSelect: (crew: Crew) => void; // Callback for when a crew is selected
-    onCrewUpdate: () => Promise<void> | void; // Callback for when a crew is updated
-}
+    initialCrews: Crew[]
+    onCrewSelect: (crew: Crew | null) => void
+    onCrewUpdate: (updatedCrews: Crew[]) => void
+    selectedCrew: Crew | null
+  }
 
 // Interface for props of the CrewForm component
 export interface CrewFormProps {
-    onCrewCreated: () => void; // Callback for when a new crew is created
+    onCrewCreated: (newCrew: Crew) => void; // Callback for when a new crew is created
     onClose: () => void; // Callback for when the form is closed
 }