Index: app/Http/Controllers/RoadmapController.php
===================================================================
--- app/Http/Controllers/RoadmapController.php	(revision 2c5f4bcd897ca04b80c84b471c45f11e4fad6d09)
+++ app/Http/Controllers/RoadmapController.php	(revision f93eddccc0f2cc1d8f7162aed69dddff23670998)
@@ -3,4 +3,5 @@
 namespace App\Http\Controllers;
 
+use App\Models\CareerPath;
 use App\Models\StudyProgram;
 use App\Models\Subject;
@@ -17,8 +18,10 @@
     {
         $studyPrograms = StudyProgram::all();
+        $careerPaths = CareerPath::all();
         // Don't fetch subjects here - they'll be loaded dynamically via AJAX
 
         return view('roadmap.create', [
             'studyPrograms' => $studyPrograms,
+            'careerPaths' => $careerPaths,
             'subjects' => [], // Empty initially, will be populated by JavaScript
         ]);
@@ -58,4 +61,5 @@
         $validated = $request->validate([
             'study_program_id' => 'required|exists:study_programs,id',
+            'career_path_id' => 'nullable|exists:career_paths,id',
             'completed_subjects' => 'array',
             'completed_subjects.*' => 'exists:subjects,id',
@@ -65,4 +69,5 @@
 
         $studyProgram = StudyProgram::with('subjects')->findOrFail($validated['study_program_id']);
+        $careerPath = $validated['career_path_id'] ? CareerPath::findOrFail($validated['career_path_id']) : null;
         $completedIds = $validated['completed_subjects'] ?? [];
         $inProgressIds = $validated['in_progress_subjects'] ?? [];
@@ -81,4 +86,5 @@
                 'subject_id' => $subjectId,
                 'study_program_id' => $studyProgram->id,
+                'career_path_id' => $careerPath?->id,
                 'status' => 'completed',
                 'completed_at' => now(),
@@ -92,4 +98,5 @@
                 'subject_id' => $subjectId,
                 'study_program_id' => $studyProgram->id,
+                'career_path_id' => $careerPath?->id,
                 'status' => 'in_progress',
             ]);
@@ -97,9 +104,10 @@
 
         // Generate roadmap
-        $roadmap = $this->generateRoadmap($user->id, $studyProgram, $completedIds, $inProgressIds);
-        $semesterRoadmap = $this->generateSemesterRoadmap($studyProgram, $completedIds, $inProgressIds);
+        $roadmap = $this->generateRoadmap($user->id, $studyProgram, $completedIds, $inProgressIds, $careerPath);
+        $semesterRoadmap = $this->generateSemesterRoadmap($studyProgram, $completedIds, $inProgressIds, $careerPath);
 
         return view('roadmap.show', [
             'studyProgram' => $studyProgram,
+            'careerPath' => $careerPath,
             'roadmap' => $roadmap,
             'semesterRoadmap' => $semesterRoadmap,
@@ -112,11 +120,32 @@
      * Generate recommended roadmap based on user progress and prerequisites
      */
-    private function generateRoadmap($userId, StudyProgram $studyProgram, array $completedIds, array $inProgressIds)
+    private function generateRoadmap($userId, StudyProgram $studyProgram, array $completedIds, array $inProgressIds, $careerPath = null)
     {
         $allSubjects = $studyProgram->subjects()->get();
         $remaining = [];
 
+        // Get subject IDs for career path if one is selected
+        $careerPathSubjectIds = $careerPath ? $careerPath->subjects()->pluck('subjects.id')->toArray() : [];
+
         foreach ($allSubjects as $subject) {
+            // Skip subjects from years beyond the program duration
+            if ($subject->year > $studyProgram->duration_years) {
+                continue;
+            }
+
             if (!in_array($subject->id, $completedIds) && !in_array($subject->id, $inProgressIds)) {
+                // If career path is selected, filter to show:
+                // 1. Mandatory subjects (always show)
+                // 2. Electives related to the career path
+                if ($careerPath) {
+                    $isElective = ($subject->pivot->type ?? 'mandatory') === 'elective';
+                    $isInCareerPath = in_array($subject->id, $careerPathSubjectIds);
+
+                    // Skip electives not in the career path
+                    if ($isElective && !$isInCareerPath) {
+                        continue;
+                    }
+                }
+
                 // Check if prerequisites are met
                 $prerequisites = $subject->prerequisites()->get();
@@ -140,4 +169,5 @@
                     'year' => $subject->year,
                     'type' => $subject->pivot->type ?? 'mandatory',
+                    'inCareerPath' => $careerPath && in_array($subject->id, $careerPathSubjectIds),
                 ];
             }
@@ -173,4 +203,5 @@
 
         $studyProgram = $latestProgress->studyProgram;
+        $careerPath = $latestProgress->careerPath;
 
         $completedIds = $user->progress()
@@ -186,9 +217,10 @@
             ->toArray();
 
-        $roadmap = $this->generateRoadmap($user->id, $studyProgram, $completedIds, $inProgressIds);
-        $semesterRoadmap = $this->generateSemesterRoadmap($studyProgram, $completedIds, $inProgressIds);
+        $roadmap = $this->generateRoadmap($user->id, $studyProgram, $completedIds, $inProgressIds, $careerPath);
+        $semesterRoadmap = $this->generateSemesterRoadmap($studyProgram, $completedIds, $inProgressIds, $careerPath);
 
         return view('roadmap.show', [
             'studyProgram' => $studyProgram,
+            'careerPath' => $careerPath,
             'roadmap' => $roadmap,
             'semesterRoadmap' => $semesterRoadmap,
@@ -201,5 +233,5 @@
      * Generate semester-by-semester roadmap for upcoming years
      */
-    private function generateSemesterRoadmap(StudyProgram $studyProgram, array $completedIds, array $inProgressIds)
+    private function generateSemesterRoadmap(StudyProgram $studyProgram, array $completedIds, array $inProgressIds, $careerPath = null)
     {
         $allSubjects = $studyProgram->subjects()->orderBy('year')->orderBy('semester_type')->get();
@@ -207,4 +239,7 @@
         // Build roadmap organized by year and semester
         $roadmap = [];
+
+        // Get subject IDs for career path if one is selected
+        $careerPathSubjectIds = $careerPath ? $careerPath->subjects()->pluck('subjects.id')->toArray() : [];
 
         foreach ($allSubjects as $subject) {
@@ -212,7 +247,25 @@
             $semester = $subject->getSemesterTypeFromCode() === 'winter' ? 'winter' : 'summer';
 
+            // Skip subjects from years beyond the program duration
+            if ($year > $studyProgram->duration_years) {
+                continue;
+            }
+
             // Skip if already completed or in progress
             if (in_array($subject->id, $completedIds) || in_array($subject->id, $inProgressIds)) {
                 continue;
+            }
+
+            // If career path is selected, filter to show:
+            // 1. Mandatory subjects (always show)
+            // 2. Electives related to the career path
+            if ($careerPath) {
+                $isElective = ($subject->pivot->type ?? 'mandatory') === 'elective';
+                $isInCareerPath = in_array($subject->id, $careerPathSubjectIds);
+
+                // Skip electives not in the career path
+                if ($isElective && !$isInCareerPath) {
+                    continue;
+                }
             }
 
Index: app/Models/UserProgress.php
===================================================================
--- app/Models/UserProgress.php	(revision 2c5f4bcd897ca04b80c84b471c45f11e4fad6d09)
+++ app/Models/UserProgress.php	(revision f93eddccc0f2cc1d8f7162aed69dddff23670998)
@@ -14,4 +14,5 @@
         'subject_id',
         'study_program_id',
+        'career_path_id',
         'status',
         'completed_at',
@@ -36,3 +37,8 @@
         return $this->belongsTo(StudyProgram::class);
     }
+
+    public function careerPath(): BelongsTo
+    {
+        return $this->belongsTo(CareerPath::class);
+    }
 }
Index: database/migrations/2025_12_28_231716_add_career_path_to_user_progress.php
===================================================================
--- database/migrations/2025_12_28_231716_add_career_path_to_user_progress.php	(revision f93eddccc0f2cc1d8f7162aed69dddff23670998)
+++ database/migrations/2025_12_28_231716_add_career_path_to_user_progress.php	(revision f93eddccc0f2cc1d8f7162aed69dddff23670998)
@@ -0,0 +1,28 @@
+<?php
+
+use Illuminate\Database\Migrations\Migration;
+use Illuminate\Database\Schema\Blueprint;
+use Illuminate\Support\Facades\Schema;
+
+return new class extends Migration
+{
+    /**
+     * Run the migrations.
+     */
+    public function up(): void
+    {
+        Schema::table('user_progress', function (Blueprint $table) {
+            $table->foreignId('career_path_id')->nullable()->constrained('career_paths')->onDelete('set null');
+        });
+    }
+
+    /**
+     * Reverse the migrations.
+     */
+    public function down(): void
+    {
+        Schema::table('user_progress', function (Blueprint $table) {
+            $table->dropColumn('career_path_id');
+        });
+    }
+};
Index: database/migrations/2025_12_28_231955_recreate_career_paths_table.php
===================================================================
--- database/migrations/2025_12_28_231955_recreate_career_paths_table.php	(revision f93eddccc0f2cc1d8f7162aed69dddff23670998)
+++ database/migrations/2025_12_28_231955_recreate_career_paths_table.php	(revision f93eddccc0f2cc1d8f7162aed69dddff23670998)
@@ -0,0 +1,40 @@
+<?php
+
+use Illuminate\Database\Migrations\Migration;
+use Illuminate\Database\Schema\Blueprint;
+use Illuminate\Support\Facades\Schema;
+
+return new class extends Migration
+{
+    /**
+     * Run the migrations.
+     */
+    public function up(): void
+    {
+        Schema::create('career_paths', function (Blueprint $table) {
+            $table->id();
+            $table->string('name')->unique();
+            $table->text('description')->nullable();
+            $table->timestamps();
+        });
+
+        Schema::create('career_path_subject', function (Blueprint $table) {
+            $table->id();
+            $table->foreignId('career_path_id')->constrained('career_paths')->onDelete('cascade');
+            $table->foreignId('subject_id')->constrained('subjects')->onDelete('cascade');
+            $table->integer('order')->default(0)->comment('Suggested order to take the subject');
+            $table->boolean('is_required')->default(true)->comment('Whether this subject is required for the career path');
+            $table->timestamps();
+            $table->unique(['career_path_id', 'subject_id']);
+        });
+    }
+
+    /**
+     * Reverse the migrations.
+     */
+    public function down(): void
+    {
+        Schema::dropIfExists('career_path_subject');
+        Schema::dropIfExists('career_paths');
+    }
+};
Index: database/seeders/CareerPathSubjectsSeeder.php
===================================================================
--- database/seeders/CareerPathSubjectsSeeder.php	(revision f93eddccc0f2cc1d8f7162aed69dddff23670998)
+++ database/seeders/CareerPathSubjectsSeeder.php	(revision f93eddccc0f2cc1d8f7162aed69dddff23670998)
@@ -0,0 +1,119 @@
+<?php
+
+namespace Database\Seeders;
+
+use App\Models\CareerPath;
+use App\Models\Subject;
+use Illuminate\Database\Seeder;
+
+class CareerPathSubjectsSeeder extends Seeder
+{
+    /**
+     * Run the database seeds.
+     */
+    public function run(): void
+    {
+        // Map career paths to subject codes
+        $careerPathMappings = [
+            'Full Stack Web Development' => [
+                'F23L2S001',   // Web Programming
+                'F23L2W002',   // Object-Oriented Programming
+                'F23L2W001',   // Algorithms and Data Structures
+                'F23L3W004',   // Databases
+                'F23L3W024',   // Web Programming (Advanced)
+                'F23L3W003',   // Software Engineering
+                'F18L3W079',   // Web Based Systems
+                'F23L2S110',   // Internet technologies
+            ],
+            'Data Science & AI' => [
+                'F23L2W001',   // Algorithms and Data Structures
+                'F23L3W004',   // Databases
+                'F23L4W002',   // Machine Learning
+                'F18L3W008',   // Introduction to Data Science
+                'F23L3S002',   // Artificial Intelligence
+                'F18L1S023',   // Business Statistics
+                'F18L3W081',   // Visualization
+                'F18L3S150',   // Data Mining
+            ],
+            'DevOps & Cloud Computing' => [
+                'F23L3W001',   // Operating Systems
+                'F23L3W002',   // Computer Networks
+                'F23L3W003',   // Software Engineering
+                'F23L2W014',   // Computer Networks and Security
+                'F18L3S118',   // Continuous Integration and Delivery
+                'F18L3W060',   // System Administration
+                'F18L3S062',   // Virtualization
+            ],
+            'Game Development' => [
+                'F23L2W001',   // Algorithms and Data Structures
+                'F23L2W002',   // Object-Oriented Programming
+                'F23L3S003',   // Computer Graphics
+                'F23L1W003',   // Discrete Mathematics
+                'F18L3W092',   // Digital Post-production
+                'F18L3S113',   // Computer Animation
+                'F18L3W115',   // Computer Sound, Speech and Music
+            ],
+            'Cybersecurity' => [
+                'F23L3W001',   // Operating Systems
+                'F23L3W002',   // Computer Networks
+                'F23L2W014',   // Computer Networks and Security
+                'F23L3W003',   // Software Engineering
+                'F18L3W043',   // Information Security
+                'F18L3W065',   // Network Security
+                'F18L3S122',   // Cryptography
+                'F18L3S159',   // Software Defined Security
+            ],
+            'Database Administrator' => [
+                'F23L3W004',   // Databases
+                'F23L2W001',   // Algorithms and Data Structures
+                'F23L3W001',   // Operating Systems
+                'F18L3W074',   // Database Administration
+                'F18L3S138',   // Advanced Databases
+                'F18L3S141',   // Unstructured Databases
+                'F18L3S157',   // Data Warehouses and OLAP
+                'F18L3W075',   // Information Systems Analysis and Design
+            ],
+        ];
+
+        foreach ($careerPathMappings as $careerPathName => $subjectCodes) {
+            $careerPath = CareerPath::where('name', $careerPathName)->first();
+
+            // If career path doesn't exist, create it
+            if (!$careerPath) {
+                $descriptions = [
+                    'Full Stack Web Development' => 'Build complete web applications from frontend to backend',
+                    'Data Science & AI' => 'Specialize in data analysis, machine learning, and AI',
+                    'DevOps & Cloud Computing' => 'Deploy, manage, and scale applications in the cloud',
+                    'Game Development' => 'Create engaging interactive games and experiences',
+                    'Cybersecurity' => 'Protect systems and data from security threats',
+                    'Database Administrator' => 'Manage and optimize databases for large-scale applications',
+                ];
+
+                $careerPath = CareerPath::create([
+                    'name' => $careerPathName,
+                    'description' => $descriptions[$careerPathName] ?? '',
+                ]);
+            }
+
+            // Attach subjects to career path
+            foreach ($subjectCodes as $index => $code) {
+                $subject = Subject::where('code', $code)->first();
+
+                if ($subject) {
+                    // Check if not already attached
+                    if (!$careerPath->subjects()->where('subject_id', $subject->id)->exists()) {
+                        $careerPath->subjects()->attach($subject->id, [
+                            'order' => $index + 1,
+                            'is_required' => true,
+                        ]);
+                        $this->command->line("Attached {$code} ({$subject->name}) to {$careerPathName}");
+                    }
+                } else {
+                    $this->command->warn("Subject not found: {$code}");
+                }
+            }
+        }
+
+        $this->command->info("Career path subjects have been seeded successfully!");
+    }
+}
Index: database/seeders/DatabaseSeeder.php
===================================================================
--- database/seeders/DatabaseSeeder.php	(revision 2c5f4bcd897ca04b80c84b471c45f11e4fad6d09)
+++ database/seeders/DatabaseSeeder.php	(revision f93eddccc0f2cc1d8f7162aed69dddff23670998)
@@ -29,4 +29,6 @@
             StudyProgramSeeder::class,
             AssignSubjectsToStudyProgramsSeeder::class,
+            SubjectPrerequisitesSeeder::class,
+            CareerPathSubjectsSeeder::class,
         ]);
     }
Index: database/seeders/SubjectPrerequisitesSeeder.php
===================================================================
--- database/seeders/SubjectPrerequisitesSeeder.php	(revision f93eddccc0f2cc1d8f7162aed69dddff23670998)
+++ database/seeders/SubjectPrerequisitesSeeder.php	(revision f93eddccc0f2cc1d8f7162aed69dddff23670998)
@@ -0,0 +1,71 @@
+<?php
+
+namespace Database\Seeders;
+
+use App\Models\Subject;
+use Illuminate\Database\Seeder;
+
+class SubjectPrerequisitesSeeder extends Seeder
+{
+    /**
+     * Run the database seeds.
+     */
+    public function run(): void
+    {
+        // Load the prerequisites data from the JSON file
+        $jsonPath = storage_path('finki_subjects/pit_only_fixed_subjects.json');
+
+        if (!file_exists($jsonPath)) {
+            $this->command->error("File not found: {$jsonPath}");
+            return;
+        }
+
+        $subjects = json_decode(file_get_contents($jsonPath), true);
+
+        if (!is_array($subjects)) {
+            $this->command->error("Invalid JSON format in subjects file");
+            return;
+        }
+
+        $prerequisitesAdded = 0;
+
+        foreach ($subjects as $subjectData) {
+            // Find the subject in database by code
+            $subject = Subject::where('code', $subjectData['code'])->first();
+
+            if (!$subject) {
+                continue;
+            }
+
+            // Check if there are prerequisites
+            if (empty($subjectData['prerequisites'])) {
+                continue;
+            }
+
+            // Prerequisites are stored as an array of arrays
+            // Each inner array represents prerequisite alternatives (OR logic)
+            // For now, we'll implement simple AND logic - all prerequisites must be met
+
+            foreach ($subjectData['prerequisites'] as $prerequisiteGroup) {
+                // For each prerequisite in the group
+                foreach ($prerequisiteGroup as $prerequisiteName) {
+                    // Find the prerequisite subject by name
+                    $prerequisiteSubject = Subject::where('name', $prerequisiteName)
+                        ->orWhere('name_mk', $prerequisiteName)
+                        ->first();
+
+                    if ($prerequisiteSubject) {
+                        // Check if this prerequisite relation already exists
+                        if (!$subject->prerequisites()->where('prerequisite_id', $prerequisiteSubject->id)->exists()) {
+                            $subject->prerequisites()->attach($prerequisiteSubject->id);
+                            $prerequisitesAdded++;
+                            $this->command->line("Added prerequisite: {$prerequisiteSubject->code} ({$prerequisiteSubject->name}) -> {$subject->code} ({$subject->name})");
+                        }
+                    }
+                }
+            }
+        }
+
+        $this->command->info("Successfully added {$prerequisitesAdded} subject prerequisite relationships.");
+    }
+}
Index: resources/views/dashboard.blade.php
===================================================================
--- resources/views/dashboard.blade.php	(revision 2c5f4bcd897ca04b80c84b471c45f11e4fad6d09)
+++ resources/views/dashboard.blade.php	(revision f93eddccc0f2cc1d8f7162aed69dddff23670998)
@@ -27,5 +27,5 @@
                     <div class="bg-gradient-to-br from-indigo-50 to-blue-50 dark:from-gray-700 dark:to-gray-800 overflow-hidden shadow-sm sm:rounded-lg">
                         <div class="p-6">
-                            <h3 class="text-lg font-semibold text-indigo-900 dark:text-indigo-100 mb-2">Вашата Академски roadmap</h3>
+                            <h3 class="text-lg font-semibold text-indigo-900 dark:text-indigo-100 mb-2">Вашиот Академски roadmap</h3>
                             <p class="text-gray-700 dark:text-gray-300 text-sm mb-4">
                                 Создајте персонализиран roadmap според избраната студиска програма.
Index: resources/views/roadmap/create.blade.php
===================================================================
--- resources/views/roadmap/create.blade.php	(revision 2c5f4bcd897ca04b80c84b471c45f11e4fad6d09)
+++ resources/views/roadmap/create.blade.php	(revision f93eddccc0f2cc1d8f7162aed69dddff23670998)
@@ -35,20 +35,41 @@
                             </div>
 
-                            <!-- Current Year Selection -->
+                            <!-- Career Path Selection -->
                             <div>
-                                <label for="current_year" class="block font-bold text-sm text-gray-900 mb-2">
-                                    Моја тековна година <span class="text-red-500">*</span>
+                                <label for="career_path_id" class="block font-bold text-sm text-gray-900 mb-2">
+                                    Избор на Каријерна Патека <span class="text-gray-500">(опционално)</span>
                                 </label>
-                                <select id="current_year" name="current_year" class="mt-1 block w-full px-4 py-3 rounded-md border-gray-300 shadow-sm focus:border-indigo-500 focus:ring-indigo-500 text-base" required>
-                                    <option value="">-- Изберете година --</option>
-                                    <option value="1">1-ва година</option>
-                                    <option value="2">2-ра година</option>
-                                    <option value="3">3-та година</option>
-                                    <option value="4">4-та година</option>
+                                <select id="career_path_id" name="career_path_id" class="mt-1 block w-full px-4 py-3 rounded-md border-gray-300 shadow-sm focus:border-indigo-500 focus:ring-indigo-500 text-base">
+                                    <option value="">-- Изберете каријерна патека (опционално) --</option>
+                                    @forelse($careerPaths as $path)
+                                        <option value="{{ $path->id }}" title="{{ $path->description }}">
+                                            {{ $path->name }}
+                                        </option>
+                                    @empty
+                                        <option disabled>Нема достапни каријерни патеки</option>
+                                    @endforelse
                                 </select>
-                                @error('current_year')
+                                <p class="text-xs text-gray-500 mt-2">Изберете каријерна патека за да добиете персонализирани препораки за предметите.</p>
+                                @error('career_path_id')
                                     <p class="text-red-500 text-sm mt-2">{{ $message }}</p>
                                 @enderror
                             </div>
+                        </div>
+
+                        <!-- Current Year Selection - Now full width -->
+                        <div class="mt-6">
+                            <label for="current_year" class="block font-bold text-sm text-gray-900 mb-2">
+                                Моја тековна година <span class="text-red-500">*</span>
+                            </label>
+                            <select id="current_year" name="current_year" class="mt-1 block w-full px-4 py-3 rounded-md border-gray-300 shadow-sm focus:border-indigo-500 focus:ring-indigo-500 text-base" required>
+                                <option value="">-- Изберете година --</option>
+                                <option value="1">1-ва година</option>
+                                <option value="2">2-ра година</option>
+                                <option value="3">3-та година</option>
+                                <option value="4">4-та година</option>
+                            </select>
+                            @error('current_year')
+                                <p class="text-red-500 text-sm mt-2">{{ $message }}</p>
+                            @enderror
                         </div>
 
Index: resources/views/roadmap/show.blade.php
===================================================================
--- resources/views/roadmap/show.blade.php	(revision 2c5f4bcd897ca04b80c84b471c45f11e4fad6d09)
+++ resources/views/roadmap/show.blade.php	(revision f93eddccc0f2cc1d8f7162aed69dddff23670998)
@@ -14,4 +14,9 @@
                         @if($studyProgram->name_en)
                             <p class="text-gray-500 italic">{{ $studyProgram->name_en }}</p>
+                        @endif
+                        @if($careerPath)
+                            <div class="mt-3 inline-block bg-purple-100 text-purple-800 px-3 py-1 rounded-full text-sm font-semibold">
+                                🎯 Каријерна патека: {{ $careerPath->name }}
+                            </div>
                         @endif
                     </div>
@@ -141,5 +146,5 @@
                                                             </div>
                                                             <span class="text-sm font-semibold {{ $item['ready'] ? 'bg-green-100 text-green-800' : 'bg-red-100 text-red-800' }} px-2 py-1 rounded whitespace-nowrap ml-2">
-                                                                {{ $item['ready'] ? '✓ Подготвено' : '🔒 Заблокирано' }}
+                                                                {{ $item['ready'] ? '✓ Подготвено' : '🔒 Немате предуслов' }}
                                                             </span>
                                                         </div>
@@ -149,5 +154,5 @@
                                                                 <ul class="list-disc list-inside">
                                                                     @foreach($item['prerequisites'] as $prereq)
-                                                                        <li class="{{ in_array($prereq->id, $completed->toArray()) ? 'line-through text-gray-500' : '' }}">{{ $prereq->code }}</li>
+                                                                        <li class="{{ in_array($prereq->id, $completed->toArray()) ? 'line-through text-gray-500' : '' }}"><strong>{{ $prereq->code }}</strong> - {{ $prereq->name }}</li>
                                                                     @endforeach
                                                                 </ul>
@@ -168,5 +173,5 @@
                                     @if(count($semesters['summer']) > 0)
                                         <div class="bg-amber-50 rounded-lg p-6 border-l-4 border-amber-600">
-                                            <h5 class="font-bold text-lg text-amber-700 mb-4">☀️ Летни семестар</h5>
+                                            <h5 class="font-bold text-lg text-amber-700 mb-4">☀️ Летен семестар</h5>
                                             <div class="space-y-3">
                                                 @foreach($semesters['summer'] as $item)
@@ -182,5 +187,5 @@
                                                             </div>
                                                             <span class="text-sm font-semibold {{ $item['ready'] ? 'bg-green-100 text-green-800' : 'bg-red-100 text-red-800' }} px-2 py-1 rounded whitespace-nowrap ml-2">
-                                                                {{ $item['ready'] ? '✓ Подготвено' : '🔒 Заблокирано' }}
+                                                                {{ $item['ready'] ? '✓ Подготвено' : '🔒 Немате предуслов' }}
                                                             </span>
                                                         </div>
@@ -190,5 +195,5 @@
                                                                 <ul class="list-disc list-inside">
                                                                     @foreach($item['prerequisites'] as $prereq)
-                                                                        <li class="{{ in_array($prereq->id, $completed->toArray()) ? 'line-through text-gray-500' : '' }}">{{ $prereq->code }}</li>
+                                                                        <li class="{{ in_array($prereq->id, $completed->toArray()) ? 'line-through text-gray-500' : '' }}"><strong>{{ $prereq->code }}</strong> - {{ $prereq->name }}</li>
                                                                     @endforeach
                                                                 </ul>
@@ -201,5 +206,5 @@
                                     @else
                                         <div class="bg-amber-50 rounded-lg p-6 border-l-4 border-amber-600 opacity-60">
-                                            <h5 class="font-bold text-lg text-amber-700 mb-2">☀️ Летни семестар</h5>
+                                            <h5 class="font-bold text-lg text-amber-700 mb-2">☀️ Летен семестар</h5>
                                             <p class="text-gray-500 text-sm">Нема предмети</p>
                                         </div>
@@ -253,7 +258,12 @@
                                                     {{ $item['subject']->credits ?? 6 }} ECTS
                                                 </span>
-                                                <span class="inline-block bg-{{ $item['subject']->subject_type === 'mandatory' ? 'red' : 'orange' }}-100 text-{{ $item['subject']->subject_type === 'mandatory' ? 'red' : 'orange' }}-800 text-xs px-2 py-1 rounded">
-                                                    {{ $item['subject']->subject_type === 'mandatory' ? 'Задолжително' : 'Избирачко' }}
-                                                </span>
+                                                <span class="inline-block bg-{{ $item['type'] === 'mandatory' ? 'red' : 'orange' }}-100 text-{{ $item['type'] === 'mandatory' ? 'red' : 'orange' }}-800 text-xs px-2 py-1 rounded">
+                                                    {{ $item['type'] === 'mandatory' ? 'Задолжителен' : 'Изборен' }}
+                                                </span>
+                                                @if($careerPath && isset($item['inCareerPath']) && $item['inCareerPath'])
+                                                    <span class="inline-block bg-purple-200 text-purple-900 text-xs px-2 py-1 rounded font-semibold">
+                                                        🎯 {{ $careerPath->name }}
+                                                    </span>
+                                                @endif
                                             </div>
                                             @if($item['subject']->description)
@@ -280,5 +290,5 @@
                                                     @endif
                                                 </div>
-                                                <span class="bg-gray-600 text-white text-xs px-3 py-1 rounded-full font-semibold whitespace-nowrap ml-2">Заблокирано</span>
+                                                <span class="bg-gray-600 text-white text-xs px-3 py-1 rounded-full font-semibold whitespace-nowrap ml-2">Немате предуслов</span>
                                             </div>
 
@@ -300,5 +310,5 @@
                                                                 </span>
                                                                 <span class="{{ $isCompleted ? 'line-through text-gray-500' : '' }}">
-                                                                    {{ $prereq->code }}
+                                                                    <strong>{{ $prereq->code }}</strong> - {{ $prereq->name }}
                                                                 </span>
                                                             </li>