diff --git a/frontend/src/components/AdminStudentHeader.jsx b/frontend/src/components/AdminStudentHeader.jsx
index 22368ed..0c4de14 100644
--- a/frontend/src/components/AdminStudentHeader.jsx
+++ b/frontend/src/components/AdminStudentHeader.jsx
@@ -24,7 +24,7 @@ const AdminStudentHeader = ({ studentName = "default", subtitle = "default", onB
 
       <button
         className="icon-button"
-        onClick={() => navigate(`/admin/managestudent`)}
+        onClick={() => navigate(`/managestudent`)}
       >
         👥
       </button>
diff --git a/frontend/src/pages/admin/AdminStudentAssignment.jsx b/frontend/src/pages/admin/AdminStudentAssignment.jsx
index e4b6351..180c8d5 100644
--- a/frontend/src/pages/admin/AdminStudentAssignment.jsx
+++ b/frontend/src/pages/admin/AdminStudentAssignment.jsx
@@ -38,28 +38,28 @@ const AdminStudentAssignment = () => {
         label: `${weekItem.week}주차 ${weekItem.subject}`,
         days: weekItem.days.map((dayItem) => ({
           day: dayItem.day,
-          subject: weekItem.subject,
           tasks: dayItem.details.map((task) => ({
             id: task.id,
             label: task.assignmentName,
             status: task.status,
-            modified: false,
+            //modified: false,
           })),
         })),
       }));
 
         setWeeks(formatted);
 
-        const matched = formatted.find((w) => String(w.week) === String(week));
+        const matched = formatted.find((w) => Number(w.week) === Number(week));
         if (matched) {
           setSelectedWeekLabel(matched.label);
+          /*
           if (matched.days.length > 0) {
             setHighlightCard({
               weekLabel: matched.label,
               day: matched.days[0].day,
               tasks: matched.days[0].tasks,
             });
-          }
+          }*/
         }
       });
   }, [studentId, week]);
@@ -79,9 +79,11 @@ const AdminStudentAssignment = () => {
     });
   };
 */
+
+
   const handleSave = async (taskId, status) => {
     const userId = parseInt(studentId); // 문자열일 수 있으니 숫자로 변환
-
+    
     try {
       // PUT 요청 시도 (기존 과제 수정)
       await updateAssignmentStatus(userId, taskId, status);
diff --git a/frontend/src/pages/admin/DetailManageStudent.jsx b/frontend/src/pages/admin/DetailManageStudent.jsx
index 36cfbb1..9fbefcb 100644
--- a/frontend/src/pages/admin/DetailManageStudent.jsx
+++ b/frontend/src/pages/admin/DetailManageStudent.jsx
@@ -73,7 +73,7 @@ const DetailManageStudent = () => {
               <button
                 key={index}
                 className={style.assignment_button}
-                onClick={() => navigate(`/admin/assignment/${student.id}/${index + 1}`)}
+                onClick={() => navigate(`/admin/assignment/${student.id}/${week.week}`)}
               >
                 {week.week} {week.title && `  ${week.title}`}
               </button>
diff --git a/frontend/src/pages/generation/Assignment.jsx b/frontend/src/pages/generation/Assignment.jsx
index 095d5fc..3f5edc2 100644
--- a/frontend/src/pages/generation/Assignment.jsx
+++ b/frontend/src/pages/generation/Assignment.jsx
@@ -19,10 +19,12 @@ const Assignment = () => {
     fetchAssignmentsByUser(userId)
       .then((weekData) => {
         const formatted = weekData.map((weekItem) => ({
-          label: `${weekItem.week}주차 ${weekItem.subject}`,
+          label: `${weekItem.week}주차 ${weekItem.subtitle}`,
+          //label: `${weekItem.week}주차 ${weekItem.subject}`,
           details: weekItem.days.map((dayItem) => ({
             day: dayItem.day,
-            subject: weekItem.subject,
+            subject: dayItem.subject,
+            //subject: weekItem.subject,
             tasks: dayItem.details.map((task) => ({
               label: task.assignmentName,
               status: mapStatus(task.status),