diff --git a/components/Plans.tsx b/components/Plans.tsx
index 652b3a6..b06edc0 100644
--- a/components/Plans.tsx
+++ b/components/Plans.tsx
@@ -275,16 +275,19 @@ const Plans: React.FC<PlansProps> = ({ userId, onStartPlan, lang }) => {
               </div>
             </div>
             <div className="flex-1 overflow-y-auto p-2">
-              {availableExercises.map(ex => (
-                <button
-                  key={ex.id}
-                  onClick={() => addStep(ex)}
-                  className="w-full text-left p-4 border-b border-outline-variant hover:bg-surface-container-high text-on-surface flex justify-between"
-                >
-                  <span>{ex.name}</span>
-                  <span className="text-xs bg-secondary-container text-on-secondary-container px-2 py-1 rounded-full">{ex.type}</span>
-                </button>
-              ))}
+              {availableExercises
+                .slice()
+                .sort((a, b) => a.name.localeCompare(b.name))
+                .map(ex => (
+                  <button
+                    key={ex.id}
+                    onClick={() => addStep(ex)}
+                    className="w-full text-left p-4 border-b border-outline-variant hover:bg-surface-container-high text-on-surface flex justify-between"
+                  >
+                    <span>{ex.name}</span>
+                    <span className="text-xs bg-secondary-container text-on-secondary-container px-2 py-1 rounded-full">{ex.type}</span>
+                  </button>
+                ))}
             </div>
 
             {isCreatingExercise && (
diff --git a/components/Tracker.tsx b/components/Tracker.tsx
index f44c3cb..81de3a2 100644
--- a/components/Tracker.tsx
+++ b/components/Tracker.tsx
@@ -1,6 +1,6 @@
 
 import React, { useState, useEffect } from 'react';
-import { Plus, Activity, ChevronDown, ChevronUp, Dumbbell, PlayCircle, CheckCircle, User, Scale, X, Flame, Timer as TimerIcon, ArrowUp, ArrowRight, Footprints, Ruler, CheckSquare, Trash2, Percent } from 'lucide-react';
+import { Plus, Activity, ChevronDown, ChevronUp, Dumbbell, PlayCircle, CheckCircle, User, Scale, X, Flame, Timer as TimerIcon, ArrowUp, ArrowRight, Footprints, Ruler, CheckSquare, Trash2, Percent, MoreVertical } from 'lucide-react';
 import { WorkoutSession, WorkoutSet, ExerciseDef, ExerciseType, WorkoutPlan, Language } from '../types';
 import { getExercises, getLastSetForExercise, saveExercise, getPlans } from '../services/storage';
 import { getCurrentUserProfile } from '../services/auth';
@@ -49,6 +49,11 @@ const Tracker: React.FC<TrackerProps> = ({ userId, userWeight, activeSession, ac
     const [showPlanPrep, setShowPlanPrep] = useState<WorkoutPlan | null>(null);
     const [showPlanList, setShowPlanList] = useState(false);
 
+    // Confirmation State
+    const [showFinishConfirm, setShowFinishConfirm] = useState(false);
+    const [showQuitConfirm, setShowQuitConfirm] = useState(false);
+    const [showMenu, setShowMenu] = useState(false);
+
     useEffect(() => {
         const loadData = async () => {
             const exList = await getExercises(userId);
@@ -284,12 +289,40 @@ const Tracker: React.FC<TrackerProps> = ({ userId, userWeight, activeSession, ac
                         {activeSession.userBodyWeight ? ` • ${activeSession.userBodyWeight}kg` : ''}
                     </span>
                 </div>
-                <button
-                    onClick={onSessionEnd}
-                    className="px-5 py-2 rounded-full bg-error-container text-on-error-container text-sm font-medium hover:opacity-90 transition-opacity"
-                >
-                    {t('finish', lang)}
-                </button>
+                <div className="flex items-center gap-2 relative">
+                    <button
+                        onClick={() => setShowFinishConfirm(true)}
+                        className="px-5 py-2 rounded-full bg-error-container text-on-error-container text-sm font-medium hover:opacity-90 transition-opacity"
+                    >
+                        {t('finish', lang)}
+                    </button>
+                    <button
+                        onClick={() => setShowMenu(!showMenu)}
+                        className="p-2 rounded-full bg-surface-container-high text-on-surface hover:bg-surface-container-highest transition-colors"
+                    >
+                        <MoreVertical size={20} />
+                    </button>
+                    {showMenu && (
+                        <>
+                            <div
+                                className="fixed inset-0 z-30"
+                                onClick={() => setShowMenu(false)}
+                            />
+                            <div className="absolute right-0 top-full mt-2 bg-surface-container rounded-xl shadow-elevation-3 overflow-hidden z-40 min-w-[200px]">
+                                <button
+                                    onClick={() => {
+                                        setShowMenu(false);
+                                        setShowQuitConfirm(true);
+                                    }}
+                                    className="w-full px-4 py-3 text-left text-error hover:bg-error-container/20 transition-colors flex items-center gap-2"
+                                >
+                                    <X size={18} />
+                                    {t('quit_no_save', lang)}
+                                </button>
+                            </div>
+                        </>
+                    )}
+                </div>
             </div>
 
             {activePlan && (
@@ -348,9 +381,12 @@ const Tracker: React.FC<TrackerProps> = ({ userId, userWeight, activeSession, ac
                         onChange={(e) => setSelectedExercise(exercises.find(ex => ex.id === e.target.value) || null)}
                     >
                         <option value="" disabled>{t('select_exercise', lang)}</option>
-                        {exercises.map(ex => (
-                            <option key={ex.id} value={ex.id} className="bg-surface-container text-on-surface">{ex.name}</option>
-                        ))}
+                        {exercises
+                            .slice()
+                            .sort((a, b) => a.name.localeCompare(b.name))
+                            .map(ex => (
+                                <option key={ex.id} value={ex.id} className="bg-surface-container text-on-surface">{ex.name}</option>
+                            ))}
                     </select>
                     <ChevronDown className="absolute right-4 top-1/2 -translate-y-1/2 text-on-surface-variant pointer-events-none" size={24} />
 
@@ -497,6 +533,61 @@ const Tracker: React.FC<TrackerProps> = ({ userId, userWeight, activeSession, ac
                     lang={lang}
                 />
             )}
+
+            {/* Finish Confirmation Dialog */}
+            {showFinishConfirm && (
+                <div className="absolute inset-0 bg-black/60 z-50 flex items-center justify-center p-6 backdrop-blur-sm">
+                    <div className="w-full max-w-sm bg-surface-container rounded-[28px] p-6 shadow-elevation-3">
+                        <h3 className="text-2xl font-normal text-on-surface mb-2">{t('finish_confirm_title', lang)}</h3>
+                        <p className="text-on-surface-variant text-sm mb-8">{t('finish_confirm_msg', lang)}</p>
+                        <div className="flex justify-end gap-2">
+                            <button
+                                onClick={() => setShowFinishConfirm(false)}
+                                className="px-6 py-2.5 rounded-full text-primary font-medium hover:bg-white/5"
+                            >
+                                {t('cancel', lang)}
+                            </button>
+                            <button
+                                onClick={() => {
+                                    setShowFinishConfirm(false);
+                                    onSessionEnd();
+                                }}
+                                className="px-6 py-2.5 rounded-full bg-primary text-on-primary font-medium"
+                            >
+                                {t('confirm', lang)}
+                            </button>
+                        </div>
+                    </div>
+                </div>
+            )}
+
+            {/* Quit Without Saving Confirmation Dialog */}
+            {showQuitConfirm && (
+                <div className="absolute inset-0 bg-black/60 z-50 flex items-center justify-center p-6 backdrop-blur-sm">
+                    <div className="w-full max-w-sm bg-surface-container rounded-[28px] p-6 shadow-elevation-3">
+                        <h3 className="text-2xl font-normal text-error mb-2">{t('quit_confirm_title', lang)}</h3>
+                        <p className="text-on-surface-variant text-sm mb-8">{t('quit_confirm_msg', lang)}</p>
+                        <div className="flex justify-end gap-2">
+                            <button
+                                onClick={() => setShowQuitConfirm(false)}
+                                className="px-6 py-2.5 rounded-full text-primary font-medium hover:bg-white/5"
+                            >
+                                {t('cancel', lang)}
+                            </button>
+                            <button
+                                onClick={() => {
+                                    setShowQuitConfirm(false);
+                                    // Quit without saving - just navigate away or reset
+                                    window.location.reload();
+                                }}
+                                className="px-6 py-2.5 rounded-full bg-error text-on-error font-medium"
+                            >
+                                {t('confirm', lang)}
+                            </button>
+                        </div>
+                    </div>
+                </div>
+            )}
         </div>
     );
 };
diff --git a/server/prisma/dev.db b/server/prisma/dev.db
index a981361..59d7a26 100644
Binary files a/server/prisma/dev.db and b/server/prisma/dev.db differ
diff --git a/services/i18n.ts b/services/i18n.ts
index 321b166..f765e9e 100644
--- a/services/i18n.ts
+++ b/services/i18n.ts
@@ -50,6 +50,12 @@ const translations = {
     cancel: 'Cancel',
     start: 'Start',
     finish: 'Finish',
+    finish_confirm_title: 'Finish Workout?',
+    finish_confirm_msg: 'Are you sure you want to finish this workout? Your progress will be saved.',
+    quit_no_save: 'Quit without saving',
+    quit_confirm_title: 'Quit without saving?',
+    quit_confirm_msg: 'All progress from this session will be lost. This action cannot be undone.',
+    confirm: 'Confirm',
     plan_completed: 'Plan Completed!',
     step: 'Step',
     of: 'of',
@@ -71,7 +77,7 @@ const translations = {
     add_weight: 'Add. Weight',
 
     // Types
-    type_strength: 'Strength',
+    type_strength: 'Free Weights & Machines',
     type_bodyweight: 'Bodyweight',
     type_cardio: 'Cardio',
     type_static: 'Static',
@@ -191,6 +197,12 @@ const translations = {
     cancel: 'Отмена',
     start: 'Начать',
     finish: 'Завершить',
+    finish_confirm_title: 'Завершить тренировку?',
+    finish_confirm_msg: 'Вы уверены, что хотите завершить эту тренировку? Ваш прогресс будет сохранен.',
+    quit_no_save: 'Выйти без сохранения',
+    quit_confirm_title: 'Выйти без сохранения?',
+    quit_confirm_msg: 'Весь прогресс этой сессии будет потерян. Это действие нельзя отменить.',
+    confirm: 'Подтвердить',
     plan_completed: 'План выполнен!',
     step: 'Шаг',
     of: 'из',
@@ -212,7 +224,7 @@ const translations = {
     add_weight: 'Доп. вес',
 
     // Types
-    type_strength: 'Силовое',
+    type_strength: 'Свободные веса и тренажеры',
     type_bodyweight: 'Свой вес',
     type_cardio: 'Кардио',
     type_static: 'Статика',