diff --git a/website/src/lib/components/self/DataTable.svelte b/website/src/lib/components/self/DataTable.svelte
index a9fd26c..709671f 100644
--- a/website/src/lib/components/self/DataTable.svelte
+++ b/website/src/lib/components/self/DataTable.svelte
@@ -6,12 +6,14 @@
 	import CoinIcon from './CoinIcon.svelte';
 	import UserProfilePreview from './UserProfilePreview.svelte';
 	import { getPublicUrl } from '$lib/utils';
-	import { ArrowUp, ArrowDown } from 'lucide-svelte';
+	import { ArrowUp, ArrowDown, ArrowUpDown } from 'lucide-svelte';
+
 	interface Column {
 		key: string;
 		label: string;
 		class?: string;
 		sortable?: boolean;
+		defaultSort?: boolean | 'asc' | 'desc';
 		render?: (value: any, row: any, index: number) => any;
 	}
 
@@ -34,6 +36,49 @@
 		emptyDescription?: string;
 		enableUserPreview?: boolean;
 	} = $props();
+
+	const defaultSortColumn = columns.find((col) => col.defaultSort);
+	let sortColumn = $state<string | null>(defaultSortColumn?.key || null);
+	let sortDirection = $state<'asc' | 'desc'>(
+		defaultSortColumn?.defaultSort === 'asc' ? 'asc' : 'desc'
+	);
+
+	let sortedData = $derived.by(() => {
+		if (!sortColumn) return data;
+
+		return [...data].sort((a, b) => {
+			let aValue = a[sortColumn!];
+			let bValue = b[sortColumn!];
+
+			// Handle numeric values
+			if (typeof aValue === 'string' && !isNaN(Number(aValue))) {
+				aValue = Number(aValue);
+			}
+			if (typeof bValue === 'string' && !isNaN(Number(bValue))) {
+				bValue = Number(bValue);
+			}
+
+			// Handle null/undefined values
+			if (aValue == null && bValue == null) return 0;
+			if (aValue == null) return sortDirection === 'asc' ? -1 : 1;
+			if (bValue == null) return sortDirection === 'asc' ? 1 : -1;
+
+			// Compare values
+			if (aValue < bValue) return sortDirection === 'asc' ? -1 : 1;
+			if (aValue > bValue) return sortDirection === 'asc' ? 1 : -1;
+			return 0;
+		});
+	});
+
+	function handleSort(columnKey: string) {
+		if (sortColumn === columnKey) {
+			sortDirection = sortDirection === 'asc' ? 'desc' : 'asc';
+		} else {
+			sortColumn = columnKey;
+			sortDirection = 'desc';
+		}
+	}
+
 	function renderCell(column: any, row: any, value: any, index: number) {
 		if (column.render) {
 			const rendered = column.render(value, row, index);
@@ -101,11 +146,32 @@
 		<Table.Header>
 			<Table.Row>
 				{#each columns as column (column.key)}
-					<Table.Head class={column.class || 'min-w-[80px]'}>{column.label}</Table.Head>
+					<Table.Head class={column.class || 'min-w-[80px]'}>
+						{#if column.sortable}
+							<button
+								onclick={() => handleSort(column.key)}
+								class="hover:text-foreground flex items-center gap-1 transition-colors"
+							>
+								{column.label}
+								{#if sortColumn === column.key}
+									{#if sortDirection === 'asc'}
+										<ArrowUp class="text-primary h-4 w-4" />
+									{:else}
+										<ArrowDown class="text-primary h-4 w-4" />
+									{/if}
+								{:else}
+									<ArrowUpDown class="h-4 w-4 opacity-50" />
+								{/if}
+							</button>
+						{:else}
+							{column.label}
+						{/if}
+					</Table.Head>
 				{/each}
 			</Table.Row>
-		</Table.Header><Table.Body>
-			{#each data as row, index (row.symbol || row.id || index)}
+		</Table.Header>
+		<Table.Body>
+			{#each sortedData as row, index (row.symbol || row.id || index)}
 				<Table.Row
 					class={onRowClick ? 'hover:bg-muted/50 cursor-pointer transition-colors' : ''}
 					onclick={onRowClick ? () => onRowClick(row) : undefined}
@@ -132,7 +198,7 @@
 									<div
 										class={`${cellData.color} flex h-7 w-7 items-center justify-center rounded-full text-xs font-medium`}
 									>
-										<svelte:component this={cellData.icon} class="h-3.5 w-3.5" />
+										<cellData.icon class="h-3.5 w-3.5" />
 									</div>
 									<span class="text-sm font-medium">#{cellData.number}</span>
 								</div>
diff --git a/website/src/routes/portfolio/+page.svelte b/website/src/routes/portfolio/+page.svelte
index 8bb4fbe..56a4d4d 100644
--- a/website/src/routes/portfolio/+page.svelte
+++ b/website/src/routes/portfolio/+page.svelte
@@ -84,18 +84,21 @@
 			key: 'quantity',
 			label: 'Quantity',
 			class: 'w-[20%] min-w-[80px] md:w-[12%] font-mono',
+			sortable: true,
 			render: (value: any) => formatQuantity(value)
 		},
 		{
 			key: 'currentPrice',
 			label: 'Price',
 			class: 'w-[15%] min-w-[70px] md:w-[12%] font-mono',
+			sortable: true,
 			render: (value: any) => `$${formatPrice(value)}`
 		},
 		{
 			key: 'change24h',
 			label: '24h Change',
 			class: 'w-[20%] min-w-[80px] md:w-[12%]',
+			sortable: true,
 			render: (value: any) => ({
 				component: 'badge',
 				variant: value >= 0 ? 'success' : 'destructive',
@@ -106,6 +109,8 @@
 			key: 'value',
 			label: 'Value',
 			class: 'w-[15%] min-w-[70px] md:w-[12%] font-mono font-medium',
+			sortable: true,
+			defaultSort: true,
 			render: (value: any) => formatValue(value)
 		},
 		{
@@ -231,6 +236,19 @@
 <SendMoneyModal bind:open={sendMoneyModalOpen} onSuccess={handleTransferSuccess} />
 
 <div class="container mx-auto max-w-7xl p-6">
+	<div class="mb-6 flex flex-col items-start justify-between gap-4 sm:flex-row sm:items-center">
+		<div>
+			<h1 class="text-3xl font-bold">Portfolio</h1>
+			<p class="text-muted-foreground">Manage your investments and transactions</p>
+		</div>
+		<div class="flex gap-2">
+			<Button onclick={() => (sendMoneyModalOpen = true)}>
+				<Send class="h-4 w-4" />
+				Send Money
+			</Button>
+		</div>
+	</div>
+
 	{#if loading}
 		<PortfolioSkeleton />
 	{:else if !$USER_DATA}
@@ -252,20 +270,6 @@
 	{:else}
 		<!-- Portfolio Overview -->
 		<div class="mb-8">
-			<div class="mb-6 flex flex-col items-start justify-between gap-4 sm:flex-row sm:items-center">
-				<div>
-					<h1 class="text-3xl font-bold">Portfolio</h1>
-					<p class="text-muted-foreground">Manage your investments and transactions</p>
-				</div>
-				<div class="flex gap-2">
-					<Button onclick={() => (sendMoneyModalOpen = true)}>
-						<Send class="h-4 w-4" />
-						Send Money
-					</Button>
-					<!-- ...existing buttons... -->
-				</div>
-			</div>
-
 			<!-- Portfolio Summary Cards -->
 			<div class="mb-8 grid grid-cols-1 gap-4 lg:grid-cols-3">
 				<!-- Total Portfolio Value -->