diff --git a/src/app/api/students/route.ts b/src/app/api/students/route.ts
index 30c860f..7708b0e 100755
--- a/src/app/api/students/route.ts
+++ b/src/app/api/students/route.ts
@@ -36,15 +36,13 @@ export async function GET(request: Request) {
     if (userId) {
       // For STUDENT role, also match by name + school as fallback for legacy data
       if (session.user?.role === 'STUDENT' && session.user.id === userId) {
-        userIdFilter = [
-          { userId },
-          {
-            userId: null,
-            firstName: session.user.firstName,
-            lastName: session.user.lastName,
-            schoolId: session.user.schoolId,
-          },
-        ];
+        const legacyStudentFilter: Record<string, unknown> = {
+          userId: null,
+          firstName: session.user.firstName,
+          lastName: session.user.lastName,
+          schoolId: session.user.schoolId,
+        };
+        userIdFilter = [{ userId }, legacyStudentFilter];
       } else {
         where.userId = userId;
       }
diff --git a/src/components/app-layout.tsx b/src/components/app-layout.tsx
index 34d4e62..73beea3 100644
--- a/src/components/app-layout.tsx
+++ b/src/components/app-layout.tsx
@@ -470,7 +470,7 @@ function renderView(view: ViewName) {
     case 'matrix': return <MasteryMatrixView />;
     case 'analytics': return <AnalyticsView />;
     case 'assessments': return <AssessmentsView />;
-    case 'grading': return <GradingView />;
+    case 'grading': return <UnifiedGradingPanel />;
     case 'reports': return <ReportsView />;
     case 'settings': return <SettingsView />;
     case 'student-detail': return <StudentDetailView />;