diff --git a/prisma/migrations/20251025132207_tutorprofile_updates/migration.sql b/prisma/migrations/20251025132207_tutorprofile_updates/migration.sql
new file mode 100644
index 0000000..f4f733d
--- /dev/null
+++ b/prisma/migrations/20251025132207_tutorprofile_updates/migration.sql
@@ -0,0 +1,2 @@
+-- AlterTable
+ALTER TABLE "TutorProfile" ADD COLUMN     "preferredSessionTypes" TEXT[];
diff --git a/prisma/schema.prisma b/prisma/schema.prisma
index 09af18b..9b22e4a 100644
--- a/prisma/schema.prisma
+++ b/prisma/schema.prisma
@@ -34,6 +34,7 @@ model TutorProfile {
   teachingStyle     String[]
   tutorCredentials  TutorCredentials[]
   user              User               @relation(fields: [userId], references: [id])
+  preferredSessionTypes String[]
 }
 
 model TutorCredentials {
diff --git a/src/app/dashboard/_components/sidebar.tsx b/src/app/dashboard/_components/sidebar.tsx
index 4eb5739..544ddf2 100644
--- a/src/app/dashboard/_components/sidebar.tsx
+++ b/src/app/dashboard/_components/sidebar.tsx
@@ -3,6 +3,7 @@ import Link from "next/link";
 import { usePathname } from "next/navigation";
 import { Home, Activity, BookOpen, MessageSquare, Phone, Settings } from "lucide-react";
 import { useState } from "react";
+import { api } from "@/trpc/react";
 
 type Item = {
     href: string;
@@ -22,9 +23,17 @@ const items: Item[] = [
 export function Sidebar() {
     const pathname = usePathname();
     const [open, setOpen] = useState(false);
+    const { data: role } = api.signal.getViewerRole.useQuery();
+    const isTutor = role === "TUTOR";
+
     const Nav = (
         <nav className="rounded-2xl bg-white/90 p-3 shadow-sm backdrop-blur">
-            <div className="px-3 py-4 text-lg font-semibold text-neutral-900">TutorLink</div>
+            <div className="px-3 py-4">
+                <div className="text-lg font-semibold text-neutral-900">TutorLink</div>
+                <div className="mt-2 inline-block px-2.5 py-1 rounded-full text-xs font-semibold bg-indigo-100 text-indigo-900">
+                    {isTutor ? "🎓 Tutor" : "👤 Student"}
+                </div>
+            </div>
             <ul className="space-y-1">
                 {items.map((i) => {
                     const active = pathname === i.href;
diff --git a/src/app/dashboard/settings/page.tsx b/src/app/dashboard/settings/page.tsx
index ef8c8d2..c22cc15 100644
--- a/src/app/dashboard/settings/page.tsx
+++ b/src/app/dashboard/settings/page.tsx
@@ -1,10 +1,45 @@
+"use client";
+
 import { SignOutButton } from "@clerk/nextjs";
+import Link from "next/link";
+import { api } from "@/trpc/react";
+import { Zap } from "lucide-react";
 
 export default function SettingsPage() {
+    const { data: role, isLoading, isError } = api.signal.getViewerRole.useQuery();
+    const isTutor = !!role && role === "TUTOR";
+
     return (
         <div className="flex flex-col gap-6">
             <h1 className="text-xl font-semibold text-neutral-900">Settings</h1>
 
+            {/* Loading state */}
+            {isLoading && (
+                <div className="pt-4 border-t border-neutral-200">
+                    <div className="h-10 bg-neutral-200 rounded-lg animate-pulse"></div>
+                </div>
+            )}
+
+            {/* Error state */}
+            {isError && (
+                <div className="pt-4 border-t border-neutral-200">
+                    <p className="text-sm text-red-600">Failed to load user role</p>
+                </div>
+            )}
+
+            {/* Tutor-specific section - only show when loaded and is tutor */}
+            {!isLoading && !isError && isTutor && (
+                <div className="pt-4 border-t border-neutral-200">
+                    <h2 className="text-lg font-medium text-neutral-900 mb-4">Signals</h2>
+                    <Link href="/dashboard/signal">
+                        <button className="px-4 py-2 bg-indigo-600 text-white rounded-lg hover:bg-indigo-700 transition-colors flex items-center gap-2">
+                            <Zap size={18} />
+                            View Active Signals
+                        </button>
+                    </Link>
+                </div>
+            )}
+
             <div className="pt-4 border-t border-neutral-200">
                 <h2 className="text-lg font-medium text-neutral-900 mb-4">Account</h2>
                 <SignOutButton redirectUrl="/">
diff --git a/src/app/onboarding/page.tsx b/src/app/onboarding/page.tsx
index 05e0522..43a0104 100644
--- a/src/app/onboarding/page.tsx
+++ b/src/app/onboarding/page.tsx
@@ -1,11 +1,18 @@
 "use client";
 import Link from "next/link";
+import { useEffect } from "react";
 import { Button } from "@/components/ui/button";
 import { useOnboardingStore } from "@/stores/onboarding";
 
 export default function OnboardingIndex() {
     const role = useOnboardingStore((s) => s.role);
     const setRole = useOnboardingStore((s) => s.setRole);
+    const reset = useOnboardingStore((s) => s.reset);
+
+    // Clear any previous onboarding data when starting fresh
+    useEffect(() => {
+        reset();
+    }, [reset]);
 
     return (
         <div className="min-h-screen w-full bg-linear-to-b from-white via-blue-50 to-[#43A8FF]">
diff --git a/src/app/onboarding/tutor/summary/page.tsx b/src/app/onboarding/tutor/summary/page.tsx
index 30e85a1..9f83b9b 100644
--- a/src/app/onboarding/tutor/summary/page.tsx
+++ b/src/app/onboarding/tutor/summary/page.tsx
@@ -4,6 +4,8 @@ import { useEffect } from "react";
 import { useRouter } from "next/navigation";
 import { Button } from "@/components/ui/button";
 import { useOnboardingStore } from "@/stores/onboarding";
+import { api } from "@/trpc/react";
+import { toast } from "sonner";
 
 export default function TutorSummary() {
     const role = useOnboardingStore((s) => s.role);
@@ -13,13 +15,35 @@ export default function TutorSummary() {
     const yearsOfExperience = useOnboardingStore((s) => s.yearsOfExperience);
     const teachingStyle = Array.from(useOnboardingStore((s) => s.teachingStyle));
     const preferredSessionTypes = Array.from(useOnboardingStore((s) => s.preferredSessionTypes));
+    const reset = useOnboardingStore((s) => s.reset);
     const router = useRouter();
 
+    const { mutate: createProfile, isPending } = api.tutor.createProfile.useMutation({
+        onSuccess: () => {
+            toast.success("Profile created successfully!");
+            reset();
+            router.push("/dashboard");
+        },
+        onError: (error) => {
+            toast.error(error.message);
+        },
+    });
+
     useEffect(() => {
         if (!hydrated) return;
         if (role !== "tutor") router.replace("/onboarding");
     }, [hydrated, role, router]);
 
+    const handleFinish = () => {
+        createProfile({
+            subjectInterests,
+            teachingLevels,
+            yearsOfExperience: yearsOfExperience ?? 0,
+            teachingStyle,
+            preferredSessionTypes,
+        });
+    };
+
     return (
         <div className="min-h-screen w-full bg-linear-to-b from-white via-blue-50 to-[#43A8FF]">
             <div className="mx-auto max-w-7xl px-4 pt-4 sm:px-6 lg:px-8">
@@ -58,8 +82,13 @@ export default function TutorSummary() {
                         <Button asChild variant="brandOutline" className="rounded-full px-6">
                             <Link href="/onboarding/tutor/subjects">Back</Link>
                         </Button>
-                        <Button variant="brand" className="rounded-full px-8 py-6 text-black" onClick={() => router.push("/dashboard")}>
-                            Finish
+                        <Button
+                            variant="brand"
+                            className="rounded-full px-8 py-6 text-black"
+                            onClick={handleFinish}
+                            disabled={isPending}
+                        >
+                            {isPending ? "Finishing..." : "Finish"}
                         </Button>
                     </div>
                 </main>
diff --git a/src/server/api/routers/signal.ts b/src/server/api/routers/signal.ts
index 5f29006..da8b6aa 100644
--- a/src/server/api/routers/signal.ts
+++ b/src/server/api/routers/signal.ts
@@ -7,13 +7,16 @@ import { broadcastToTutors, notifyStudent } from "@/server/wsBridge";
 
 export const signalRouter = createTRPCRouter({
     // Returns the current viewer's role for conditional UI rendering
-    getViewerRole: protectedProcedure.query(async () => {
-        // Clerk manages auth, so default to STUDENT role
-        // Tutors will be explicitly set in DB when they complete tutor onboarding
-        return "STUDENT";
-    }),
+    getViewerRole: protectedProcedure.query(async ({ ctx }) => {
+        // Find user by Clerk ID and check if they have a tutor profile
+        const user = await ctx.db.user.findUnique({
+            where: { clerkUid: ctx.user.id },
+            select: { id: true, role: true },
+        });
 
-    createSignal: protectedProcedure
+        // If user exists in DB, use their role; otherwise default to STUDENT
+        return user?.role ?? "STUDENT";
+    }), createSignal: protectedProcedure
         .input(z.object({
             message: z.string().min(1),
             subject: z.string().min(1),
diff --git a/src/server/api/routers/tutor.ts b/src/server/api/routers/tutor.ts
index 10ad98c..96ac986 100644
--- a/src/server/api/routers/tutor.ts
+++ b/src/server/api/routers/tutor.ts
@@ -7,11 +7,11 @@ import { TRPCError } from "@trpc/server";
 export const tutorRouter = createTRPCRouter({
     createProfile: protectedProcedure
         .input(z.object({
-            subjectInterests: z.array(z.string()),
-            teachingLevels: z.array(z.string()),
-            yearsOfExperience: z.number(),
-            teachingStyle: z.array(z.string()),
-            preferredSessionTypes: z.array(z.string()),
+            subjectInterests: z.array(z.string()).min(1, "At least one subject is required"),
+            teachingLevels: z.array(z.string()).min(1, "At least one teaching level is required"),
+            yearsOfExperience: z.number().min(0, "Years of experience cannot be negative"),
+            teachingStyle: z.array(z.string()).min(1, "At least one teaching style is required"),
+            preferredSessionTypes: z.array(z.string()).min(1, "At least one session type is required"),
         }))
         .mutation(async ({ ctx, input }) => {
             const clerkUser = ctx.user;
@@ -49,6 +49,7 @@ export const tutorRouter = createTRPCRouter({
                         teachingLevels: input.teachingLevels,
                         yearsOfExperience: input.yearsOfExperience,
                         teachingStyle: input.teachingStyle,
+                        preferredSessionTypes: input.preferredSessionTypes,
                     },
                 });
 
@@ -64,7 +65,7 @@ export const tutorRouter = createTRPCRouter({
 
                 const { embedding } = await invokeModel(embeddingText);
 
-                await ctx.db.tutorProfile.update({ where: { id: newProfile.id }, data: { embedding }});
+                await ctx.db.tutorProfile.update({ where: { id: newProfile.id }, data: { embedding } });
 
                 return newProfile;
             });
@@ -121,7 +122,7 @@ ${updatedProfile.teachingLevels.map((l) => `- ${l}`).join("\n")}
 Teaching Style:
 ${updatedProfile.teachingStyle.map((t) => `- ${t}`).join("\n")}
 `);
-            await ctx.db.tutorProfile.update({ where: { id: updatedProfile.id}, data: { embedding}});
+            await ctx.db.tutorProfile.update({ where: { id: updatedProfile.id }, data: { embedding } });
 
             return { success: true, message: "Tutor profile updated successfully", profile: updatedProfile };
         }),