diff --git a/src/pages/timetable/MyClassesPage.tsx b/src/pages/timetable/MyClassesPage.tsx
index 0d9f976..749b34e 100644
--- a/src/pages/timetable/MyClassesPage.tsx
+++ b/src/pages/timetable/MyClassesPage.tsx
@@ -88,17 +88,17 @@ const MyClassesPage: React.FC = () => {
           <div className="grid gap-4 md:grid-cols-2 lg:grid-cols-3">
             {teachingClasses.map((classItem) => (
               <Link
-                key={classItem.class_id}
-                to={`/timetable/classes/${classItem.class_id}`}
+                key={classItem.id}
+                to={`/classes/${classItem.id}`}
                 className="block bg-white rounded-lg shadow hover:shadow-md transition-shadow border border-gray-200"
               >
                 <div className="p-5">
                   <div className="flex items-start justify-between mb-3">
                     <div className="flex-1 min-w-0">
                       <h3 className="text-lg font-semibold text-gray-900 truncate">
-                        {classItem.class?.name}
+                        {classItem.name}
                       </h3>
-                      {classItem.class?.code && (
+                      {classItem.class_code && (
                         <p className="text-sm text-gray-500">{classItem.class.code}</p>
                       )}
                     </div>
@@ -106,7 +106,7 @@ const MyClassesPage: React.FC = () => {
                   </div>
 
                   <p className="text-gray-600 text-sm mb-4 line-clamp-2">
-                    {classItem.class?.description || 'No description'}
+                    {classItem.description || 'No description'}
                   </p>
 
                   <div className="flex items-center gap-2 flex-wrap">
@@ -121,9 +121,9 @@ const MyClassesPage: React.FC = () => {
                   <div className="mt-4 pt-4 border-t border-gray-100 flex items-center gap-4 text-sm text-gray-500">
                     <div className="flex items-center gap-1">
                       <People size={14} />
-                      <span>{classItem.class?.enrolled_count || 0} students</span>
+                      <span>{(classItem as any).enrolled_count || 0} students</span>
                     </div>
-                    {classItem.class?.academic_year && (
+                    {classItem.academic_year && (
                       <div className="flex items-center gap-1">
                         <School size={14} />
                         <span>{classItem.class.academic_year}</span>
@@ -151,17 +151,17 @@ const MyClassesPage: React.FC = () => {
           <div className="grid gap-4 md:grid-cols-2 lg:grid-cols-3">
             {enrolledClasses.map((classItem) => (
               <Link
-                key={classItem.class_id}
-                to={`/timetable/classes/${classItem.class_id}`}
+                key={classItem.id}
+                to={`/classes/${classItem.id}`}
                 className="block bg-white rounded-lg shadow hover:shadow-md transition-shadow border border-gray-200"
               >
                 <div className="p-5">
                   <div className="flex items-start justify-between mb-3">
                     <div className="flex-1 min-w-0">
                       <h3 className="text-lg font-semibold text-gray-900 truncate">
-                        {classItem.class?.name}
+                        {classItem.name}
                       </h3>
-                      {classItem.class?.code && (
+                      {classItem.class_code && (
                         <p className="text-sm text-gray-500">{classItem.class.code}</p>
                       )}
                     </div>
@@ -169,7 +169,7 @@ const MyClassesPage: React.FC = () => {
                   </div>
 
                   <p className="text-gray-600 text-sm mb-4 line-clamp-2">
-                    {classItem.class?.description || 'No description'}
+                    {classItem.description || 'No description'}
                   </p>
 
                   <div className="flex items-center gap-2 flex-wrap">
@@ -182,10 +182,10 @@ const MyClassesPage: React.FC = () => {
                     <div className="flex items-center gap-1">
                       <School size={14} />
                       <span>
-                        {classItem.class?.teachers?.[0]?.first_name} {classItem.class?.teachers?.[0]?.last_name}
+                        {(classItem as any).primary_teacher_name} {}
                       </span>
                     </div>
-                    {classItem.class?.academic_year && (
+                    {classItem.academic_year && (
                       <div className="flex items-center gap-1">
                         <School size={14} />
                         <span>{classItem.class.academic_year}</span>
@@ -208,7 +208,7 @@ const MyClassesPage: React.FC = () => {
             You are not enrolled in or teaching any classes yet.
           </p>
           <Link
-            to="/timetable/classes"
+            to="/classes"
             className="mt-4 inline-flex items-center px-4 py-2 border border-transparent text-sm font-medium rounded-md text-blue-700 bg-blue-100 hover:bg-blue-200"
           >
             Browse Available Classes
diff --git a/src/utils/tldraw/ui-overrides/components/shared/navigation/CCGraphNavPanel.tsx b/src/utils/tldraw/ui-overrides/components/shared/navigation/CCGraphNavPanel.tsx
index c069799..6393ef7 100644
--- a/src/utils/tldraw/ui-overrides/components/shared/navigation/CCGraphNavPanel.tsx
+++ b/src/utils/tldraw/ui-overrides/components/shared/navigation/CCGraphNavPanel.tsx
@@ -626,8 +626,13 @@ export function CCGraphNavPanel() {
     const handleSelect = useCallback((node: TreeNode) => {
         // Section nodes with artificial IDs (node_type="Section") have no canvas shape util
         if (node.is_section && node.node_type === "Section") return;
+        // SubjectClass nodes don't yet exist in Neo4j — navigate to class detail page
+        if (node.node_type === "SubjectClass") {
+            navigate(`/classes/${node.neo4j_node_id}`);
+            return;
+        }
         navigateToNeoNode(node);
-    }, [navigateToNeoNode]);
+    }, [navigateToNeoNode, navigate]);
 
     const refreshAll = useCallback(() => {
         setTree(null);