diff --git a/components/Profile.tsx b/components/Profile.tsx
index fef3bb4..a034e56 100644
--- a/components/Profile.tsx
+++ b/components/Profile.tsx
@@ -72,7 +72,9 @@ const Profile: React.FC<ProfileProps> = ({ user, onLogout, lang, onLanguageChang
     };
 
     const refreshExercises = async () => {
-        setExercises(await getExercises(user.id));
+        const exercises = await getExercises(user.id);
+        console.log('Refreshed exercises:', exercises);
+        setExercises(exercises);
     };
 
     // Snackbar State
@@ -160,10 +162,12 @@ const Profile: React.FC<ProfileProps> = ({ user, onLogout, lang, onLanguageChang
     };
 
     // Exercise Management Handlers
-    const handleArchiveExercise = (ex: ExerciseDef, archive: boolean) => {
+    const handleArchiveExercise = async (ex: ExerciseDef, archive: boolean) => {
         const updated = { ...ex, isArchived: archive };
-        saveExercise(user.id, updated);
-        refreshExercises();
+        console.log('Archiving exercise:', updated);
+        await saveExercise(user.id, updated);
+        console.log('Archive complete, refreshing...');
+        await refreshExercises();
     };
 
     const handleSaveExerciseEdit = () => {
diff --git a/components/Tracker.tsx b/components/Tracker.tsx
index d3d47d8..b1785d7 100644
--- a/components/Tracker.tsx
+++ b/components/Tracker.tsx
@@ -108,14 +108,12 @@ const Tracker: React.FC<TrackerProps> = ({ userId, userWeight, activeSession, ac
                 if (step) {
                     const exDef = exercises.find(e => e.id === step.exerciseId);
                     if (exDef) {
-                        if (!selectedExercise || selectedExercise.id !== exDef.id) {
-                            setSelectedExercise(exDef);
-                        }
+                        setSelectedExercise(exDef);
                     }
                 }
             }
         }
-    }, [activeSession, activePlan, currentStepIndex, exercises, selectedExercise]);
+    }, [currentStepIndex, activePlan, exercises]);
 
     useEffect(() => {
         const updateSelection = async () => {
diff --git a/server/prisma/dev.db b/server/prisma/dev.db
index 90f280a..12485f6 100644
Binary files a/server/prisma/dev.db and b/server/prisma/dev.db differ
diff --git a/server/src/routes/exercises.ts b/server/src/routes/exercises.ts
index 47a51c3..ba28df9 100644
--- a/server/src/routes/exercises.ts
+++ b/server/src/routes/exercises.ts
@@ -6,6 +6,7 @@ const router = express.Router();
 const prisma = new PrismaClient();
 const JWT_SECRET = process.env.JWT_SECRET || 'secret';
 
+// Middleware to check auth
 // Middleware to check auth
 const authenticate = (req: any, res: any, next: any) => {
     const token = req.headers.authorization?.split(' ')[1];
@@ -31,10 +32,10 @@ router.get('/', async (req: any, res) => {
                 OR: [
                     { userId: null }, // System default
                     { userId }        // User custom
-                ],
-                isArchived: false
+                ]
             }
         });
+        console.log('GET /exercises - Returning:', exercises.map(e => ({ id: e.id, name: e.name, isArchived: e.isArchived })));
         res.json(exercises);
     } catch (error) {
         res.status(500).json({ error: 'Server error' });
@@ -45,7 +46,9 @@ router.get('/', async (req: any, res) => {
 router.post('/', async (req: any, res) => {
     try {
         const userId = req.user.userId;
-        const { id, name, type, bodyWeightPercentage } = req.body;
+        const { id, name, type, bodyWeightPercentage, isArchived } = req.body;
+
+        console.log('POST /exercises - Received:', { id, name, type, bodyWeightPercentage, isArchived });
 
         // If id exists and belongs to user, update. Else create.
         // Note: We can't update system exercises directly. If user edits a system exercise, 
@@ -56,10 +59,12 @@ router.post('/', async (req: any, res) => {
             // Check if it exists and belongs to user
             const existing = await prisma.exercise.findUnique({ where: { id } });
             if (existing && existing.userId === userId) {
+                console.log('Updating existing exercise with:', { name, type, bodyWeightPercentage, isArchived });
                 const updated = await prisma.exercise.update({
                     where: { id },
-                    data: { name, type, bodyWeightPercentage }
+                    data: { name, type, bodyWeightPercentage, isArchived }
                 });
+                console.log('Updated exercise:', updated);
                 return res.json(updated);
             }
         }
@@ -70,7 +75,8 @@ router.post('/', async (req: any, res) => {
                 userId,
                 name,
                 type,
-                bodyWeightPercentage
+                bodyWeightPercentage,
+                isArchived: isArchived || false
             }
         });
         res.json(newExercise);