diff --git a/app/Filament/Resources/AdmissionPlanResource.php b/app/Filament/Resources/AdmissionPlanResource.php
index 9007767..9740d27 100644
--- a/app/Filament/Resources/AdmissionPlanResource.php
+++ b/app/Filament/Resources/AdmissionPlanResource.php
@@ -6,26 +6,17 @@ use App\Enums\BudgetEducation;
 use App\Enums\EducationalProgramStatus;
 use App\Enums\FormEducation;
 use App\Filament\Resources\AdmissionPlanResource\Pages;
-use App\Filament\Resources\AdmissionPlanResource\RelationManagers;
-use App\Filament\Resources\EducationalProgramResource\RelationManagers\AdmissionPlansRelationManager;
 use App\Models\AdmissionCampaign;
 use App\Models\AdmissionPlan;
 use App\Models\EducationalProgram;
-use Filament\Forms;
-use Filament\Forms\Components\Builder;
-use Filament\Forms\Components\FileUpload;
-use Filament\Forms\Components\Hidden;
 use Filament\Forms\Components\Repeater;
 use Filament\Forms\Components\Section;
 use Filament\Forms\Components\Select;
 use Filament\Forms\Components\TextInput;
 use Filament\Forms\Form;
-use Filament\Forms\Get;
 use Filament\Resources\Resource;
 use Filament\Tables;
 use Filament\Tables\Table;
-use Illuminate\Database\Eloquent\SoftDeletingScope;
-use Mohamedsabil83\FilamentFormsTinyeditor\Components\TinyEditor;
 
 class AdmissionPlanResource extends Resource
 {
@@ -87,29 +78,39 @@ class AdmissionPlanResource extends Resource
                 TextInput::make('title')
                     ->label('Название предмета')
                     ->required()
+                    ->columnSpanFull()
                     ->maxLength(100)
                     ->placeholder('Например: Математика')
                     ->helperText('Название вступительного испытания'),
 
-                Select::make('type_exam')
-                    ->label('Тип испытания')
-                    ->required()
-                    ->options([
-                        'ege' => 'ЕГЭ',
-                        'internal_test' => 'Внутреннее испытание',
-                    ])
-                    ->native(false)
-                    ->placeholder('Выберите тип')
-                    ->helperText('Тип вступительного испытания'),
+                Repeater::make('exam')->schema([
+                    Select::make('type_exam')
+                        ->label('Тип испытания')
+                        ->required()
+                        ->options([
+                            'ege' => 'ЕГЭ',
+                            'internal_test' => 'Внутреннее испытание',
+                        ])
+                        ->native(false)
+                        ->placeholder('Выберите тип')
+                        ->helperText('Тип вступительного испытания'),
+
+                    TextInput::make('min_score')
+                        ->label('Минимальный балл')
+                        ->required()
+                        ->numeric()
+                        ->minValue(0)
+                        ->maxValue(100)
+                        ->placeholder('Укажите минимальный балл')
+                        ->helperText('Минимальный проходной балл'),
+                ])
+                    ->collapsible()
+                    ->collapsed()
+                    ->label('Вид встпутиельного испытания')
+                    ->addActionLabel('Добавить вид экзамена')
+                    ->maxItems(2)
+                    ->columnSpanFull(),
 
-                TextInput::make('min_score')
-                    ->label('Минимальный балл')
-                    ->required()
-                    ->numeric()
-                    ->minValue(0)
-                    ->maxValue(100)
-                    ->placeholder('Укажите минимальный балл')
-                    ->helperText('Минимальный проходной балл'),
             ])
             ->columns(3)
             ->maxItems(10)
@@ -168,8 +169,10 @@ class AdmissionPlanResource extends Resource
     public static function table(Table $table): Table
     {
         return $table
+            ->defaultGroup('admissionCampaign.academic_year')
             ->columns([
-                //
+                Tables\Columns\TextColumn::make('educationalProgram.name')->label('Программа'),
+                Tables\Columns\TextColumn::make('admissionCampaign.academic_year')->label('Приемная компания'),
             ])
             ->filters([
                 //
diff --git a/resources/js/Navbars/DesktopNavBar.vue b/resources/js/Navbars/DesktopNavBar.vue
index 805c4e2..f9cdbf9 100644
--- a/resources/js/Navbars/DesktopNavBar.vue
+++ b/resources/js/Navbars/DesktopNavBar.vue
@@ -14,7 +14,7 @@
 									:id="'nav-section-btn-' + section.slug"
 									type="button"
 									:class="!underSliderHeader ? 'text-white' : 'text-black'"
-									class="duration-300 flex items-center w-full hover:text-primary-hover font-medium hs-dropdown-open:mb-4 md:hs-dropdown-open:mb-0">
+									class="duration-300 flex items-center w-full hover:text-primary-hover font-normal hs-dropdown-open:mb-4 md:hs-dropdown-open:mb-0">
 								{{ section.title }}
 								<svg class="flex-shrink-0 ms-2 w-4 h-4" xmlns="http://www.w3.org/2000/svg" width="24" height="24"
 										 viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="2" stroke-linecap="round"
diff --git a/resources/js/Pages/Client/Additional-educations/Show.vue b/resources/js/Pages/Client/Additional-educations/Show.vue
index e50d1ae..b104836 100644
--- a/resources/js/Pages/Client/Additional-educations/Show.vue
+++ b/resources/js/Pages/Client/Additional-educations/Show.vue
@@ -171,7 +171,7 @@ export default {
 
 										<div v-if="additionalEducation.data.content.length > 0">
 											<h2 class="text-xl font-bold md:text-2xl">О программе</h2>
-											<div class="py-4 px-5">
+											<div class="py-4">
 												<Builder :blocks="additionalEducation.data.content" />
 											</div>
 										</div>