diff --git a/app/Filament/Organizations/Resources/BeneficiaryInterventionResource/Pages/EditBeneficiaryIntervention.php b/app/Filament/Organizations/Resources/BeneficiaryInterventionResource/Pages/EditBeneficiaryIntervention.php
index f5e49d28..ce556b59 100644
--- a/app/Filament/Organizations/Resources/BeneficiaryInterventionResource/Pages/EditBeneficiaryIntervention.php
+++ b/app/Filament/Organizations/Resources/BeneficiaryInterventionResource/Pages/EditBeneficiaryIntervention.php
@@ -38,7 +38,9 @@ protected function getRedirectUrl(): ?string
 
     public function getTitle(): string|Htmlable
     {
-        return $this->getRecord()->organizationServiceIntervention->serviceInterventionWithoutStatusCondition->name;
+        return __('intervention_plan.headings.edit_page', [
+            'service_name' => strtolower($this->getRecord()->organizationServiceIntervention->serviceInterventionWithoutStatusCondition->name),
+        ]);
     }
 
     protected function getHeaderActions(): array
diff --git a/app/Filament/Organizations/Resources/InterventionPlanResource/Widgets/BenefitsWidget.php b/app/Filament/Organizations/Resources/InterventionPlanResource/Widgets/BenefitsWidget.php
index 0d29e85b..558f1b89 100644
--- a/app/Filament/Organizations/Resources/InterventionPlanResource/Widgets/BenefitsWidget.php
+++ b/app/Filament/Organizations/Resources/InterventionPlanResource/Widgets/BenefitsWidget.php
@@ -60,6 +60,7 @@ public function table(Table $table): Table
             ->actions([
                 EditAction::make()
                     ->form($this->getBenefitSchema())
+                    ->modalHeading(__('intervention_plan.headings.edit_benefit'))
                     ->extraModalFooterActions([
                         DeleteAction::make()
                             ->label(__('intervention_plan.actions.delete_benefit'))
diff --git a/app/Filament/Organizations/Resources/InterventionServiceResource/Pages/EditCounselingSheet.php b/app/Filament/Organizations/Resources/InterventionServiceResource/Pages/EditCounselingSheet.php
index f45614ab..7731cbc7 100644
--- a/app/Filament/Organizations/Resources/InterventionServiceResource/Pages/EditCounselingSheet.php
+++ b/app/Filament/Organizations/Resources/InterventionServiceResource/Pages/EditCounselingSheet.php
@@ -5,7 +5,6 @@
 namespace App\Filament\Organizations\Resources\InterventionServiceResource\Pages;
 
 use App\Actions\BackAction;
-
 use App\Concerns\PreventSubmitFormOnEnter;
 use App\Enums\AllowancePerson;
 use App\Enums\CounselingSheet;
@@ -54,7 +53,13 @@ class EditCounselingSheet extends EditRecord
 
     public function getTitle(): string|Htmlable
     {
-        return __('intervention_plan.headings.edit_counseling_sheet');
+        return __('intervention_plan.headings.edit_counseling_sheet', [
+            'counseling_sheet_name' => strtolower($this->getRecord()
+                ->organizationServiceWithoutStatusCondition
+                ->serviceWithoutStatusCondition
+                ->counseling_sheet
+                ->getLabel()),
+        ]);
     }
 
     protected function getRedirectUrl(): ?string
diff --git a/app/Filament/Organizations/Resources/InterventionServiceResource/Pages/EditInterventionService.php b/app/Filament/Organizations/Resources/InterventionServiceResource/Pages/EditInterventionService.php
index cf9d944e..1e058894 100644
--- a/app/Filament/Organizations/Resources/InterventionServiceResource/Pages/EditInterventionService.php
+++ b/app/Filament/Organizations/Resources/InterventionServiceResource/Pages/EditInterventionService.php
@@ -34,7 +34,7 @@ public function getBreadcrumbs(): array
     public function getTitle(): string|Htmlable
     {
         return __('intervention_plan.headings.edit_page', [
-            'service_name' => $this->getRecord()->organizationService?->serviceWithoutStatusCondition->name,
+            'service_name' => strtolower($this->getRecord()->organizationService->serviceWithoutStatusCondition->name),
         ]);
     }
 
diff --git a/app/Filament/Organizations/Resources/ServiceResource/Pages/EditService.php b/app/Filament/Organizations/Resources/ServiceResource/Pages/EditService.php
index 1deb03be..162098f1 100644
--- a/app/Filament/Organizations/Resources/ServiceResource/Pages/EditService.php
+++ b/app/Filament/Organizations/Resources/ServiceResource/Pages/EditService.php
@@ -25,7 +25,7 @@ protected function getRedirectUrl(): ?string
 
     public function getTitle(): string|Htmlable
     {
-        return __('service.headings.edit_page', ['name' => $this->getRecord()->serviceWithoutStatusCondition?->name]);
+        return __('service.headings.edit_page', ['name' => strtolower($this->getRecord()->serviceWithoutStatusCondition->name)]);
     }
 
     public function getBreadcrumbs(): array
diff --git a/app/Filament/Organizations/Resources/ServiceResource/Pages/ViewService.php b/app/Filament/Organizations/Resources/ServiceResource/Pages/ViewService.php
index 0977e0d1..4e6e1173 100644
--- a/app/Filament/Organizations/Resources/ServiceResource/Pages/ViewService.php
+++ b/app/Filament/Organizations/Resources/ServiceResource/Pages/ViewService.php
@@ -23,7 +23,7 @@ class ViewService extends ViewRecord
 
     public function getTitle(): string|Htmlable
     {
-        return $this->getRecord()->serviceWithoutStatusCondition->name;
+        return __('service.headings.view_service_page', ['service_name' => strtolower($this->getRecord()->serviceWithoutStatusCondition->name)]);
     }
 
     public function getBreadcrumbs(): array
diff --git a/app/Filament/Organizations/Resources/UserResource.php b/app/Filament/Organizations/Resources/UserResource.php
index 2610f943..d80cbd11 100644
--- a/app/Filament/Organizations/Resources/UserResource.php
+++ b/app/Filament/Organizations/Resources/UserResource.php
@@ -130,8 +130,13 @@ public static function getSchema(): array
 
                     Placeholder::make('last_login_at')
                         ->label(__('user.labels.last_login_at_date_time'))
-                        ->content(fn (User $record) => $record->last_login_at !== '-' ? $record->last_login_at->format('d.m.Y H:i:s') : $record->last_login_at),
+                        ->content(
+                            fn (User $record) => $record->last_login_at && $record->last_login_at !== '-' ?
+                                $record->last_login_at->format('d.m.Y H:i:s') :
+                                '-'
+                        ),
                 ]),
+
             Section::make()
                 ->columns()
                 ->maxWidth('3xl')
diff --git a/lang/ro/beneficiary.php b/lang/ro/beneficiary.php
index 6e9307a7..b6ba155f 100644
--- a/lang/ro/beneficiary.php
+++ b/lang/ro/beneficiary.php
@@ -57,7 +57,7 @@
             'title' => 'Evaluare inițială',
         ],
         'edit_evaluation_details' => [
-            'title' => 'Editează detaliile evaluării',
+            'title' => 'Editează detalii evaluare',
         ],
         'edit_violence' => [
             'title' => 'Editează violența',
diff --git a/lang/ro/intervention_plan.php b/lang/ro/intervention_plan.php
index f56c311a..4d54619a 100644
--- a/lang/ro/intervention_plan.php
+++ b/lang/ro/intervention_plan.php
@@ -219,7 +219,7 @@
         'delete_benefit_modal' => 'Șterge beneficiu social',
         'delete_beneficiary_intervention_modal' => 'Șterge intervenția',
         'empty_state_table_without_intervetntions' => 'Nici o interventie adăugată în planul de intervenție',
-        'edit_counseling_sheet' => 'Editează fișă consiliere',
+        'edit_counseling_sheet' => 'Editează fișă consiliere :counseling_sheet_name',
         'results_table' => 'Rezultate realizate',
         'empty_state_result_table' => 'Nici un rezultat adăugat',
         'empty_state_monthly_plan_table' => 'Nici un plan lunar adăugat',
@@ -251,6 +251,7 @@
         'edit_monthly_plan_title' => 'Editează plan lunar',
         'edit_monthly_plan_services_and_interventions_title' => 'Editează servicii si intervenții',
         'delete_monthly_plan_modal' => 'Șterge plan lunar',
+        'edit_benefit' => 'Modifică beneficiu social',
     ],
 
     'actions' => [
diff --git a/lang/ro/service.php b/lang/ro/service.php
index 9bf52f7d..4df46bec 100644
--- a/lang/ro/service.php
+++ b/lang/ro/service.php
@@ -43,6 +43,7 @@
         'edit_page' => 'Modifică serviciu :name',
         'interventions' => 'Intervenții asociate serviciului',
         'inactivate_modal' => 'Inactivează serviciul în nomenclator',
+        'view_service_page' => 'Serviciu :service_name',
     ],
 
     'helper_texts' => [