diff --git a/src/lib/components/MiniPlot.svelte b/src/lib/components/MiniPlot.svelte
index b8a8db59..c8a3d24e 100644
--- a/src/lib/components/MiniPlot.svelte
+++ b/src/lib/components/MiniPlot.svelte
@@ -47,7 +47,7 @@
               layout: {
                   background: {
                       type: ColorType.Solid,
-                      color: '#27272A',
+                      color: '#09090B',
                   },
                   lineColor: '#2B2B43',
                   textColor: '#D9D9D9',
@@ -111,15 +111,15 @@ function etfSelector() {
     etfTicker.update(value => 'SPY');
     goto('/etf/SPY');
   }
-  else if (title === 'Nasdaq 100') {
+  else if (title === 'Nasdaq') {
     etfTicker.update(value => 'QQQ');
     goto('/etf/QQQ');
   }
-  else if (title === 'Dow Jones') {
+  else if (title === 'Dow') {
     etfTicker.update(value => 'DIA');
     goto('/etf/DIA');
   }
-  else if (title === 'Russel 2000') {
+  else if (title === 'Russel') {
     etfTicker.update(value => 'IWM');
     goto('/etf/IWM');
   }
@@ -138,15 +138,16 @@ if(chart && typeof window !== 'undefined')
 
 
 
-<label on:click={etfSelector} class="sm:hover:border-[#3C74D4] duration-200 transition ease-in-out cursor-pointer flex flex-row items-center rounded-lg shadow-lg border border-slate-800 bg-[#27272A]">
+
+<label on:click={etfSelector} class="sm:hover:border-[#3C74D4] duration-200 transition ease-in-out cursor-pointer flex flex-row items-center rounded-lg shadow-lg border border-gray-800 bg-[#09090B]">
   <div class="flex flex-col items-center lg:mr-5">
-    <span class="text-white font-bold text-xs w-20 text-center">{title}</span>
+    <span class="text-white font-semibold text-xs w-20 text-start pl-3 uppercase">{title}</span>
     <div class="flex flex-row mt-1 items-center">
       {#if changesPercentage >=0}
-        <svg class="w-5 h-5 -mr-0.5" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 24 24"><g id="evaArrowUpFill0"><g id="evaArrowUpFill1"><path id="evaArrowUpFill2" fill="#10db06" d="M16.21 16H7.79a1.76 1.76 0 0 1-1.59-1a2.1 2.1 0 0 1 .26-2.21l4.21-5.1a1.76 1.76 0 0 1 2.66 0l4.21 5.1A2.1 2.1 0 0 1 17.8 15a1.76 1.76 0 0 1-1.59 1Z"/></g></g></svg>
+        <svg class="w-4 h-4 -mr-0.5" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 24 24"><g id="evaArrowUpFill0"><g id="evaArrowUpFill1"><path id="evaArrowUpFill2" fill="#10db06" d="M16.21 16H7.79a1.76 1.76 0 0 1-1.59-1a2.1 2.1 0 0 1 .26-2.21l4.21-5.1a1.76 1.76 0 0 1 2.66 0l4.21 5.1A2.1 2.1 0 0 1 17.8 15a1.76 1.76 0 0 1-1.59 1Z"/></g></g></svg>
         <span class="text-[#10DB06] text-xs font-medium">+{changesPercentage?.toFixed(2)}%</span>
       {:else}
-        <svg class="w-5 h-5 -mr-0.5 rotate-180" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 24 24"><g id="evaArrowUpFill0"><g id="evaArrowUpFill1"><path id="evaArrowUpFill2" fill="#FF2F1F" d="M16.21 16H7.79a1.76 1.76 0 0 1-1.59-1a2.1 2.1 0 0 1 .26-2.21l4.21-5.1a1.76 1.76 0 0 1 2.66 0l4.21 5.1A2.1 2.1 0 0 1 17.8 15a1.76 1.76 0 0 1-1.59 1Z"/></g></g></svg>    
+        <svg class="w-4 h-4 -mr-0.5 rotate-180" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 24 24"><g id="evaArrowUpFill0"><g id="evaArrowUpFill1"><path id="evaArrowUpFill2" fill="#FF2F1F" d="M16.21 16H7.79a1.76 1.76 0 0 1-1.59-1a2.1 2.1 0 0 1 .26-2.21l4.21-5.1a1.76 1.76 0 0 1 2.66 0l4.21 5.1A2.1 2.1 0 0 1 17.8 15a1.76 1.76 0 0 1-1.59 1Z"/></g></g></svg>    
         <span class="text-[#FF2F1F] text-xs font-medium">{changesPercentage?.toFixed(2)}% </span> 
       {/if}
     </div>
diff --git a/src/lib/components/shadcn/Table/table.svelte b/src/lib/components/shadcn/Table/table.svelte
new file mode 100644
index 00000000..92b02485
--- /dev/null
+++ b/src/lib/components/shadcn/Table/table.svelte
@@ -0,0 +1,15 @@
+<script lang="ts">
+	import type { HTMLTableAttributes } from "svelte/elements";
+	import { cn } from "$lib/utils.js";
+
+	type $$Props = HTMLTableAttributes;
+
+	let className: $$Props["class"] = undefined;
+	export { className as class };
+</script>
+
+<div class="relative w-full overflow-auto">
+	<table class={cn("w-full caption-bottom text-sm", className)} {...$$restProps}>
+		<slot />
+	</table>
+</div>
\ No newline at end of file
diff --git a/src/lib/components/shadcn/avatar/avatar-fallback.svelte b/src/lib/components/shadcn/avatar/avatar-fallback.svelte
new file mode 100644
index 00000000..c666bc97
--- /dev/null
+++ b/src/lib/components/shadcn/avatar/avatar-fallback.svelte
@@ -0,0 +1,16 @@
+<script lang="ts">
+	import { Avatar as AvatarPrimitive } from "bits-ui";
+	import { cn } from "$lib/utils.js";
+
+	type $$Props = AvatarPrimitive.FallbackProps;
+
+	let className: $$Props["class"] = undefined;
+	export { className as class };
+</script>
+
+<AvatarPrimitive.Fallback
+	class={cn("flex h-full w-full items-center justify-center rounded-full bg-muted", className)}
+	{...$$restProps}
+>
+	<slot />
+</AvatarPrimitive.Fallback>
\ No newline at end of file
diff --git a/src/lib/components/shadcn/avatar/avatar-image.svelte b/src/lib/components/shadcn/avatar/avatar-image.svelte
new file mode 100644
index 00000000..6361571e
--- /dev/null
+++ b/src/lib/components/shadcn/avatar/avatar-image.svelte
@@ -0,0 +1,18 @@
+<script lang="ts">
+	import { Avatar as AvatarPrimitive } from "bits-ui";
+	import { cn } from "$lib/utils.js";
+
+	type $$Props = AvatarPrimitive.ImageProps;
+
+	let className: $$Props["class"] = undefined;
+	export let src: $$Props["src"] = undefined;
+	export let alt: $$Props["alt"] = undefined;
+	export { className as class };
+</script>
+
+<AvatarPrimitive.Image
+	{src}
+	{alt}
+	class={cn("aspect-square h-full w-full", className)}
+	{...$$restProps}
+/>
\ No newline at end of file
diff --git a/src/lib/components/shadcn/avatar/avatar.svelte b/src/lib/components/shadcn/avatar/avatar.svelte
new file mode 100644
index 00000000..77bf6eb4
--- /dev/null
+++ b/src/lib/components/shadcn/avatar/avatar.svelte
@@ -0,0 +1,18 @@
+<script lang="ts">
+	import { Avatar as AvatarPrimitive } from "bits-ui";
+	import { cn } from "$lib/utils.js";
+
+	type $$Props = AvatarPrimitive.Props;
+
+	let className: $$Props["class"] = undefined;
+	export let delayMs: $$Props["delayMs"] = undefined;
+	export { className as class };
+</script>
+
+<AvatarPrimitive.Root
+	{delayMs}
+	class={cn("relative flex h-10 w-10 shrink-0 overflow-hidden rounded-full", className)}
+	{...$$restProps}
+>
+	<slot />
+</AvatarPrimitive.Root>
\ No newline at end of file
diff --git a/src/lib/components/shadcn/avatar/index.ts b/src/lib/components/shadcn/avatar/index.ts
new file mode 100644
index 00000000..a9f94f61
--- /dev/null
+++ b/src/lib/components/shadcn/avatar/index.ts
@@ -0,0 +1,13 @@
+import Root from "./avatar.svelte";
+import Image from "./avatar-image.svelte";
+import Fallback from "./avatar-fallback.svelte";
+
+export {
+	Root,
+	Image,
+	Fallback,
+	//
+	Root as Avatar,
+	Image as AvatarImage,
+	Fallback as AvatarFallback,
+};
\ No newline at end of file
diff --git a/src/lib/components/shadcn/badge/badge.svelte b/src/lib/components/shadcn/badge/badge.svelte
new file mode 100644
index 00000000..ba1f98a0
--- /dev/null
+++ b/src/lib/components/shadcn/badge/badge.svelte
@@ -0,0 +1,18 @@
+<script lang="ts">
+	import { type Variant, badgeVariants } from "./index.ts";
+	import { cn } from "$lib/utils.js";
+
+	let className: string | undefined | null = undefined;
+	export let href: string | undefined = undefined;
+	export let variant: Variant = "default";
+	export { className as class };
+</script>
+
+<svelte:element
+	this={href ? "a" : "span"}
+	{href}
+	class={cn(badgeVariants({ variant, className }))}
+	{...$$restProps}
+>
+	<slot />
+</svelte:element>
\ No newline at end of file
diff --git a/src/lib/components/shadcn/badge/index.ts b/src/lib/components/shadcn/badge/index.ts
new file mode 100644
index 00000000..d9109263
--- /dev/null
+++ b/src/lib/components/shadcn/badge/index.ts
@@ -0,0 +1,21 @@
+import { type VariantProps, tv } from "tailwind-variants";
+export { default as Badge } from "./badge.svelte";
+
+export const badgeVariants = tv({
+	base: "inline-flex select-none items-center rounded-full border px-2.5 py-0.5 text-xs font-semibold transition-colors focus:outline-none focus:ring-2 focus:ring-ring focus:ring-offset-2",
+	variants: {
+		variant: {
+			default: "border-transparent bg-primary text-primary-foreground hover:bg-primary/80",
+			secondary:
+				"border-transparent bg-secondary text-secondary-foreground hover:bg-secondary/80",
+			destructive:
+				"border-transparent bg-destructive text-destructive-foreground hover:bg-destructive/80",
+			outline: "text-foreground",
+		},
+	},
+	defaultVariants: {
+		variant: "default",
+	},
+});
+
+export type Variant = VariantProps<typeof badgeVariants>["variant"];
\ No newline at end of file
diff --git a/src/lib/components/shadcn/card/card.svelte b/src/lib/components/shadcn/card/card.svelte
index 18765498..0c7c92a1 100644
--- a/src/lib/components/shadcn/card/card.svelte
+++ b/src/lib/components/shadcn/card/card.svelte
@@ -9,7 +9,7 @@
 </script>
 
 <div
-	class={cn("rounded-lg border border-gray-800 bg-gradient-to-l from-purple-600 to-purple-800 text-white shadow-sm", className)}
+	class={cn("rounded-lg border border-gray-800 bg-[#09090B] text-white shadow-sm", className)}
 	{...$$restProps}
 >
 	<slot />
diff --git a/src/lib/components/shadcn/progress/index.ts b/src/lib/components/shadcn/progress/index.ts
new file mode 100644
index 00000000..a78d7e1f
--- /dev/null
+++ b/src/lib/components/shadcn/progress/index.ts
@@ -0,0 +1,7 @@
+import Root from "./progress.svelte";
+
+export {
+	Root,
+	//
+	Root as Progress,
+};
\ No newline at end of file
diff --git a/src/lib/components/shadcn/progress/progress.svelte b/src/lib/components/shadcn/progress/progress.svelte
new file mode 100644
index 00000000..6eea9021
--- /dev/null
+++ b/src/lib/components/shadcn/progress/progress.svelte
@@ -0,0 +1,21 @@
+<script lang="ts">
+	import { Progress as ProgressPrimitive } from "bits-ui";
+	import { cn } from "$lib/utils.js";
+
+	type $$Props = ProgressPrimitive.Props;
+
+	let className: $$Props["class"] = undefined;
+	export let max: $$Props["max"] = 100;
+	export let value: $$Props["value"] = undefined;
+	export { className as class };
+</script>
+
+<ProgressPrimitive.Root
+	class={cn("relative h-4 w-full overflow-hidden rounded-full bg-secondary", className)}
+	{...$$restProps}
+>
+	<div
+		class="h-full w-full flex-1 bg-primary transition-all"
+		style={`transform: translateX(-${100 - (100 * (value ?? 0)) / (max ?? 1)}%)`}
+	></div>
+</ProgressPrimitive.Root>
\ No newline at end of file
diff --git a/src/lib/components/shadcn/table/index.ts b/src/lib/components/shadcn/table/index.ts
new file mode 100644
index 00000000..891eca18
--- /dev/null
+++ b/src/lib/components/shadcn/table/index.ts
@@ -0,0 +1,28 @@
+import Root from "./table.svelte";
+import Body from "./table-body.svelte";
+import Caption from "./table-caption.svelte";
+import Cell from "./table-cell.svelte";
+import Footer from "./table-footer.svelte";
+import Head from "./table-head.svelte";
+import Header from "./table-header.svelte";
+import Row from "./table-row.svelte";
+
+export {
+	Root,
+	Body,
+	Caption,
+	Cell,
+	Footer,
+	Head,
+	Header,
+	Row,
+	//
+	Root as Table,
+	Body as TableBody,
+	Caption as TableCaption,
+	Cell as TableCell,
+	Footer as TableFooter,
+	Head as TableHead,
+	Header as TableHeader,
+	Row as TableRow,
+};
\ No newline at end of file
diff --git a/src/lib/components/shadcn/table/table-body.svelte b/src/lib/components/shadcn/table/table-body.svelte
new file mode 100644
index 00000000..e6f352ed
--- /dev/null
+++ b/src/lib/components/shadcn/table/table-body.svelte
@@ -0,0 +1,13 @@
+<script lang="ts">
+	import type { HTMLAttributes } from "svelte/elements";
+	import { cn } from "$lib/utils.js";
+
+	type $$Props = HTMLAttributes<HTMLTableSectionElement>;
+
+	let className: $$Props["class"] = undefined;
+	export { className as class };
+</script>
+
+<tbody class={cn("[&_tr:last-child]:border-0", className)} {...$$restProps}>
+	<slot />
+</tbody>
\ No newline at end of file
diff --git a/src/lib/components/shadcn/table/table-caption.svelte b/src/lib/components/shadcn/table/table-caption.svelte
new file mode 100644
index 00000000..a5cb08b9
--- /dev/null
+++ b/src/lib/components/shadcn/table/table-caption.svelte
@@ -0,0 +1,13 @@
+<script lang="ts">
+	import type { HTMLAttributes } from "svelte/elements";
+	import { cn } from "$lib/utils.js";
+
+	type $$Props = HTMLAttributes<HTMLTableCaptionElement>;
+
+	let className: $$Props["class"] = undefined;
+	export { className as class };
+</script>
+
+<caption class={cn("mt-4 text-sm text-muted-foreground", className)} {...$$restProps}>
+	<slot />
+</caption>
\ No newline at end of file
diff --git a/src/lib/components/shadcn/table/table-cell.svelte b/src/lib/components/shadcn/table/table-cell.svelte
new file mode 100644
index 00000000..1977ce52
--- /dev/null
+++ b/src/lib/components/shadcn/table/table-cell.svelte
@@ -0,0 +1,18 @@
+<script lang="ts">
+	import type { HTMLTdAttributes } from "svelte/elements";
+	import { cn } from "$lib/utils.js";
+
+	type $$Props = HTMLTdAttributes;
+
+	let className: $$Props["class"] = undefined;
+	export { className as class };
+</script>
+
+<td
+	class={cn("p-4 align-middle [&:has([role=checkbox])]:pr-0", className)}
+	{...$$restProps}
+	on:click
+	on:keydown
+>
+	<slot />
+</td>
\ No newline at end of file
diff --git a/src/lib/components/shadcn/table/table-footer.svelte b/src/lib/components/shadcn/table/table-footer.svelte
new file mode 100644
index 00000000..5291e2fe
--- /dev/null
+++ b/src/lib/components/shadcn/table/table-footer.svelte
@@ -0,0 +1,13 @@
+<script lang="ts">
+	import type { HTMLAttributes } from "svelte/elements";
+	import { cn } from "$lib/utils.js";
+
+	type $$Props = HTMLAttributes<HTMLTableSectionElement>;
+
+	let className: $$Props["class"] = undefined;
+	export { className as class };
+</script>
+
+<tfoot class={cn("bg-primary font-medium text-primary-foreground", className)} {...$$restProps}>
+	<slot />
+</tfoot>
\ No newline at end of file
diff --git a/src/lib/components/shadcn/table/table-head.svelte b/src/lib/components/shadcn/table/table-head.svelte
new file mode 100644
index 00000000..e6276641
--- /dev/null
+++ b/src/lib/components/shadcn/table/table-head.svelte
@@ -0,0 +1,19 @@
+<script lang="ts">
+	import type { HTMLThAttributes } from "svelte/elements";
+	import { cn } from "$lib/utils.js";
+
+	type $$Props = HTMLThAttributes;
+
+	let className: $$Props["class"] = undefined;
+	export { className as class };
+</script>
+
+<th
+	class={cn(
+		"h-12 px-4 text-left align-middle font-medium text-muted-foreground [&:has([role=checkbox])]:pr-0",
+		className
+	)}
+	{...$$restProps}
+>
+	<slot />
+</th>
\ No newline at end of file
diff --git a/src/lib/components/shadcn/table/table-header.svelte b/src/lib/components/shadcn/table/table-header.svelte
new file mode 100644
index 00000000..de377f2e
--- /dev/null
+++ b/src/lib/components/shadcn/table/table-header.svelte
@@ -0,0 +1,14 @@
+<script lang="ts">
+	import type { HTMLAttributes } from "svelte/elements";
+	import { cn } from "$lib/utils.js";
+
+	type $$Props = HTMLAttributes<HTMLTableSectionElement>;
+
+	let className: $$Props["class"] = undefined;
+	export { className as class };
+</script>
+
+<!-- svelte-ignore a11y-no-noninteractive-element-interactions -->
+<thead class={cn("[&_tr]:border-b", className)} {...$$restProps} on:click on:keydown>
+	<slot />
+</thead>
\ No newline at end of file
diff --git a/src/lib/components/shadcn/table/table-row.svelte b/src/lib/components/shadcn/table/table-row.svelte
new file mode 100644
index 00000000..4a724c32
--- /dev/null
+++ b/src/lib/components/shadcn/table/table-row.svelte
@@ -0,0 +1,23 @@
+<script lang="ts">
+	import type { HTMLAttributes } from "svelte/elements";
+	import { cn } from "$lib/utils.js";
+
+	type $$Props = HTMLAttributes<HTMLTableRowElement> & {
+		"data-state"?: unknown;
+	};
+
+	let className: $$Props["class"] = undefined;
+	export { className as class };
+</script>
+
+<tr
+	class={cn(
+		"border-b transition-colors hover:bg-muted/50 data-[state=selected]:bg-muted",
+		className
+	)}
+	{...$$restProps}
+	on:click
+	on:keydown
+>
+	<slot />
+</tr>
\ No newline at end of file
diff --git a/src/lib/components/shadcn/table/table.svelte b/src/lib/components/shadcn/table/table.svelte
new file mode 100644
index 00000000..92b02485
--- /dev/null
+++ b/src/lib/components/shadcn/table/table.svelte
@@ -0,0 +1,15 @@
+<script lang="ts">
+	import type { HTMLTableAttributes } from "svelte/elements";
+	import { cn } from "$lib/utils.js";
+
+	type $$Props = HTMLTableAttributes;
+
+	let className: $$Props["class"] = undefined;
+	export { className as class };
+</script>
+
+<div class="relative w-full overflow-auto">
+	<table class={cn("w-full caption-bottom text-sm", className)} {...$$restProps}>
+		<slot />
+	</table>
+</div>
\ No newline at end of file
diff --git a/src/lib/components/shadcn/tabs/index.ts b/src/lib/components/shadcn/tabs/index.ts
new file mode 100644
index 00000000..4e3c5b3a
--- /dev/null
+++ b/src/lib/components/shadcn/tabs/index.ts
@@ -0,0 +1,18 @@
+import { Tabs as TabsPrimitive } from "bits-ui";
+import Content from "./tabs-content.svelte";
+import List from "./tabs-list.svelte";
+import Trigger from "./tabs-trigger.svelte";
+
+const Root = TabsPrimitive.Root;
+
+export {
+	Root,
+	Content,
+	List,
+	Trigger,
+	//
+	Root as Tabs,
+	Content as TabsContent,
+	List as TabsList,
+	Trigger as TabsTrigger,
+};
\ No newline at end of file
diff --git a/src/lib/components/shadcn/tabs/tabs-content.svelte b/src/lib/components/shadcn/tabs/tabs-content.svelte
new file mode 100644
index 00000000..fe56aee3
--- /dev/null
+++ b/src/lib/components/shadcn/tabs/tabs-content.svelte
@@ -0,0 +1,21 @@
+<script lang="ts">
+	import { Tabs as TabsPrimitive } from "bits-ui";
+	import { cn } from "$lib/utils.js";
+
+	type $$Props = TabsPrimitive.ContentProps;
+
+	let className: $$Props["class"] = undefined;
+	export let value: $$Props["value"];
+	export { className as class };
+</script>
+
+<TabsPrimitive.Content
+	class={cn(
+		"mt-2 ring-offset-background focus-visible:outline-none focus-visible:ring-2 focus-visible:ring-ring focus-visible:ring-offset-2",
+		className
+	)}
+	{value}
+	{...$$restProps}
+>
+	<slot />
+</TabsPrimitive.Content>
\ No newline at end of file
diff --git a/src/lib/components/shadcn/tabs/tabs-list.svelte b/src/lib/components/shadcn/tabs/tabs-list.svelte
new file mode 100644
index 00000000..f478d69b
--- /dev/null
+++ b/src/lib/components/shadcn/tabs/tabs-list.svelte
@@ -0,0 +1,19 @@
+<script lang="ts">
+	import { Tabs as TabsPrimitive } from "bits-ui";
+	import { cn } from "$lib/utils.js";
+
+	type $$Props = TabsPrimitive.ListProps;
+
+	let className: $$Props["class"] = undefined;
+	export { className as class };
+</script>
+
+<TabsPrimitive.List
+	class={cn(
+		"inline-flex h-10 items-center justify-center rounded-md bg-muted p-1 text-muted-foreground",
+		className
+	)}
+	{...$$restProps}
+>
+	<slot />
+</TabsPrimitive.List>
\ No newline at end of file
diff --git a/src/lib/components/shadcn/tabs/tabs-trigger.svelte b/src/lib/components/shadcn/tabs/tabs-trigger.svelte
new file mode 100644
index 00000000..f43c3d1f
--- /dev/null
+++ b/src/lib/components/shadcn/tabs/tabs-trigger.svelte
@@ -0,0 +1,23 @@
+<script lang="ts">
+	import { Tabs as TabsPrimitive } from "bits-ui";
+	import { cn } from "$lib/utils.js";
+
+	type $$Props = TabsPrimitive.TriggerProps;
+	type $$Events = TabsPrimitive.TriggerEvents;
+
+	let className: $$Props["class"] = undefined;
+	export let value: $$Props["value"];
+	export { className as class };
+</script>
+
+<TabsPrimitive.Trigger
+	class={cn(
+		"inline-flex items-center justify-center whitespace-nowrap rounded-sm px-3 py-1.5 text-sm font-medium ring-offset-background transition-all focus-visible:outline-none focus-visible:ring-2 focus-visible:ring-ring focus-visible:ring-offset-2 disabled:pointer-events-none disabled:opacity-50 data-[state=active]:bg-background data-[state=active]:text-foreground data-[state=active]:shadow-sm",
+		className
+	)}
+	{value}
+	{...$$restProps}
+	on:click
+>
+	<slot />
+</TabsPrimitive.Trigger>
\ No newline at end of file
diff --git a/src/routes/+page.server.ts b/src/routes/+page.server.ts
new file mode 100644
index 00000000..6e509232
--- /dev/null
+++ b/src/routes/+page.server.ts
@@ -0,0 +1,155 @@
+import { error, fail, redirect } from "@sveltejs/kit";
+import { validateData } from "$lib/utils";
+import { loginUserSchema, registerUserSchema } from "$lib/schemas";
+
+
+/*
+export const load = ({ cookies }) => {
+
+	const subscribeToPro = cookies?.get('pricing-model')
+  
+	return {
+		subscribeToPro: subscribeToPro ?? undefined,
+	};
+  };
+
+*/
+
+
+export const actions = {
+	
+    login: async ({ request, locals }) => {
+		const { formData, errors } = await validateData(
+			await request.formData(),
+			loginUserSchema,
+		);
+
+		if (errors) {
+			return fail(400, {
+				data: formData,
+				errors: errors.fieldErrors,
+			});
+		}
+
+		try {
+			await locals.pb
+				.collection("users")
+				.authWithPassword(formData.email, formData.password);
+			
+			/*	
+			if (!locals.pb?.authStore?.model?.verified) {
+				locals.pb.authStore.clear();
+				return {
+					notVerified: true,
+				};
+			}
+			*/
+			
+		} catch (err) {
+			console.log("Error: ", err);
+			error(err.status, err.message);
+		}
+
+
+		redirect(302, '/');
+	},
+	
+    register: async ({ locals, request }) => {
+		const { formData, errors } = await validateData(await request.formData(), registerUserSchema);
+
+		if (errors) {
+			return fail(400, {
+				data: formData,
+				errors: errors.fieldErrors
+			});
+		}
+
+
+		try {
+			let newUser = await locals.pb.collection('users').create(formData);
+			await locals.pb?.collection('users').update(
+				newUser?.id, {
+					'freeTrial' : true,
+					'tier': 'Pro', //Give new users a free trial for the Pro Subscription
+			});
+			await locals.pb.collection('users').requestVerification(formData.email);
+		} catch (err) {
+			console.log('Error: ', err);
+			error(err.status, err.message);
+		}
+
+		try {
+			await locals.pb
+				.collection("users")
+				.authWithPassword(formData.email, formData.password);
+			
+		
+		} catch (err) {
+			console.log("Error: ", err);
+			error(err.status, err.message);
+		}
+
+		redirect(303, "/");
+	},
+	
+
+	
+    oauth2: async ( { url, locals, request, cookies }) => {
+		const authMethods = await locals?.pb?.collection('users')?.listAuthMethods();
+
+		const data = await request?.formData();
+		const providerSelected = data?.get('provider');
+
+		if (!authMethods) {
+            return {
+                authProviderRedirect: '',
+                authProviderState: ''
+            };
+        }
+        const redirectURL = `${url.origin}/oauth`;
+		
+		const targetItem = authMethods.authProviders?.findIndex(item => item?.name === providerSelected );
+		//console.log("==================")
+		//console.log(authMethods.authProviders)
+		//console.log('target item is: ', targetItem)
+
+        const provider = authMethods.authProviders[targetItem];
+        const authProviderRedirect = `${provider.authUrl}${redirectURL}`;
+        const state = provider.state;
+        const verifier = provider.codeVerifier;
+
+		cookies.set('state', state, {httpOnly: true,
+			sameSite: 'lax',
+			secure: true,
+			path: '/',
+			maxAge: 60*60
+	  	});
+
+		cookies.set('verifier', verifier, {httpOnly: true,
+			sameSite: 'lax',
+			secure: true,
+			path: '/',
+			maxAge: 60*60
+		});
+
+		cookies.set('provider', providerSelected, {httpOnly: true,
+			sameSite: 'lax',
+			secure: true,
+			path: '/',
+			maxAge: 60*60
+		});
+
+		cookies.set('path', "/home", {httpOnly: true,
+			sameSite: 'lax',
+			secure: true,
+			path: '/',
+			maxAge: 60
+	  	});
+
+	
+
+		redirect(302,authProviderRedirect);
+
+	}
+	
+};
diff --git a/src/routes/home/+page.svelte b/src/routes/home/+page.svelte
index ee78877d..b6578c60 100644
--- a/src/routes/home/+page.svelte
+++ b/src/routes/home/+page.svelte
@@ -1,15 +1,18 @@
 <script lang='ts'>
 
-  import { goto } from '$app/navigation';
   import { onMount } from 'svelte';
-  import { abbreviateNumber, formatDate } from '$lib/utils';
-  //import StockSlider from '$lib/components/StockSlider.svelte';
-  import InfoModal from '$lib/components/InfoModal.svelte';
-  import nancyPelosiProfile from '$lib/images/senator/Nancy_Pelosi.png';
-  import warrenBuffetProfile from '$lib/images/hedge_funds/0001067983.png';
-  //import michaelBurryProfile from '$lib/images/hedge_funds/0001649339.png';
-  import analystAvatar from '$lib/images/hedge_funds/default-avatar.png';
-
+ 
+  import * as Avatar from "$lib/components/shadcn/avatar/index.js";
+  import { Button } from "$lib/components/shadcn/button/index.ts";
+  import * as Card from "$lib/components/shadcn/card/index.ts";
+  import * as Table from "$lib/components/shadcn/table/index.ts";
+  import ArrowUpRight from "lucide-svelte/icons/arrow-up-right";
+  import Zap from "lucide-svelte/icons/zap";
+  import Bomb from "lucide-svelte/icons/bomb";
+  import Crown from "lucide-svelte/icons/crown";
+  import Activity from "lucide-svelte/icons/activity";
+  import { abbreviateNumber, formatDate, formatString } from '$lib/utils';
+  
   import { userRegion, searchBarData, numberOfUnreadNotification} from '$lib/store';
 
 
@@ -153,509 +156,237 @@ async function loadSearchData() {
 
 
 
-<div class="w-full max-w-6xl overflow-hidden m-auto min-h-screen bg-[#09090B]">
-
-
-
-  <div class=" m-auto flex flex-wrap flex-col justify-center items-center md:flex-row sm:px-5">
-    <!--Left Col-->
-
+<div class="w-full max-w-screen overflow-hidden m-auto min-h-screen bg-[#09090B]">
     
-    
-    <div class="flex flex-col w-full max-w-6xl justify-center items-center">
-      <div class="text-center mb-10 w-full">                
-        <!---Start-Autocomplete-Searchbar-->
-        <!--
-        {#if sliderList?.length !== 0}
-        <StockSlider sliderList={sliderList}/>
-        {/if}
-        -->
-
-        {#if Feedback}
-          <Feedback data={data} />
-        {/if}
-        <section>
-          <div class="relative w-full max-w-6xl mx-auto overflow-hidden">
-
-            <!--
-            <div class="overflow-hidden overflow-x-hidden w-auto">
-              <Snow />
-            </div>
-            -->
+    <div class="flex flex-col w-full max-w-7xl m-auto justify-center items-center">
+      <div class="text-center mb-10 w-full px-4 sm:px-3 mt-10">                
         
-            
-              <div class="w-full max-w-5xl m-auto flex justify-center overflow-hidden">
-                  <div class="py-7">
-    
-                      <!-- Section content -->
-                      <div class="relative m-auto">
-      
-                          <!-- Section header -->
-                          <div class="h-auto">
-                            
-                            <div class="w-full sm:rounded-xl h-auto p-5 sm:p-10 mt-3">
-                              <div class="grid grid-cols-1 gap-10">
-                            
-                                <!-- Start Column -->
-                                <div >
+        <h1 class="text-white text-3xl font-semibold text-start w-full pl-4 pb-4 sm:pb-2">
+          Dashboard
+        </h1>
 
-                                  <!--
-                                  {#if (data?.user?.tier === 'Pro' && data?.user?.freeTrial === true) || (data?.user?.tier !== 'Pro' && data?.user?.freeTrial === false) }
-                                  <div class="text-center mb-5 relative w-fit flex justify-center m-auto">
-                                    <a href="/pricing" class="text-white antialiased bg-[#27272A] w-full px-4 py-2 rounded-xl m-auto font-medium text-sm flex items-center">
-                                      <span class="font-semibold uppercase">SAVE 50% Off Subscription – Summer Special!</span>
-                                    </a>
-                                    <div class="absolute top-[-1.2rem] -right-5 sm:-right-8 rotate-[7deg]">
-                                      <span class="bg-[#FBCE3C] text-black text-sm sm:text-[0.9rem] rounded-xl font-semibold sm:me-2 px-2.5 py-0.5 rounded dark:bg-red-900 dark:text-red-300">
-                                        Discount
-                                      </span>
-                                    </div>
-                                  </div>
-                                  {:else}
-                                
-                                  <div class="text-center mb-5 relative w-fit flex justify-center m-auto">
-                                    <a href="/dark-pool-flow" class="text-white antialiased bg-[#27272A] w-full px-4 py-2 rounded-xl m-auto font-medium text-sm flex items-center">
-                                      <span class="font-semibold">Realtime Dark Pool Trades from Hedge Funds</span>
-                                    </a>
-                                    <div class="absolute top-[-1.2rem] -right-5 sm:-right-8 rotate-[7deg]">
-                                      <span class="bg-[#FBCE3C] text-black text-sm sm:text-[0.9rem] rounded-xl font-semibold sm:me-2 px-2.5 py-0.5 rounded dark:bg-red-900 dark:text-red-300">
-                                        New
-                                      </span>
-                                    </div>
-                                  </div>
-                                  
-                                  {/if}
-                                  -->
-                                  
-          
-
-                                  <div class="flex flex-row justify-center items-center">
-                                    
-                                    <h1 class="text-center text-4xl sm:text-5xl text-white font-bold mb-6 w-full">
-                                      Stock Analysis for Data
-                                      <span class="text-[#FBCE3C] italic">Freaks</span>
-                                    </h1>
-                                  </div>
-
-
-                                   <!-- Start Image -->
-                                   <!--
-                                <div class="ml-2 m-auto flex justify-center items-center w-full">
-                                    <img class="w-36 sm:w-44 m-auto mt-2 mb-8" src={cloudFrontUrl+"/assets/wsb_praising_logo.png"} alt="logo">
-                                </div>
-                                -->
-                                  <!-- End Image -->
-                                  
-                                  <span class="text-center flex-1 justify-center items-center text-white text-[1rem] sm:text-lg">
-                                    Track the forces driving the stock market with our actionable and easy-to-understand data.
-                                  </span>
-                                  
-                                    
-                               
-                                    <div class="flex justify-center items-center mt-8 mb-6 m-auto w-full max-w-64 sm:max-w-3xl">
-                                      <label on:click={loadSearchData} for="searchBarModal" class="shadow-lg w-96 h-10 sm:h-12 flex flex-row items-center justify-start bg-[#202327] appearance-none py-3 cursor-pointer border border-slate-600 rounded-lg">
-                                          <svg class="w-4 h-4 shrink-0 ml-3 sm:ml-5 text-white inline-block" viewBox="0 0 16 16" xmlns="http://www.w3.org/2000/svg">
-                                            <path d="M7 14c-3.86 0-7-3.14-7-7s3.14-7 7-7 7 3.14 7 7-3.14 7-7 7zM7 2C4.243 2 2 4.243 2 7s2.243 5 5 5 5-2.243 5-5-2.243-5-5-5zm8.707 12.293a.999.999 0 11-1.414 1.414L11.9 13.314a8.019 8.019 0 001.414-1.414l2.393 2.393z" fill="currentColor"></path>
-                                          </svg>
-                                          <span class="text-sm sm:text-lg text-slate-200 ml-3">
-                                            Explore Stocks and ETF's...
-                                          </span>
-                                      </label>
-                                     </div>
-                                     
-                                    
-                                    
-                                  <!-- End Search button -->
-  
-                                    <!-- Ticker Logos -->
-                                    {#if active?.length !== 0}
-                                    <div class="w-auto m-auto flex flex-row items-center justify-center mt-6 text-lg sm:text-xl">
-                                      <span class="text-center text-slate-100">
-                                        Trending:
-                                      </span>
-                                      {#each active?.slice(0,4) as item, index}
-                                        <a href={'/stocks/'+item?.symbol} class="ml-1 text-blue-400 sm:hover:text-slate-100">
-                                          {item?.symbol}
-                                        </a>
-                                        {#if index !== 3}
-                                        <span class="text-blue-400">,</span>
-                                        {/if}
-                                      {/each}
-                                    </div>
-                                    {/if}
-
-                                  
-                                  
-                                    {#if data?.user}
-                                    <div class="text-white text-center text-[1rem] sm:text-lg mt-8 mb-4 font-medium">
-                                      Track the investment portfolios of prominent Wall Street Figures.
-                                    </div>
-
-                                    <div class="w-full max-w-64 sm:max-w-3xl m-auto grid grid-cols-1 md:grid-cols-3 gap-y-3 sm:gap-x-5 flex justify-center items-center">
-                                      
-                                      <a href="/politicians/61b59ab669" class="px-4 py-3 text-white bg-[#202327] rounded-lg flex flex-row items-center font-medium transition duration-150 ease-in-out group">
-                                        <div class="flex flex-row items-center">
-                                          <div class="shadow-lg rounded-full border border-slate-600 w-10 h-10 relative democratic-striped bg-[#295AC7] flex items-center justify-center">
-                                            <img style="clip-path: circle(50%);" class="rounded-full w-8" src={nancyPelosiProfile} loading="lazy"/>
-                                          </div>
-                                          <div class="flex flex-col items-start ml-2">
-                                            <span class="text-sm text-start">Track Nancy Pelosi</span>
-                                            <span class="text-xs text-gray-400">Dem &#183; House</span>
-                                          </div>
-                                        </div>
-                                      </a>
-                                      <a href="/hedge-funds/0001067983" class="px-4 py-3 text-white bg-[#202327] rounded-lg flex flex-row items-center font-medium transition duration-150 ease-in-out group">
-                                        <div class="flex flex-row items-center">
-                                          <div class="shadow-lg rounded-full border border-slate-600 w-10 h-10 relative hedge-fund-striped bg-[#20202E] flex items-center justify-center">
-                                            <img style="clip-path: circle(50%);" class="rounded-full w-8" src={warrenBuffetProfile} loading="lazy"/>
-                                          </div>
-                                          <div class="flex flex-col items-start ml-2">
-                                            <span class="text-sm text-start">Track Warren Buffet</span>
-                                            <span class="text-xs text-gray-400">Berkshire Hathaway</span>
-                                          </div>
-                                        </div>
-                                      </a>
-                                      <a href="/analysts/5874f5e45064ed0001eb1bc5" class="px-4 py-3 text-white bg-[#202327] rounded-lg flex flex-row items-center font-medium transition duration-150 ease-in-out group">
-                                        <div class="flex flex-row items-center">
-                                          <div class="shadow-lg rounded-full border border-slate-600 w-10 h-10 relative analyst-striped bg-[#737D62] flex items-center justify-center">
-                                            <img style="clip-path: circle(50%);" class="rounded-full w-8" src={analystAvatar} loading="lazy"/>
-                                          </div>
-                                          <div class="flex flex-col items-start ml-2">
-                                            <span class="text-sm text-start">Track Keith Horowitz</span>
-                                            <span class="text-xs text-gray-400">Analyst at Citigroup</span>
-                                          </div>
-                                        </div>
-                                      </a>
-
-                                    </div>
-                                    {/if}
-                                    
-
-                                     
-              
-                                </div>
-                                <!-- End Column -->
-                            
-
-                            
-                              </div>
-                            </div>
-
-
-                      </div>
-      
-                  </div>
-              </div>
-      
+        <main class="flex flex-1 flex-col gap-4 sm:p-4 md:gap-8">
+          <div class="grid gap-4 md:grid-cols-2 md:gap-8 lg:grid-cols-4">
+            <Card.Root>
+              <Card.Header class="flex flex-row items-center justify-between space-y-0 pb-2">
+                <Card.Title class="text-start text-xl font-semibold">Most Active</Card.Title>
+                <Activity class="h-4 w-4 shrink-0" />
+              </Card.Header>
+              <Card.Content>
+                <div class="text-start text-2xl font-bold">$45,231.89</div>
+                <p class="text-start text-sm text-muted-foreground">+20.1% from last month</p>
+              </Card.Content>
+            </Card.Root>
+            <Card.Root class="hidden sm:block">
+              <Card.Header class="flex flex-row items-center justify-between space-y-0 pb-2">
+                <Card.Title class="text-start text-xl font-semibold">Biggest Winner</Card.Title>
+                <Crown class="h-4 w-4 shrink-0" />
+              </Card.Header>
+              <Card.Content>
+                <div class="text-start text-2xl font-bold">+2350</div>
+                <p class="text-start text-sm text-muted-foreground">+180.1% from last month</p>
+              </Card.Content>
+            </Card.Root>
+            <Card.Root class="hidden sm:block">
+              <Card.Header class="flex flex-row items-center justify-between space-y-0 pb-2">
+                <Card.Title class="text-start text-xl font-semibold">Biggest Loser</Card.Title>
+                <Bomb class="h-4 w-4 shrink-0" />
+              </Card.Header>
+              <Card.Content>
+                <div class="text-start text-2xl font-bold">+12,234</div>
+                <p class="text-start text-sm text-muted-foreground">+19% from last month</p>
+              </Card.Content>
+            </Card.Root>
+            <Card.Root class="hidden sm:block">
+              <Card.Header class="flex flex-row items-center justify-between space-y-0 pb-2">
+                <Card.Title class="text-start text-xl font-semibold">Most Shorted</Card.Title>
+                <Zap class="h-4 w-4 shrink-0" />
+              </Card.Header>
+              <Card.Content>
+                <div class="text-start text-2xl font-bold">+573</div>
+                <p class="text-start text-sm text-muted-foreground">+201 since last hour</p>
+              </Card.Content>
+            </Card.Root>
           </div>
 
-  <div class="w-full max-w-3xl m-auto mb-20 -mt-4 flex justify-center items-center">
-    <a href="/community" class="px-4 py-3 text-white bg-[#202327] rounded-lg flex flex-row items-center font-medium transition duration-150 ease-in-out group">
-      <svg class="w-6 h-6 mr-2"  viewBox="0 0 24 24" fill="#CCCCCC" xmlns="http://www.w3.org/2000/svg"><path d="M12 2C6.48 2 2 6.48 2 12C2 17.52 6.48 22 12 22C17.52 22 22 17.52 22 12C22 6.48 17.52 2 12 2ZM7 12.75H5C4.59 12.75 4.25 12.41 4.25 12C4.25 11.59 4.59 11.25 5 11.25H7C7.41 11.25 7.75 11.59 7.75 12C7.75 12.41 7.41 12.75 7 12.75ZM12 14.25C10.76 14.25 9.75 13.24 9.75 12C9.75 10.76 10.76 9.75 12 9.75C13.24 9.75 14.25 10.76 14.25 12C14.25 13.24 13.24 14.25 12 14.25ZM19 12.75H17C16.59 12.75 16.25 12.41 16.25 12C16.25 11.59 16.59 11.25 17 11.25H19C19.41 11.25 19.75 11.59 19.75 12C19.75 12.41 19.41 12.75 19 12.75Z" fill="#CCCCCC"></path></svg>
-      <span>Follow the Community </span>
-      <span class="ml-1 mt-0.5 tracking-normal group-hover:translate-x-0.5 transition-transform duration-150 ease-in-out">
-        <svg class="w-4 h-4" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 24 24"><g transform="rotate(90 12 12)"><g fill="none"><path d="M24 0v24H0V0h24ZM12.593 23.258l-.011.002l-.071.035l-.02.004l-.014-.004l-.071-.035c-.01-.004-.019-.001-.024.005l-.004.01l-.017.428l.005.02l.01.013l.104.074l.015.004l.012-.004l.104-.074l.012-.016l.004-.017l-.017-.427c-.002-.01-.009-.017-.017-.018Zm.265-.113l-.013.002l-.185.093l-.01.01l-.003.011l.018.43l.005.012l.008.007l.201.093c.012.004.023 0 .029-.008l.004-.014l-.034-.614c-.003-.012-.01-.02-.02-.022Zm-.715.002a.023.023 0 0 0-.027.006l-.006.014l-.034.614c0 .012.007.02.017.024l.015-.002l.201-.093l.01-.008l.004-.011l.017-.43l-.003-.012l-.01-.01l-.184-.092Z"/><path fill="white" d="M13.06 3.283a1.5 1.5 0 0 0-2.12 0L5.281 8.939a1.5 1.5 0 0 0 2.122 2.122L10.5 7.965V19.5a1.5 1.5 0 0 0 3 0V7.965l3.096 3.096a1.5 1.5 0 1 0 2.122-2.122L13.06 3.283Z"/></g></g></svg>
-    </span>
-    </a>
-  </div>
-  
-  
-
-          
-
-  <div class="grid grid-cols-1 lg:grid-cols-2 lg:gap-x-10 w-full m-auto pb-14 sm:pb-20 sm:mt-10">
-
-  
-    <div class="hidden sm:block w-full">
-      
-      <!--Start Top Winners/Losers-->
-      <div id="step-top-winners" class="flex justify-between items-center">
-          <button on:click={handleClick}>          
-          <h2 class="text-white text-xl sm:text-2xl font-bold text-start mb-2 ml-2 sm:ml-0">
-            <svg class="h-6 w-6 inline-block transform transition-transform {showLoser ? 'mb-2' : 'rotate-180'} mr-1" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 1024 1024"><path fill="white" d="m488.832 344.32l-339.84 356.672a32 32 0 0 0 0 44.16l.384.384a29.44 29.44 0 0 0 42.688 0l320-335.872l319.872 335.872a29.44 29.44 0 0 0 42.688 0l.384-.384a32 32 0 0 0 0-44.16L535.168 344.32a32 32 0 0 0-46.336 0z"/></svg>
-              {buttonText} Today
-          </h2>
-        </button>
-      </div>
-
-      <!--Start of Mode-->
-      <table class="table table-sm table-pin-rows table-compact rounded-none sm:rounded-lg">
-        <thead class="rounded-lg">
-          <tr class="bg-[#09090B]">
-            <th class="text-white font-semibold text-sm">Symbol</th>
-            <th class="text-white font-semibold text-sm">Name</th>
-            <th class="text-white font-semibold text-sm ">Market Cap</th>
-            <th class="text-white font-semibold text-end text-sm">Today</th>
-          </tr>
-        </thead>
-
-        <tbody>
-          {#each gainerLoserTickers as item}
-          <tr on:click={() => goto("/stocks/"+item.symbol)} class="odd:bg-[#27272A] cursor-pointer">
-            <td class="text-blue-400">
-                {item?.symbol}
-            </td>
-
-            <td class="text-white">
-              {item?.name?.length > 20 ? item?.name?.slice(0,20) + "..." : item?.name}
-            </td>
-            
-
-      
-              <td class="text-white">
-                {item?.marketCap !== null ? abbreviateNumber(item?.marketCap,true) : '-'}
-              </td>
-
-      
-              <td class="text-white font-semibold">
-                <div class="flex flex-row justify-end items-center">
-      
-                  <div class="flex flex-col items-center">
-                    <span class="text-white text-md ml-auto">${item.price?.toFixed(2)}</span>
-                    <div class="flex flex-row mt-1">
-                      {#if item?.changesPercentage >=0}
-                        <svg class="w-5 h-5 -mr-0.5 -mt-0.5" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 24 24"><g id="evaArrowUpFill0"><g id="evaArrowUpFill1"><path id="evaArrowUpFill2" fill="#10db06" d="M16.21 16H7.79a1.76 1.76 0 0 1-1.59-1a2.1 2.1 0 0 1 .26-2.21l4.21-5.1a1.76 1.76 0 0 1 2.66 0l4.21 5.1A2.1 2.1 0 0 1 17.8 15a1.76 1.76 0 0 1-1.59 1Z"/></g></g></svg>
-                        <span class="text-[#10DB06] text-xs font-medium">+{item?.changesPercentage?.toFixed(2)}%</span>
-                      {:else}
-                        <svg class="w-5 h-5 -mr-0.5 -mt-0.5 rotate-180" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 24 24"><g id="evaArrowUpFill0"><g id="evaArrowUpFill1"><path id="evaArrowUpFill2" fill="#FF2F1F" d="M16.21 16H7.79a1.76 1.76 0 0 1-1.59-1a2.1 2.1 0 0 1 .26-2.21l4.21-5.1a1.76 1.76 0 0 1 2.66 0l4.21 5.1A2.1 2.1 0 0 1 17.8 15a1.76 1.76 0 0 1-1.59 1Z"/></g></g></svg>    
-                        <span class="text-[#FF2F1F] text-xs font-medium">{item?.changesPercentage?.toFixed(2)}% </span> 
+          <div class="grid gap-4 md:gap-8 lg:grid-cols-2 xl:grid-cols-3 text-start">
+            <Card.Root class="xl:col-span-2 overflow-x-scroll">
+              <Card.Header class="flex flex-row items-center">
+                <div class="text-start grid gap-2">
+                  <Card.Title class="text-2xl tex-white font-semibold">Hottest Options Contract</Card.Title>
+                  <Card.Description>Recent options transaction of Hedge Funds</Card.Description>
+                </div>
+                <Button href="##" class="w-24 ml-auto gap-1 font-semibold bg-white text-black">
+                  View All
+                  <ArrowUpRight class="h-4 w-4 shrink-0" />
+                </Button>
+              </Card.Header>
+              <Card.Content>
+                <Table.Root class="overflow-x-scroll w-full">
+                  <Table.Header>
+                    <Table.Row>
+                      <Table.Head class="text-white">Symbol</Table.Head>
+                      <Table.Head class="text-white">Prem.</Table.Head>
+                      <Table.Head class="text-white">Strike</Table.Head>
+                      <Table.Head class="text-white">Sent.</Table.Head>
+                      <Table.Head class="text-white">C/P</Table.Head>
+                      <Table.Head class="text-right text-white">Expiry</Table.Head>
+                    </Table.Row>
+                  </Table.Header>
+                  <Table.Body>
+                    {#each data?.getOptionsFlowFeed?.slice(0,3) as item}
+                    <Table.Row>
+                      <Table.Cell>
+                        <div class="font-medium text-blue-400">{item?.ticker}</div>
+                        <div class="hidden sm:flex text-sm text-gray-300">
+                            {item?.name}
+                        </div>
+                      </Table.Cell>
+                      <Table.Cell class="xl:table.-column">
+                        {abbreviateNumber(item?.cost_basis)}
+                      </Table.Cell>
+                      <Table.Cell class="xl:table.-column">
+                        ${item?.strike_price}
+                      </Table.Cell>
+                      <Table.Cell class="md:table.-cell xl:table.-column">
+                        {item?.sentiment}
+                      </Table.Cell>
+                      <Table.Cell class="md:table.-cell xl:table.-column">
+                        {item?.put_call}
+                      </Table.Cell>
+                      
+                      <Table.Cell class="text-right">07/26/24</Table.Cell>
+                    </Table.Row>
+                    {/each}
+                  </Table.Body>
+                </Table.Root>
+              </Card.Content>
+            </Card.Root>
+            <Card.Root>
+              <Card.Header>
+                <Card.Title class="text-start text-xl w-full flex flex-row items-center">
+                  <span>
+                    Latest Congress Trading
+                  </span>
+                  <a href="/politicians/flow-data" class="ml-auto rounded-lg text-sm px-3 py-1.5 font-semibold bg-white text-black">
+                    View All
+                    <ArrowUpRight class="h-4 w-4 shrink-0 -mt-1 ml-0.5 inline-block" />
+                  </a>
+                </Card.Title>
+              </Card.Header>
+              <Card.Content class="grid gap-y-4">
+                {#each data?.getPoliticianRSS?.slice(0,4) as item}
+                <div class="flex items-center gap-x-4">
+                  <Avatar.Root class="h-12 w-12 border border-gray-800 flex-shrink-0 avatar {item?.party === 'Republican' ? 'bg-[#98272B]' : item?.party === 'Democratic' ? 'bg-[#295AC7]' : 'bg-[#20202E]'} sm:flex">
+                    <Avatar.Image src={item?.image} alt="Avatar" />
+                    <Avatar.Fallback>OM</Avatar.Fallback>
+                  </Avatar.Root>
+                  <div class="grid gap-1">
+                    <p class="text-sm font-medium leading-none">{item?.representative?.replace('Dr','')}</p>
+                    <p class="text-sm text-muted-foreground">{item?.party ?? 'n/a'}</p>
+                  </div>
+                  <div class="flex flex-col items-end justify-end text-lg ml-auto">
+                    <p class="text-sm text-white font-medium leading-none">
+                      {formatString(item?.assetDescription) ?? '-'}
+                    </p>
+                    
+                    <p class="text-sm text-white font-medium mt-1">{item?.amount?.replace("$1,000,001 - $5,000,000","$1Mio - $5Mio")}</p>
+                    <p class="text-sm text-white font-medium mt-1">
+                      {#if item?.type === 'Bought'}
+                      <span class="text-[#10DB06]">Bought</span>
+                      {:else if item?.type === 'Sold'}
+                        <span class="text-[#FF2F1F]">Sold</span>
                       {/if}
+                    </p>
+                  </div>
+                </div>
+                {/each}
+              </Card.Content>
+            </Card.Root>
+          </div>
+
+
+          <div class="grid gap-4 sm:gap-8 sm:grid-cols-3 text-start">
+            <Card.Root class="sm:col-span-2 overflow-x-scroll">
+              <Card.Header class="flex flex-row items-center">
+                <div class="text-start grid gap-2">
+                  <Card.Title class="text-2xl tex-white font-semibold">Market Momentum</Card.Title>
+                  <Card.Description>Recent options transaction of Hedge Funds</Card.Description>
+                </div>
+              </Card.Header>
+              <Card.Content>
+                {#each rssFeedWIIM.slice(0,5) as item}
+                  <div class="border border-gray-800 p-6 mb-4 rounded-lg text-start">
+                    <div class="text-sm text-white">
+                      <div class="flex flex-col items-start">
+                        <div class="hidden sm:flex flex-row items-center mb-3">
+                          {#if latestInfoDate(item?.date)}
+                            <label class="bg-[#2D4F8A] text-white font-medium text-xs rounded-lg px-2 py-0.5">New</label>
+                            <span class="ml-2 mr-2"> &#183;</span>
+                          {/if}
+                          <span class="text-gray-300 text-xs">
+                            {formatDate(item?.date)} ago
+                          </span>
+                        </div>
+                        <span class="text-white">{item?.text}</span>
+                        <div class="flex flex-col mt-5 items-start w-full">
+                          <div class="flex flex-wrap gap-y-3 flex-row items-center">
+                            {#each item?.stocks as item2}
+                              <div class="p-2 pt-1 sm:pt-2 pl-0">
+                                <a href={item2?.assetType === 'stock' ? `/stocks/${item2?.ticker}` : item2?.assetType === 'etf' ? `/etf/${item2?.ticker}` : ''} class="cursor-pointer w-fit bg-[#404040] bg-opacity-[0.5] sm:hover:bg-opacity-[0.6] px-3 sm:px-4 py-1.5 sm:py-2 text-sm rounded-xl hover:text-white text-blue-400">
+                                  {item2?.ticker}
+                                </a>
+                              </div>
+                            {/each}
+                          </div>
+                          
+                          <div class="sm:hidden flex flex-row items-center justify-end mt-3 ml-auto">
+                            {#if latestInfoDate(item?.date)}
+                              <label class="bg-[#2D4F8A] text-white font-medium text-xs rounded-lg px-2 py-0.5">New</label>
+                              <span class="ml-2 mr-2"> &#183;</span>
+                            {/if}
+                            <span class="text-gray-300 text-xs">
+                              {formatDate(item?.date)} ago
+                            </span>
+                          </div>
+
+                        </div>
+                      </div>
+                      
                     </div>
                   </div>
-      
-                  
-              </div>
-            </td>
-          </tr>
-          {/each}
-        </tbody>
-      </table>
-
-
-    </div>
-
-
-
-     <!--Start Mobile Trending Scrollbar-->
-     <div class="sm:hidden overflow-hidden">
-      <div class="flex flex-row items-center w-full">
-
-
-
-        <label class="text-white text-xl p-4 font-medium flex flex-row items-center">
-          Trending
-          <InfoModal
-          title={'Trending'}
-          content={"Explore today's market highlights, including top gainers, losers and the most actively traded stocks."}
-          id={'trendingModal'}
-          />
-        </label>
-          
-      
-
-        <a href="/market-mover" class="ml-auto text-slate-300 text-sm font-medium pr-4 cursor-pointer">
-          See All
-        </a>
-      </div>
-
-      <div class="w-full flex flex-row items-center mb-5 ml-3 overflow-hidden">
-        <label on:click={() => scrollToItem('gainer')} class="flex flex-row items-center {trendingText === 'gainer' ? 'bg-[#333333]' : 'bg-[#09090B]'} rounded-xl py-1">
-          <svg class="ml-2 w-5" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 16 16"><path fill="white" d="m1 7.4l.7.7l6-6l6 6l.7-.7L8.1 1h-.7L1 7.4zm0 6l.7.7l6-6l6 6l.7-.7L8.1 7h-.7L1 13.4z"/></svg>
-          <span class="text-white text-sm font-medium ml-2 mr-4">
-            Gainers
-          </span>
-        </label>
-        <label on:click={() => scrollToItem('loser')} class="flex flex-row items-center {trendingText === 'loser' ? 'bg-[#333333]' : 'bg-[#09090B]'} rounded-xl py-1 ml-4">
-          <svg class="ml-2 w-5" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 256 256"><path fill="white" d="M240 136v64a8 8 0 0 1-8 8h-64a8 8 0 0 1 0-16h44.69L136 115.31l-34.34 34.35a8 8 0 0 1-11.32 0l-72-72a8 8 0 0 1 11.32-11.32L96 132.69l34.34-34.35a8 8 0 0 1 11.32 0L224 180.69V136a8 8 0 0 1 16 0Z"/></svg>
-          <span class="text-white text-sm font-medium ml-2 mr-4">
-            Losers
-          </span>
-        </label>
-        <label on:click={() => scrollToItem('active')} class="flex flex-row items-center {trendingText === 'active' ? 'bg-[#333333]' : 'bg-[#09090B]'} rounded-xl py-1 ml-4">
-          <svg class="ml-2 w-5" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 512 512"><path fill="white" d="M253.78 17.188c-130.728 0-236.905 106.177-236.905 236.906C16.875 384.824 123.052 491 253.78 491c130.73 0 236.907-106.18 236.907-236.906c0-130.73-106.177-236.906-236.906-236.906zm0 18.687c120.63 0 218.22 97.59 218.22 218.22c0 120.626-97.59 218.218-218.22 218.218c-120.628 0-218.218-97.59-218.218-218.22s97.59-218.218 218.22-218.218zm101.19 46.313l-76.41 132.875c15.916 9.635 25.177 26.33 26.125 43.78h148.407c1.644-70.01-33.49-138.867-98.125-176.656zm-205.126 2.468c-27.1 16.725-50.68 40.147-67.72 69.656c-19.01 32.928-26.926 69.12-26 104.532H196a54.04 54.04 0 0 1 7.188-24.438c5.21-9.024 12.64-16 21.218-20.625L149.844 84.657zm100.594 141.156a36.723 36.723 0 0 0-2.594.094c-11.446.793-22.288 7.084-28.5 17.844c-9.94 17.216-4.09 38.967 13.125 48.906c17.213 9.94 38.935 4.12 48.874-13.094c9.94-17.215 4.12-38.967-13.094-48.906c-5.648-3.26-11.768-4.824-17.813-4.844zm28.218 82.375c-16.127 9.75-36.864 10.846-54.406 1.25l-68.03 117.22c29.454 16.785 61.044 25.177 92.75 26c34.567.898 68.72-7.786 99.124-24.032l-69.438-120.438z"/></svg>
-          <span class="text-white text-sm font-medium ml-2 mr-4">
-            Most Active
-          </span>
-        </label>
-      </div>
-
-      <div class="w-screen no-scrollbar grid grid-cols-5 gap-x-44 overflow-hidden overflow-x-scroll pl-5 pr-10">
-        {#each (trendingText === 'gainer' ? gainer : trendingText === 'loser' ? loser : active) as item,index}
-          <a href={"/stocks/"+item?.symbol} class="bg-[#09090B] rounded-lg  h-[90px] w-36 relative">
-            <span class="stroke-text absolute right-32 bottom-0">
-              {index+1}
-            </span>
-            <div class="flex flex-row items-center justify-end p-2">
-              <span class="text-slate-200 text-sm font-medium mr-2">
-                {item?.symbol}
-              </span>
-              <div class="rounded-full w-7 h-7 relative bg-[#09090B] flex items-center justify-center">
-                <img style="clip-path: circle(50%);" class="w-5 h-5" src={`https://financialmodelingprep.com/image-stock/${item?.symbol}.png`} alt="stock logo" loading='lazy'/>
-              </div>
-            </div>
-
-            <div class="flex flex-col items-center">
-              <span class="text-white font-bold text-xs ml-auto mr-2">${item.price?.toFixed(2)}</span>
-              <div class="flex flex-row mt-1 ml-auto mr-2">
-                {#if item?.changesPercentage >=0}
-                  <svg class="w-5 h-5 -mr-0.5 -mt-0.5" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 24 24"><g id="evaArrowUpFill0"><g id="evaArrowUpFill1"><path id="evaArrowUpFill2" fill="#10db06" d="M16.21 16H7.79a1.76 1.76 0 0 1-1.59-1a2.1 2.1 0 0 1 .26-2.21l4.21-5.1a1.76 1.76 0 0 1 2.66 0l4.21 5.1A2.1 2.1 0 0 1 17.8 15a1.76 1.76 0 0 1-1.59 1Z"/></g></g></svg>
-                  <span class="text-[#10DB06] text-xs font-medium">+{item?.changesPercentage?.toFixed(2)}%</span>
-                {:else}
-                  <svg class="w-5 h-5 -mr-0.5 -mt-0.5 rotate-180" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 24 24"><g id="evaArrowUpFill0"><g id="evaArrowUpFill1"><path id="evaArrowUpFill2" fill="#FF2F1F" d="M16.21 16H7.79a1.76 1.76 0 0 1-1.59-1a2.1 2.1 0 0 1 .26-2.21l4.21-5.1a1.76 1.76 0 0 1 2.66 0l4.21 5.1A2.1 2.1 0 0 1 17.8 15a1.76 1.76 0 0 1-1.59 1Z"/></g></g></svg>    
-                  <span class="text-[#FF2F1F] text-xs font-medium">{item?.changesPercentage?.toFixed(2)}% </span> 
-                {/if}
-              </div>
-            </div>
-
-            
-          </a>
-        {/each}
-      </div>
-    </div>
-    <!--End Mobile Trending Scrollbar-->
-
-    <!--End Top Winners/Losers-->
-
-    <div class="hidden sm:block w-full mt-10 lg:mt-0">
-      <div>
-        <div id="step-most-active" class="flex justify-between items-center">
-          
-          <h2 class="text-white text-xl sm:text-2xl font-bold text-start mb-2 ml-2 sm:ml-0">
-            Most Active Today
-          </h2>
-          
-        </div>
-
-      <table class="table table-sm table-compact table-pin-rows shadow-md rounded-none sm:rounded-lg bg-[#09090B]">
-        <thead>
-          <tr class="bg-[#09090B]">
-            <th class="text-white font-semibold text-sm">Symbol</th>
-            <th class="text-white font-semibold text-sm">Name</th>
-            <th class="text-white font-semibold text-sm ">Volume</th>
-            <th class="text-white font-semibold text-end text-sm">Today</th>
-          </tr>
-        </thead>
-        <tbody>
-          {#each active as item, index}
-          <tr on:click={() => goto("/stocks/"+item?.symbol)} class="odd:bg-[#27272A] cursor-pointer">
-            <td class="text-blue-400 ">
-              {item?.symbol}
-            </td>
-            
-            <td class="text-white ">
-              {item?.name?.length > 20 ? item?.name?.slice(0,20) + "..." : item?.name}
-            </td>
-    
-      
-  
-          <td class="text-white ">
-            {item?.volume !== null ? abbreviateNumber(item?.volume) : '-'}
-          </td>
-
-  
-          <td class="text-white  font-semibold">
-            <div class="flex flex-row justify-end items-center">
-  
-              <div class="flex flex-col items-center">
-                <span class="text-white text-md ml-auto">${item.price?.toFixed(2)}</span>
-                <div class="flex flex-row mt-1">
-                  {#if item?.changesPercentage >=0}
-                    <svg class="w-5 h-5 -mr-0.5 -mt-0.5" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 24 24"><g id="evaArrowUpFill0"><g id="evaArrowUpFill1"><path id="evaArrowUpFill2" fill="#10db06" d="M16.21 16H7.79a1.76 1.76 0 0 1-1.59-1a2.1 2.1 0 0 1 .26-2.21l4.21-5.1a1.76 1.76 0 0 1 2.66 0l4.21 5.1A2.1 2.1 0 0 1 17.8 15a1.76 1.76 0 0 1-1.59 1Z"/></g></g></svg>
-                    <span class="text-[#10DB06] text-xs">+{item?.changesPercentage?.toFixed(2)}%</span>
-                  {:else}
-                    <svg class="w-5 h-5 -mr-0.5 -mt-0.5 rotate-180" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 24 24"><g id="evaArrowUpFill0"><g id="evaArrowUpFill1"><path id="evaArrowUpFill2" fill="#FF2F1F" d="M16.21 16H7.79a1.76 1.76 0 0 1-1.59-1a2.1 2.1 0 0 1 .26-2.21l4.21-5.1a1.76 1.76 0 0 1 2.66 0l4.21 5.1A2.1 2.1 0 0 1 17.8 15a1.76 1.76 0 0 1-1.59 1Z"/></g></g></svg>    
-                    <span class="text-[#FF2F1F] text-xs">{item?.changesPercentage?.toFixed(2)}% </span> 
-                  {/if}
-                  </div>
-              </div>
-  
-              
-          </div>
-        </td>
-      </tr>
-          {/each}
-        </tbody>
-      </table>
-
-    </div>
-  </div>
-
-
-
-
-  </div>
-
-
-    <!--Start WIIM-->
-    <div class="w-full m-auto p-2 sm:p-0 mb-20">
-      <h2 class="text-white text-xl sm:text-2xl font-bold text-start mt-5 mb-2 ml-2 ">
-        Latest Market Momentum
-      </h2>
-          {#each rssFeedWIIM?.slice(0,5) as item}
-          <div class="shadow-md bg-[#27272A] p-6 mb-4 rounded-lg text-start">
-            <div class="text-sm text-white">
-              <div class="flex flex-col items-start">
-                <div class="hidden sm:flex flex-row items-center mb-3">
-                  {#if latestInfoDate(item?.date)}
-                    <label class="bg-[#2D4F8A] text-white font-medium text-xs rounded-lg px-2 py-0.5">New</label>
-                    <span class="ml-2 mr-2"> &#183;</span>
-                  {/if}
-                  <span class="text-gray-300 text-xs">
-                    {formatDate(item?.date)} ago
-                  </span>
-                </div>
-                <span class="text-white">{item?.text}</span>
-                <div class="flex flex-col mt-5 items-start w-full">
-                  <div class="flex flex-wrap gap-y-3 flex-row items-center">
-                    {#each item?.stocks as item2}
-                      <div class="mr-2 mb-2 sm:mb-0">
-                        <a href={item2?.assetType === 'stock' ? `/stocks/${item2?.ticker}` : item2?.assetType === 'etf' ? `/etf/${item2?.ticker}` : ''} class="cursor-pointer w-fit bg-[#404040] bg-opacity-[0.5] sm:hover:bg-opacity-[0.6] px-3 sm:px-4 py-1.5 sm:py-2 text-sm rounded-xl hover:text-white text-blue-400">
-                          {item2?.ticker}
-                        </a>
+                  {/each}
+              </Card.Content>
+            </Card.Root>
+            <Card.Root>
+              <Card.Header>
+                <Card.Title class="text-start">Market News</Card.Title>
+              </Card.Header>
+              <Card.Content class="">
+                <div class="mb-4 rounded-lg text-start">
+                  <div class="text-sm">
+                    <div class="flex flex-col items-start">
+                      <div class="hidden sm:flex flex-row items-center mb-3">
+                
+                        <span class="text-gray-300 text-xs">
+                          17m ago
+                        </span>
                       </div>
-                    {/each}
+                      <span class="text-sm text-blue-400">S&P 500 Staggers To Worst Week Since April As Goldman Sachs Warns Of Cool Summe... - Forbes</span>
+                    </div>
+                    
                   </div>
-                  
-                  <div class="sm:hidden flex flex-row items-center justify-end mt-3 ml-auto">
-                    {#if latestInfoDate(item?.date)}
-                      <label class="bg-[#2D4F8A] text-white font-medium text-xs rounded-lg px-2 py-0.5">New</label>
-                      <span class="ml-2 mr-2"> &#183;</span>
-                    {/if}
-                    <span class="text-gray-300 text-xs">
-                      {formatDate(item?.date)} ago
-                    </span>
-                  </div>
-
                 </div>
-              </div>
-              
-            </div>
+             
+              </Card.Content>
+            </Card.Root>
           </div>
-          {/each}
-    </div>
-    <!--End WIIM-->
-    
-    
-
-
-
-      </section>
-
-  
-
+        </main>
+      
         
      </div>
 
-
     </div>
-
-    
-    
-
-  </div>
-
-  
-
 </div>
 
 
@@ -699,36 +430,4 @@ async function loadSearchData() {
 }
 
 
-.democratic-striped {
-    background-image: repeating-linear-gradient(
-        -45deg,
-        #295AC7,
-        #295AC7 10px,
-        #164D9D 10px,
-        #164D9D 20px
-    );
-}
-
-.hedge-fund-striped {
-    background-image: repeating-linear-gradient(
-        -45deg,
-        #A77120,
-        #A77120 10px,
-        #90621C 10px,
-        #90621C 20px
-    );
-}
-
-.analyst-striped {
-    background-image: repeating-linear-gradient(
-        -45deg,
-        #737D62,
-        #737D62 10px,
-        #677058 10px,
-        #677058 20px
-    );
-}
-
-
-
 </style>
\ No newline at end of file
diff --git a/src/routes/home/+page.ts b/src/routes/home/+page.ts
index e0f608f0..35609a21 100644
--- a/src/routes/home/+page.ts
+++ b/src/routes/home/+page.ts
@@ -1,4 +1,6 @@
-import {userRegion, getCache, setCache } from '$lib/store';
+import { userRegion, getCache, setCache } from '$lib/store';
+import defaultAvatar from '$lib/images/senator/default-avatar.png';
+import { getPartyForPoliticians } from '$lib/utils';
 import { redirect } from '@sveltejs/kit';
 
 
@@ -8,6 +10,27 @@ let apiURL;
 let apiKey = import.meta.env.VITE_STOCKNEAR_API_KEY;
 
 
+
+let images = {};
+// Function to load images only when they are viewed
+async function loadImages() {
+  const imageFiles = import.meta.glob('$lib/images/senator/*.png');
+  const imagesPromises = [];
+
+  for (const [path, resolver] of Object?.entries(imageFiles)) {
+    const imageNameMatch = path?.match(/\/([^/]+)\.png$/);
+    if (imageNameMatch && imageNameMatch[1] !== 'default-avatar') {
+      imagesPromises?.push(resolver()?.then(module => {
+        images[imageNameMatch[1]] = module.default;
+      }));
+    }
+  }
+
+  await Promise?.all(imagesPromises);
+}
+
+
+
 userRegion.subscribe(value => {
 
   if (usRegion.includes(value)) {
@@ -76,9 +99,71 @@ export const load = async ({ parent}) => {
     return output;
   };
 
+  const getOptionsFlowFeed = async () => {
+    // make the POST request to the endpoint
+    const response = await fetch(apiURL + '/options-flow-feed', {
+      method: 'GET',
+      headers: {
+        "Content-Type": "application/json", "X-API-KEY": apiKey
+      },
+    });
+    const output = await response.json();
+
+    return output;
+  };
+
+  const getPoliticianRSS = async () => {
+    let output;
+
+    // Get cached data for the specific tickerID
+    const cachedData = getCache('', 'getPoliticianRSS');
+    if (cachedData) {
+      output = cachedData;
+    } else {
+
+      const response = await fetch(apiURL + '/congress-rss-feed', {
+        method: 'GET',
+        headers: {
+          "Content-Type": "application/json", "X-API-KEY": apiKey
+        },
+      });
+
+      output = await response.json();
+
+      // Cache the data for this specific tickerID with a specific name 'getPoliticianRSS'
+
+      await loadImages();
+      output?.forEach(item => {
+        let representative = item?.representative || '';
+    
+        representative = representative?.replace('Jr', '')
+            .replace(/Dr./g, '')
+            .replace(/Dr_/g, '')
+    
+        const fullName = representative?.replace(/(\s(?:Dr\s)?\w(?:\.|(?=\s)))?\s/g, '_').trim();
+        item.image = images[fullName] || defaultAvatar;
+        item.representative = fullName?.replace(/_/g, ' ');
+        });
+    
+        output = output?.map(item => {
+            const party = getPartyForPoliticians(item?.representative);
+            return {
+                ...item,
+                party: party
+            };
+      });
+
+      
+      setCache('', output, 'getPoliticianRSS');
+    }
+    return output;
+  };
+
   // Make sure to return a promise
   return {
     getDailyGainerLoserActive: await getDailyGainerLoserActive(),
     getRssFeedWIIM: await getRssFeedWIIM(),
+    getPoliticianRSS: await getPoliticianRSS(),
+    getOptionsFlowFeed: await getOptionsFlowFeed(),
   };
 };
\ No newline at end of file
diff --git a/src/routes/market-mover/+page.svelte b/src/routes/market-mover/+page.svelte
index 63daf180..9a09a4af 100644
--- a/src/routes/market-mover/+page.svelte
+++ b/src/routes/market-mover/+page.svelte
@@ -276,9 +276,9 @@ $: {
   <div class="w-full -mt-4 mb-8 m-auto flex justify-center items-center p-3">
     <div class="w-full grid grid-cols-2 lg:grid-cols-4 gap-y-3 lg:gap-y-0 gap-x-3 ">
     <MiniPlot title="S&P500" priceData = {priceDataSP500} changesPercentage={changeSP500} previousClose={previousCloseSP500}/>
-    <MiniPlot title="Nasdaq 100" priceData = {priceDataNasdaq} changesPercentage={changeNasdaq} previousClose={previousCloseNasdaq}/>
-    <MiniPlot title="Dow Jones" priceData = {priceDataDowJones} changesPercentage={changeDowJones} previousClose={previousCloseDowJones}/>
-    <MiniPlot title="Russel 2000" priceData = {priceDataRussel2000} changesPercentage={changeRussel2000} previousClose={previousCloseRussel2000}/>
+    <MiniPlot title="Nasdaq" priceData = {priceDataNasdaq} changesPercentage={changeNasdaq} previousClose={previousCloseNasdaq}/>
+    <MiniPlot title="Dow" priceData = {priceDataDowJones} changesPercentage={changeDowJones} previousClose={previousCloseDowJones}/>
+    <MiniPlot title="Russel" priceData = {priceDataRussel2000} changesPercentage={changeRussel2000} previousClose={previousCloseRussel2000}/>
     </div>
   </div>
 
diff --git a/src/routes/politicians/flow-data/+page.server.ts b/src/routes/politicians/flow-data/+page.server.ts
deleted file mode 100644
index 884594c3..00000000
--- a/src/routes/politicians/flow-data/+page.server.ts
+++ /dev/null
@@ -1,38 +0,0 @@
-const usRegion = ['cle1','iad1','pdx1','sfo1'];
-
-
-
-export const load = async ({locals}) => {
-
-  const userRegion = locals.region?.split("::")[0];
-  let apiURL;
-let apiKey = import.meta.env.VITE_STOCKNEAR_API_KEY;
-
-
-    if (usRegion?.includes(userRegion)) {
-        apiURL = import.meta.env.VITE_USEAST_API_URL;
-    } else {
-        apiURL = import.meta.env.VITE_EU_API_URL;
-    };
-
-  const getPoliticianRSS = async () => {
-    
-    const response = await fetch(apiURL + '/congress-rss-feed', {
-      method: 'GET',
-      headers: {
-        "Content-Type": "application/json", "X-API-KEY": apiKey
-      },
-    });
-
-    let output = await response.json();
-
-    output = locals?.user?.tier !== 'Pro' ? output?.slice(0,6) : output;
-
-    return output;
-  };
-
-  // Make sure to return a promise
-  return {
-    getPoliticianRSS: await getPoliticianRSS()
-  };
-};
\ No newline at end of file
diff --git a/src/routes/politicians/flow-data/+page.ts b/src/routes/politicians/flow-data/+page.ts
new file mode 100644
index 00000000..cd52e56d
--- /dev/null
+++ b/src/routes/politicians/flow-data/+page.ts
@@ -0,0 +1,93 @@
+import { userRegion, getCache, setCache } from '$lib/store';
+import defaultAvatar from '$lib/images/senator/default-avatar.png';
+import { getPartyForPoliticians } from '$lib/utils';
+
+
+const usRegion = ['cle1','iad1','pdx1','sfo1'];
+
+let apiURL;
+let apiKey = import.meta.env.VITE_STOCKNEAR_API_KEY;
+
+
+userRegion.subscribe(value => {
+
+  if (usRegion?.includes(value)) {
+    apiURL = import.meta.env.VITE_USEAST_API_URL;
+  } else {
+    apiURL = import.meta.env.VITE_EU_API_URL;
+  }
+});
+
+
+let images = {};
+// Function to load images only when they are viewed
+async function loadImages() {
+  const imageFiles = import.meta.glob('$lib/images/senator/*.png');
+  const imagesPromises = [];
+
+  for (const [path, resolver] of Object?.entries(imageFiles)) {
+    const imageNameMatch = path?.match(/\/([^/]+)\.png$/);
+    if (imageNameMatch && imageNameMatch[1] !== 'default-avatar') {
+      imagesPromises?.push(resolver()?.then(module => {
+        images[imageNameMatch[1]] = module.default;
+      }));
+    }
+  }
+
+  await Promise?.all(imagesPromises);
+}
+
+
+export const load = async () => {
+  const getPoliticianRSS = async () => {
+    let output;
+
+    // Get cached data for the specific tickerID
+    const cachedData = getCache('', 'getPoliticianRSS');
+    if (cachedData) {
+      output = cachedData;
+    } else {
+
+      const response = await fetch(apiURL + '/congress-rss-feed', {
+        method: 'GET',
+        headers: {
+          "Content-Type": "application/json", "X-API-KEY": apiKey
+        },
+      });
+
+      output = await response.json();
+
+      // Cache the data for this specific tickerID with a specific name 'getPoliticianRSS'
+
+      await loadImages();
+      output?.forEach(item => {
+        let representative = item?.representative || '';
+    
+        representative = representative?.replace('Jr', '')
+            .replace(/Dr./g, '')
+            .replace(/Dr_/g, '')
+    
+        const fullName = representative?.replace(/(\s(?:Dr\s)?\w(?:\.|(?=\s)))?\s/g, '_').trim();
+        item.image = images[fullName] || defaultAvatar;
+        item.representative = fullName?.replace(/_/g, ' ');
+        });
+    
+        output = output?.map(item => {
+            const party = getPartyForPoliticians(item?.representative);
+            return {
+                ...item,
+                party: party
+            };
+      });
+
+      
+      setCache('', output, 'getPoliticianRSS');
+    }
+    return output;
+  };
+
+  // Make sure to return a promise
+  return {
+    getPoliticianRSS: await getPoliticianRSS()
+  };
+};
\ No newline at end of file
diff --git a/src/routes/watchlist/+page.svelte b/src/routes/watchlist/+page.svelte
index 673a3167..9bd5b37e 100644
--- a/src/routes/watchlist/+page.svelte
+++ b/src/routes/watchlist/+page.svelte
@@ -411,7 +411,6 @@ onDestroy( () => {
           <path fill="#1E40AF" d="M57.6,-58.7C72.7,-42.6,81.5,-21.3,82,0.5C82.5,22.3,74.7,44.6,59.7,60.1C44.6,75.6,22.3,84.3,0,84.3C-22.3,84.2,-44.6,75.5,-61.1,60.1C-77.6,44.6,-88.3,22.3,-87.6,0.7C-86.9,-20.8,-74.7,-41.6,-58.2,-57.7C-41.6,-73.8,-20.8,-85.2,0.2,-85.4C21.3,-85.6,42.6,-74.7,57.6,-58.7Z" transform="translate(100 100)" filter="url(#glow)" />
         </svg>
         
-        
         <div class="z-1 absolute top-3 right-10 ">
           <img class="w-24" src={cloudFrontUrl+"/assets/watchlist_icon.png"} alt="logo" loading='lazy'>
         </div>
@@ -427,9 +426,9 @@ onDestroy( () => {
     <div class="w-full -mt-6 mb-8 m-auto flex justify-center items-center p-3">
       <div class="w-full grid grid-cols-2 lg:grid-cols-4 gap-y-3 lg:gap-y-0 gap-x-3 ">
       <MiniPlot title="S&P500" priceData = {priceDataSP500} changesPercentage={changeSP500} previousClose={previousCloseSP500}/>
-      <MiniPlot title="Nasdaq 100" priceData = {priceDataNasdaq} changesPercentage={changeNasdaq} previousClose={previousCloseNasdaq}/>
-      <MiniPlot title="Dow Jones" priceData = {priceDataDowJones} changesPercentage={changeDowJones} previousClose={previousCloseDowJones}/>
-      <MiniPlot title="Russel 2000" priceData = {priceDataRussel2000} changesPercentage={changeRussel2000} previousClose={previousCloseRussel2000}/>
+      <MiniPlot title="Nasdaq" priceData = {priceDataNasdaq} changesPercentage={changeNasdaq} previousClose={previousCloseNasdaq}/>
+      <MiniPlot title="Dow" priceData = {priceDataDowJones} changesPercentage={changeDowJones} previousClose={previousCloseDowJones}/>
+      <MiniPlot title="Russel" priceData = {priceDataRussel2000} changesPercentage={changeRussel2000} previousClose={previousCloseRussel2000}/>
       </div>
     </div>