diff --git a/skyroster-backend/src/main/java/pl/skyroster/skyroster_backend/application/flight/UpdateFlightUseCase.java b/skyroster-backend/src/main/java/pl/skyroster/skyroster_backend/application/flight/UpdateFlightUseCase.java
new file mode 100644
index 0000000..71a5906
--- /dev/null
+++ b/skyroster-backend/src/main/java/pl/skyroster/skyroster_backend/application/flight/UpdateFlightUseCase.java
@@ -0,0 +1,112 @@
+package pl.skyroster.skyroster_backend.application.flight;
+
+import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
+import pl.skyroster.skyroster_backend.domain.exception.*;
+import pl.skyroster.skyroster_backend.domain.model.*;
+import pl.skyroster.skyroster_backend.domain.port.*;
+import pl.skyroster.skyroster_backend.domain.service.RuleValidator;
+
+import java.time.OffsetDateTime;
+import java.time.temporal.TemporalAdjusters;
+import java.util.List;
+import java.util.UUID;
+
+@Service
+public class UpdateFlightUseCase {
+
+    private final AircraftRepository aircraftRepository;
+    private final PilotRepository pilotRepository;
+    private final OperationalBaseRepository operationalBaseRepository;
+    private final FlightRepository flightRepository;
+    private final RuleRepository ruleRepository;
+    private final RuleValidator ruleValidator = new RuleValidator();
+
+    public UpdateFlightUseCase(AircraftRepository aircraftRepository,
+                               PilotRepository pilotRepository,
+                               OperationalBaseRepository operationalBaseRepository,
+                               FlightRepository flightRepository,
+                               RuleRepository ruleRepository) {
+        this.aircraftRepository = aircraftRepository;
+        this.pilotRepository = pilotRepository;
+        this.operationalBaseRepository = operationalBaseRepository;
+        this.flightRepository = flightRepository;
+        this.ruleRepository = ruleRepository;
+    }
+
+    @Transactional
+    public Flight execute(UUID id, UUID aircraftId, UUID pilotId,
+                          OffsetDateTime startDateTime, OffsetDateTime endDateTime,
+                          UUID startAirportId, UUID endAirportIdOrNull,
+                          String descriptionOrNull) {
+        if (startDateTime == null || endDateTime == null || !startDateTime.isBefore(endDateTime)) {
+            throw new IllegalArgumentException("startDateTime must be before endDateTime");
+        }
+
+        Flight oldFlight = flightRepository.findById(id)
+                .orElseThrow(FlightNotFoundException::new);
+        Aircraft aircraft = aircraftRepository.findById(aircraftId)
+                .orElseThrow(AircraftNotFoundException::new);
+        Pilot pilot = pilotRepository.findById(pilotId)
+                .orElseThrow(() -> new PilotNotFoundException(pilotId));
+        OperationalBase startAirport = operationalBaseRepository.findById(startAirportId)
+                .orElseThrow(() -> new OperationalBaseNotFoundException(startAirportId.toString()));
+        OperationalBase endAirport = null;
+        if (endAirportIdOrNull != null) {
+            endAirport = operationalBaseRepository.findById(endAirportIdOrNull)
+                    .orElseThrow(() -> new OperationalBaseNotFoundException(endAirportIdOrNull.toString()));
+        }
+
+        boolean aircraftConflict = flightRepository
+                .findOverlappingByAircraft(aircraftId, startDateTime, endDateTime)
+                .stream()
+                .anyMatch(f -> !f.getId().equals(id)); // skip the finding if it is the updated flight
+
+        if (aircraftConflict) {
+            throw new FlightTimeConflictException(
+                    "Aircraft already has a flight in this time window");
+        }
+
+        boolean pilotConflict = flightRepository
+                .findOverlappingByPilot(pilotId, startDateTime, endDateTime)
+                .stream()
+                .anyMatch(f -> !f.getId().equals(id));  // skip the finding if it is the updated flight
+
+        if (pilotConflict) {
+            throw new FlightTimeConflictException(
+                    "Pilot already has a flight in this time window");
+        }
+
+        OffsetDateTime monthStart = startDateTime
+                .with(TemporalAdjusters.firstDayOfMonth())
+                .toLocalDate()
+                .atStartOfDay()
+                .atOffset(startDateTime.getOffset());
+        OffsetDateTime monthEnd = monthStart.plusMonths(1);
+        List<Flight> contextFlights = flightRepository
+                .findByPilotInPeriod(pilotId, monthStart, monthEnd)
+                .stream()
+                .filter(f -> !f.getId().equals(id))  // skip the finding if it is the updated flight
+                .toList();
+        List<RuleValidator.TimeRange> ranges = contextFlights.stream()
+                .map(f -> new RuleValidator.TimeRange(f.getFlightStart(), f.getFlightEnd()))
+                .toList();
+        List<Rule> rules = ruleRepository.findAll();
+        List<RuleViolation> violations = ruleValidator.validate(pilotId, startDateTime, endDateTime, rules, ranges);
+        if (!violations.isEmpty()) {
+            throw new RuleViolationException(violations);
+        }
+
+        Flight flight = new Flight(
+                id,
+                aircraft,
+                pilot,
+                startDateTime,
+                endDateTime,
+                startAirport,
+                endAirport,
+                descriptionOrNull
+        );
+        return flightRepository.save(flight);
+    }
+}
diff --git a/skyroster-backend/src/main/java/pl/skyroster/skyroster_backend/application/pilot/GetPilotUseCase.java b/skyroster-backend/src/main/java/pl/skyroster/skyroster_backend/application/pilot/GetPilotUseCase.java
index a42dc85..aeda022 100644
--- a/skyroster-backend/src/main/java/pl/skyroster/skyroster_backend/application/pilot/GetPilotUseCase.java
+++ b/skyroster-backend/src/main/java/pl/skyroster/skyroster_backend/application/pilot/GetPilotUseCase.java
@@ -41,7 +41,7 @@ private Pageable createPageable(Integer page, Integer size, String sort) {
     int resolvedPage = page == null ? 0 : page;
     int resolvedSize = size == null ? 20 : Math.min(size, 100);
 
-    Sort resolvedSort = Sort.by(Sort.Direction.ASC, "lastName");
+    Sort resolvedSort = Sort.by(Sort.Direction.ASC, "surname");
 
     if (sort != null && !sort.isBlank()) {
       String[] parts = sort.split(",");
diff --git a/skyroster-backend/src/main/java/pl/skyroster/skyroster_backend/domain/port/FlightRepository.java b/skyroster-backend/src/main/java/pl/skyroster/skyroster_backend/domain/port/FlightRepository.java
index 0bc384f..ebb154d 100644
--- a/skyroster-backend/src/main/java/pl/skyroster/skyroster_backend/domain/port/FlightRepository.java
+++ b/skyroster-backend/src/main/java/pl/skyroster/skyroster_backend/domain/port/FlightRepository.java
@@ -68,4 +68,10 @@ Optional<Flight> findLastByPilotBefore(@Param("pilotId") UUID pilotId,
         """)
     Optional<Flight> findFirstByPilotAfter(@Param("pilotId") UUID pilotId,
                                             @Param("after") OffsetDateTime after);
+
+    @Query("""
+            SELECT f FROM Flight f
+            WHERE f.id = :id
+            """)
+    Optional<Flight> findById(@Param("id") UUID id);
 }
diff --git a/skyroster-backend/src/main/java/pl/skyroster/skyroster_backend/infrastructure/adapter/in/web/FlightController.java b/skyroster-backend/src/main/java/pl/skyroster/skyroster_backend/infrastructure/adapter/in/web/FlightController.java
index da3cdb9..6877b09 100644
--- a/skyroster-backend/src/main/java/pl/skyroster/skyroster_backend/infrastructure/adapter/in/web/FlightController.java
+++ b/skyroster-backend/src/main/java/pl/skyroster/skyroster_backend/infrastructure/adapter/in/web/FlightController.java
@@ -6,6 +6,7 @@
 import pl.skyroster.skyroster_backend.application.flight.CreateFlightUseCase;
 import pl.skyroster.skyroster_backend.application.flight.DeleteFlightUseCase;
 import pl.skyroster.skyroster_backend.application.flight.GetFlightsUseCase;
+import pl.skyroster.skyroster_backend.application.flight.UpdateFlightUseCase;
 import pl.skyroster.skyroster_backend.domain.model.Flight;
 import pl.skyroster.skyroster_backend.generated.api.ApiApi;
 import pl.skyroster.skyroster_backend.generated.model.CreateFlightRequest;
@@ -18,14 +19,16 @@
 @RestController
 public class FlightController {
 
-    private final GetFlightsUseCase getFlightsUseCase;
     private final CreateFlightUseCase createFlightUseCase;
+    private final GetFlightsUseCase getFlightsUseCase;
+    private final UpdateFlightUseCase updateFlightUseCase;
     private final DeleteFlightUseCase deleteFlightUseCase;
 
-    public FlightController(GetFlightsUseCase getFlightsUseCase, CreateFlightUseCase createFlightUseCase, DeleteFlightUseCase deleteFlightUseCase) {
+    public FlightController(GetFlightsUseCase getFlightsUseCase, CreateFlightUseCase createFlightUseCase, DeleteFlightUseCase deleteFlightUseCase, UpdateFlightUseCase updateFlightUseCase) {
         this.getFlightsUseCase = getFlightsUseCase;
         this.createFlightUseCase = createFlightUseCase;
         this.deleteFlightUseCase = deleteFlightUseCase;
+        this.updateFlightUseCase = updateFlightUseCase;
     }
 
     @GetMapping(ApiApi.PATH_DISPLAY_FLIGHTS)
@@ -47,6 +50,21 @@ public ResponseEntity<FlightResponse> createFlight(@RequestBody CreateFlightRequ
         return ResponseEntity.status(HttpStatus.CREATED).body(FlightResponseMapper.map(flight));
     }
 
+    @PutMapping(ApiApi.PATH_UPDATE_FLIGHT)
+    public ResponseEntity<FlightResponse> updateFlight(@PathVariable("id") UUID id, @RequestBody CreateFlightRequest request) {
+        Flight flight = updateFlightUseCase.execute(
+                id,
+                request.getAircraftId(),
+                request.getPilotId(),
+                request.getStartDateTime(),
+                request.getEndDateTime(),
+                request.getStartAirportId(),
+                request.getEndAirportId(),
+                request.getDescription()
+        );
+        return ResponseEntity.ok(FlightResponseMapper.map(flight));
+    }
+
     @DeleteMapping(ApiApi.PATH_DELETE_FLIGHT)
     public ResponseEntity<Void> deleteAircraft(@PathVariable("id") UUID id) {
         deleteFlightUseCase.execute(id);
diff --git a/skyroster-backend/src/main/java/pl/skyroster/skyroster_backend/infrastructure/config/security/SecurityConfig.java b/skyroster-backend/src/main/java/pl/skyroster/skyroster_backend/infrastructure/config/security/SecurityConfig.java
index fa9299e..8927dec 100644
--- a/skyroster-backend/src/main/java/pl/skyroster/skyroster_backend/infrastructure/config/security/SecurityConfig.java
+++ b/skyroster-backend/src/main/java/pl/skyroster/skyroster_backend/infrastructure/config/security/SecurityConfig.java
@@ -1,5 +1,6 @@
 package pl.skyroster.skyroster_backend.infrastructure.config.security;
 
+import org.springframework.beans.factory.annotation.Value;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
 import org.springframework.http.HttpMethod;
@@ -12,8 +13,6 @@
 import org.springframework.web.cors.CorsConfigurationSource;
 import org.springframework.web.cors.UrlBasedCorsConfigurationSource;
 
-import org.springframework.beans.factory.annotation.Value;
-
 import java.util.List;
 
 @Configuration
@@ -47,11 +46,13 @@ public SecurityFilterChain securityFilterChain(HttpSecurity http) {
                         .requestMatchers("/api/compliance/**").hasRole("compliance_officer")
                         .requestMatchers("/api/planning/**").hasRole("schedule_planner")
                         .requestMatchers(HttpMethod.DELETE,"/api/flights/**").hasRole("schedule_planner")
+                        .requestMatchers(HttpMethod.PUT, "/api/flights/**").hasRole("schedule_planner")
                         .requestMatchers(HttpMethod.POST, "/api/aircraft/**").hasRole("operations_administrator")
                         .requestMatchers(HttpMethod.GET, "/api/aircraft/**").authenticated()
                         .requestMatchers(HttpMethod.DELETE, "/api/pilots/**").hasRole("operations_administrator")
                         .requestMatchers(HttpMethod.PATCH, "/api/pilots/**").hasRole("operations_administrator")
                         .requestMatchers(HttpMethod.POST, "/api/pilots/**").hasRole("operations_administrator")
+                        .requestMatchers(HttpMethod.GET, "/api/pilots/**").authenticated()
                         .requestMatchers("/api/**").authenticated()
                         .anyRequest().denyAll()
                 )
diff --git a/skyroster-backend/src/main/java/pl/skyroster/skyroster_backend/infrastructure/mappers/FlightResponseMapper.java b/skyroster-backend/src/main/java/pl/skyroster/skyroster_backend/infrastructure/mappers/FlightResponseMapper.java
index 65ead1a..66f91f5 100644
--- a/skyroster-backend/src/main/java/pl/skyroster/skyroster_backend/infrastructure/mappers/FlightResponseMapper.java
+++ b/skyroster-backend/src/main/java/pl/skyroster/skyroster_backend/infrastructure/mappers/FlightResponseMapper.java
@@ -8,6 +8,7 @@ public static FlightResponse map(Flight flight) {
         return new FlightResponse(
                 flight.getId(),
                 AircraftResponseMapper.map(flight.getAircraft()),
+                PilotMapper.toResponse(flight.getPilot()),
                 flight.getFlightStart(),
                 flight.getFlightEnd(),
                 OperationalBaseInfoMapper.map(flight.getStartAirport()),
diff --git a/skyroster-backend/src/main/resources/api/openapi.yaml b/skyroster-backend/src/main/resources/api/openapi.yaml
index c613fb6..864852d 100644
--- a/skyroster-backend/src/main/resources/api/openapi.yaml
+++ b/skyroster-backend/src/main/resources/api/openapi.yaml
@@ -476,6 +476,60 @@ paths:
                 $ref: '#/components/schemas/RuleViolationErrorResponse'
 
   /api/flights/{id}:
+    put:
+      operationId: updateFlight
+      tags: [ Flights ]
+      summary: Update an existing flight (with rule validation)
+      parameters:
+        - in: path
+          name: id
+          required: true
+          schema:
+            type: string
+            format: uuid
+      requestBody:
+        required: true
+        content:
+          application/json:
+            schema:
+              $ref: '#/components/schemas/CreateFlightRequest'
+      responses:
+        '200':
+          description: Flight updated
+          content:
+            application/json:
+              schema:
+                $ref: '#/components/schemas/FlightResponse'
+        '400':
+          description: Bad request (invalid payload or start >= end)
+          content:
+            application/json:
+              schema:
+                $ref: '#/components/schemas/ErrorResponse'
+        '401':
+          description: Unauthorized
+          content:
+            application/json:
+              schema:
+                $ref: '#/components/schemas/ErrorResponse'
+        '404':
+          description: Aircraft/Pilot/Airport not found
+          content:
+            application/json:
+              schema:
+                $ref: '#/components/schemas/ErrorResponse'
+        '409':
+          description: Time conflict for aircraft or pilot
+          content:
+            application/json:
+              schema:
+                $ref: '#/components/schemas/ErrorResponse'
+        '422':
+          description: Rule violation
+          content:
+            application/json:
+              schema:
+                $ref: '#/components/schemas/RuleViolationErrorResponse'
     delete:
       operationId: deleteFlight
       tags: [ Flights ]
@@ -1116,6 +1170,8 @@ components:
           format: uuid
         aircraft:
           $ref: '#/components/schemas/AircraftResponse'
+        pilot:
+          $ref: '#/components/schemas/PilotResponse'
         flightStart:
           type: string
           format: date-time
diff --git a/skyroster-frontend/src/assets/global.css b/skyroster-frontend/src/assets/global.css
index d99eeab..7d05db9 100644
--- a/skyroster-frontend/src/assets/global.css
+++ b/skyroster-frontend/src/assets/global.css
@@ -28,6 +28,10 @@
   border-top-right-radius: 12px;
 }
 
+div, h1, span, p, label, td, .p-inputtext {
+  font-family: Inter, ui-sans-serif, system-ui, -apple-system, "Segoe UI", Roboto, sans-serif;
+}
+
 .p-dialog .p-dialog-footer {
   border-bottom-left-radius: 12px;
   border-bottom-right-radius: 12px;
diff --git a/skyroster-frontend/src/components/scheduler/FlightWizardDialog.vue b/skyroster-frontend/src/components/scheduler/FlightWizardDialog.vue
index b1dc2b0..95956cb 100644
--- a/skyroster-frontend/src/components/scheduler/FlightWizardDialog.vue
+++ b/skyroster-frontend/src/components/scheduler/FlightWizardDialog.vue
@@ -1,5 +1,5 @@
 <script setup>
-import { computed, ref, watch } from 'vue'
+import {computed, ref, watch} from 'vue'
 import Dialog from 'primevue/dialog'
 import Stepper from 'primevue/stepper'
 import StepList from 'primevue/steplist'
@@ -11,13 +11,20 @@ import DatePicker from 'primevue/datepicker'
 import InputText from 'primevue/inputtext'
 import Button from 'primevue/button'
 import Message from 'primevue/message'
-import { useAircraftStore } from '../../stores/aircraft'
-import { usePilotsStore } from '../../stores/pilots'
-import { useFlightsStore } from '../../stores/flights'
-import { BASES } from '../../data/mockData'
+import {useAircraftStore} from '@/stores/aircraft.js'
+import {usePilotsStore} from '@/stores/pilots.js'
+import {useFlightsStore} from '@/stores/flights.js'
+import {BASES} from '@/data/mockData.js'
 
 const props = defineProps({
-  visible: { type: Boolean, default: false }
+  visible: {
+    type: Boolean,
+    required: true
+  },
+  initialForm: {
+    type: Object,
+    default: null
+  }
 })
 const emit = defineEmits(['update:visible', 'created'])
 
@@ -40,12 +47,14 @@ const loadingPilots = ref(false)
 const submitting = ref(false)
 const violations = ref([])
 const submitError = ref(null)
+const isEditMode = ref(false)
 
 const baseOptions = BASES.map(b => ({ label: b.label, value: b.id, icaoCode: b.icaoCode }))
 
 function emptyForm() {
   const today = new Date()
   return {
+    id: null,
     departureBaseId: null,
     startDate: today,
     startTime: new Date(1970, 0, 1, 8, 0),
@@ -54,13 +63,21 @@ function emptyForm() {
     aircraftId: null,
     pilotId: null,
     arrivalBaseId: null,
-    description: ''
+    description: '',
+    isEditMode: false
   }
 }
 
 watch(() => props.visible, v => {
   if (v) {
-    form.value = emptyForm()
+    form.value = props.initialForm
+      ? {
+        ...emptyForm(),
+        ...props.initialForm
+      }
+      : emptyForm()
+
+    isEditMode.value = form.value.isEditMode
     activeStep.value = '1'
     availableAircraft.value = []
     availablePilots.value = []
@@ -110,7 +127,8 @@ async function submit() {
   submitting.value = true
   violations.value = []
   submitError.value = null
-  const result = await flightsStore.addFlight({
+
+  const flightData = {
     aircraftId: form.value.aircraftId,
     pilotId: form.value.pilotId,
     startDateTime: fromIso(),
@@ -118,8 +136,14 @@ async function submit() {
     startAirportId: form.value.departureBaseId,
     endAirportId: form.value.arrivalBaseId,
     description: form.value.description || null
-  })
+  }
+
+  const result = isEditMode.value
+    ? await flightsStore.updateFlight(form.value.id, flightData)
+    : await flightsStore.addFlight(flightData)
+
   submitting.value = false
+
   if (result.ok) {
     emit('created', result.flight)
     visibleProxy.value = false
@@ -146,7 +170,10 @@ const pilotOptions = computed(() => availablePilots.value.map(p => ({
 </script>
 
 <template>
-  <Dialog v-model:visible="visibleProxy" header="Dodaj lot" :style="{ width: '720px' }" modal>
+  <Dialog
+    v-model:visible="visibleProxy"
+    :header="isEditMode ? 'Edytuj lot' : 'Dodaj lot'"
+    :style="{ width: '720px' }" modal>
     <Stepper v-model:value="activeStep" linear>
       <StepList>
         <Step value="1">Lotnisko startu</Step>
@@ -245,7 +272,8 @@ const pilotOptions = computed(() => availablePilots.value.map(p => ({
           </div>
           <div class="step-footer">
             <Button label="Wstecz" severity="secondary" @click="activateCallback('4')" />
-            <Button label="Utwórz lot" :loading="submitting" @click="submit" />
+            <Button :label="isEditMode ? 'Zmodyfikuj lot' : 'Utwórz lot'" :loading="submitting"
+                    @click="submit"/>
           </div>
         </StepPanel>
       </StepPanels>
diff --git a/skyroster-frontend/src/data/mockData.js b/skyroster-frontend/src/data/mockData.js
index f56335a..78eaeb4 100644
--- a/skyroster-frontend/src/data/mockData.js
+++ b/skyroster-frontend/src/data/mockData.js
@@ -166,59 +166,3 @@ function formatDateTime(date, hours, minutes = 0) {
   d.setHours(hours, minutes, 0, 0)
   return d.toISOString().slice(0, 19)
 }
-
-export function generateInitialFlights() {
-  const weekStart = getStartOfWeek()
-  
-  const flights = [
-    {
-      id: 'F001',
-      aircraftId: 'A001',
-      pilotId: 'P001',
-      start: formatDateTime(weekStart, 8),
-      end: formatDateTime(weekStart, 11),
-      text: 'EPWA → EPKK',
-      description: 'Lot rejsowy Warszawa - Kraków'
-    },
-    {
-      id: 'F002',
-      aircraftId: 'A002',
-      pilotId: 'P002',
-      start: formatDateTime(weekStart, 14),
-      end: formatDateTime(weekStart, 17),
-      text: 'EPKK → EPGD',
-      description: 'Lot rejsowy Kraków - Gdańsk'
-    },
-    {
-      id: 'F003',
-      aircraftId: 'A001',
-      pilotId: 'P004',
-      start: formatDateTime(new Date(weekStart.getTime() + 86400000), 9),
-      end: formatDateTime(new Date(weekStart.getTime() + 86400000), 12),
-      text: 'EPWA → EPWR',
-      description: 'Lot rejsowy Warszawa - Wrocław'
-    },
-    {
-      id: 'F004',
-      aircraftId: 'A004',
-      pilotId: 'P001',
-      start: formatDateTime(new Date(weekStart.getTime() + 86400000 * 2), 10),
-      end: formatDateTime(new Date(weekStart.getTime() + 86400000 * 2), 14),
-      text: 'EPWR → EPPO',
-      description: 'Lot rejsowy Wrocław - Poznań'
-    },
-    {
-      id: 'F005',
-      aircraftId: 'A002',
-      pilotId: 'P002',
-      start: formatDateTime(new Date(weekStart.getTime() + 86400000 * 3), 8),
-      end: formatDateTime(new Date(weekStart.getTime() + 86400000 * 3), 13),
-      text: 'EPKK → EPWA',
-      description: 'Lot rejsowy Kraków - Warszawa'
-    }
-  ]
-  
-  return flights
-}
-
-export const initialFlights = generateInitialFlights()
diff --git a/skyroster-frontend/src/stores/flights.js b/skyroster-frontend/src/stores/flights.js
index 58ca373..3c857f6 100644
--- a/skyroster-frontend/src/stores/flights.js
+++ b/skyroster-frontend/src/stores/flights.js
@@ -1,46 +1,58 @@
-import { ref, computed } from 'vue'
-import { defineStore } from 'pinia'
-import { initialFlights } from '../data/mockData'
+import {computed, ref} from 'vue'
+import {defineStore} from 'pinia'
 import apiClient from '../api/axios'
-import { useAircraftStore } from './aircraft'
-import { usePilotsStore } from './pilots'
+import {useAircraftStore} from './aircraft'
+import {usePilotsStore} from './pilots'
 
 export const useFlightsStore = defineStore('flights', () => {
-  const flights = ref([...initialFlights])
+  const flights = ref([])
   const planningSchedules = ref([])
 
   const flightsCount = computed(() => flights.value.length)
 
+  const parseFlightResponse = (data) => ({
+    id: data.id,
+    aircraftId: data.aircraft?.id ?? null,
+    pilotId: data.pilot?.id ?? null,
+    start: data.flightStart,
+    end: data.flightEnd,
+    text: data.startAirport && data.endAirport
+      ? `${data.startAirport.icaoCode} → ${data.endAirport.icaoCode}`
+      : '',
+    description: data.description
+  })
+
+  function parseApiError(e) {
+    if (e.response?.status === 422) {
+      return {ok: false, status: 422, violations: e.response.data.violations ?? []}
+    }
+
+    if (e.response?.status === 409) {
+      return {ok: false, status: 409, message: e.response.data?.message ?? 'Konflikt zasobu'}
+    }
+
+    return {
+      ok: false,
+      status: e.response?.status ?? 500,
+      message: e.response?.data?.message ?? e.message
+    }
+  }
+
   async function addFlight(flightData) {
     try {
       const { data } = await apiClient.post('/flights', flightData)
-      const mapped = {
-        id: data.id,
-        aircraftId: data.aircraft?.id,
-        pilotId: data.pilot?.id ?? null,
-        start: data.flightStart,
-        end: data.flightEnd,
-        text: data.startAirport && data.endAirport
-          ? `${data.startAirport.icaoCode} → ${data.endAirport.icaoCode}`
-          : '',
-        description: data.description
-      }
+      const mapped = parseFlightResponse(data)
       flights.value.push(mapped)
       return { ok: true, flight: mapped }
     } catch (e) {
-      if (e.response?.status === 422) {
-        return { ok: false, status: 422, violations: e.response.data.violations ?? [] }
-      }
-      if (e.response?.status === 409) {
-        return { ok: false, status: 409, message: e.response.data?.message ?? 'Konflikt zasobu' }
-      }
-      return { ok: false, status: e.response?.status ?? 500, message: e.response?.data?.message ?? e.message }
+      parseApiError(e)
     }
   }
 
   async function loadFlights() {
     try {
       const { data } = await apiClient.get('/flights')
+
       flights.value = data.map(f => ({
         id: f.id,
         aircraftId: f.aircraft?.id,
@@ -52,29 +64,81 @@ export const useFlightsStore = defineStore('flights', () => {
           : '',
         description: f.description
       }))
-      return true
     } catch (e) {
       console.error('loadFlights failed', e)
-      return false
     }
   }
 
-  function updateFlight(id, flightData) {
-    const index = flights.value.findIndex(f => f.id === id)
-    if (index !== -1) {
-      flights.value[index] = { ...flights.value[index], ...flightData }
-      return flights.value[index]
+  async function updateFlight(id, flightData) {
+    try {
+      const {data} = await apiClient.put(`/flights/${id}`, flightData)
+
+      const mapped = parseFlightResponse(data)
+      const index = flights.value.findIndex(f => f.id === id)
+      if (index !== -1) {
+        flights.value[index] = {...flights.value[index], ...flightData}
+        return {ok: true, flight: mapped}
+      }
+    } catch (e) {
+      parseApiError(e)
     }
+
     return null
   }
 
-  function deleteFlight(id) {
-    const index = flights.value.findIndex(f => f.id === id)
-    if (index !== -1) {
-      flights.value.splice(index, 1)
-      return true
+  async function deleteFlight(id) {
+    try {
+      const res = await apiClient.delete(
+        `/flights/${id}`,
+        {
+          headers: {
+            'Content-Type': 'application/json'
+          }
+        }
+      );
+
+      if (res.status >= 200 && res.status < 300) {
+        const index = flights.value.findIndex(f => f.id === id)
+        if (index !== -1) {
+          flights.value.splice(index, 1)
+
+          return {
+            ok: true,
+            message: 'Lot został usunięty'
+          };
+        }
+      }
+    } catch (e) {
+      if (e.response?.status === 401) {
+        return {ok: false, status: 401, message: 'Błąd uwierzytelniania'}
+      }
+
+      if (e.response?.status === 403) {
+        return {ok: false, status: 403, message: 'Nie masz uprawnień do usunięcia lotu'}
+      }
+
+      if (e.response?.status === 404) {
+        return {ok: false, status: 404, message: 'Nie znaleziono lotu'}
+      }
+
+      if (e.response?.status === 409) {
+        return {
+          ok: false,
+          status: 409,
+          message: 'Nie można usunąć trwającego lub zakończonego lotu'
+        }
+      }
+
+      return {
+        ok: false,
+        status: e.response?.status ?? 500,
+        message: e.response?.data?.message ?? e.message
+      }
     }
-    return false
+    return {
+      ok: false,
+      message: "Nieznany błąd"
+    };
   }
 
   function getFlightById(id) {
diff --git a/skyroster-frontend/src/views/SchedulerView.vue b/skyroster-frontend/src/views/SchedulerView.vue
index 85274bf..415cb08 100644
--- a/skyroster-frontend/src/views/SchedulerView.vue
+++ b/skyroster-frontend/src/views/SchedulerView.vue
@@ -1,18 +1,15 @@
 <script setup>
-import { onMounted, ref } from 'vue'
-import { useFlightsStore } from '../stores/flights'
-import { useAircraftStore } from '../stores/aircraft'
-import { usePilotsStore } from '../stores/pilots'
-import { useToast } from 'primevue/usetoast'
+import {computed, onMounted, ref} from 'vue'
+import {useFlightsStore} from '../stores/flights'
+import {useAircraftStore} from '../stores/aircraft'
+import {usePilotsStore} from '../stores/pilots'
+import {useToast} from 'primevue/usetoast'
 import Button from 'primevue/button'
 import Toast from 'primevue/toast'
 import Dialog from 'primevue/dialog'
-import InputText from 'primevue/inputtext'
-import Select from 'primevue/select'
-import DatePicker from 'primevue/datepicker'
 import FlightScheduler from '../components/scheduler/FlightScheduler.vue'
 import FlightWizardDialog from '../components/scheduler/FlightWizardDialog.vue'
-import { BASES } from '../data/mockData' // Add BASES import
+import {BASES} from '../data/mockData' // Add BASES import
 
 const flightsStore = useFlightsStore()
 const aircraftStore = useAircraftStore()
@@ -22,7 +19,6 @@ const toast = useToast()
 const schedulerRef = ref(null)
 const dialogVisible = ref(false)
 const wizardVisible = ref(false)
-const isEditMode = ref(false)
 const selectedFlight = ref(null)
 
 const flightForm = ref(getEmptyForm())
@@ -47,28 +43,34 @@ const baseOptions = BASES.map(b => ({
   value: b.value
 }))
 
-const pilotOptions = pilotsStore.pilots.map(p => ({
-  label: `${p.imie} ${p.nazwisko}`,
-  value: p.id
-}))
+const pilotOptions = computed(() =>
+  pilotsStore.pilots.map(p => ({
+    label: `${p.imie} ${p.nazwisko}`,
+    value: p.id
+  }))
+)
 
-const aircraftOptions = aircraftStore.aircraft.map(a => ({
-  label: `${a.rejestracja} (${a.typ})`,
-  value: a.id
-}))
+const aircraftOptions = computed(() =>
+  aircraftStore.aircraft.map(a => ({
+    label: `${a.rejestracja} (${a.typ})`,
+    value: a.id
+  }))
+)
 
 function getEmptyForm() {
   const today = new Date()
   return {
-    aircraftId: null,
-    pilotId: null,
+    id: null,
+    departureBaseId: null,
     startDate: today,
     startTime: new Date(1970, 0, 1, 8, 0),
     endDate: today,
     endTime: new Date(1970, 0, 1, 10, 0),
-    departure: null,
-    arrival: null,
-    description: ''
+    aircraftId: null,
+    pilotId: null,
+    arrivalBaseId: null,
+    description: '',
+    isEditMode: false
   }
 }
 
@@ -91,7 +93,6 @@ function parseDateTimeFromStore(dateTimeStr) {
 
 function handleEventClick(flight) {
   selectedFlight.value = flight
-  isEditMode.value = true
 
   const startParsed = parseDateTimeFromStore(flight.start)
   const endParsed = parseDateTimeFromStore(flight.end)
@@ -114,15 +115,17 @@ function handleEventClick(flight) {
   }
 
   flightForm.value = {
-    aircraftId: flight.aircraftId,
-    pilotId: flight.pilotId,
+    id: selectedFlight.value.id,
+    departureBaseId: dep,
     startDate: startParsed.date,
     startTime: startParsed.time,
     endDate: endParsed.date,
     endTime: endParsed.time,
-    departure: dep,
-    arrival: arr,
-    description: flight.description || ''
+    aircraftId: selectedFlight.value.aircraftId,
+    pilotId: selectedFlight.value.pilotId,
+    arrivalBaseId: arr,
+    description: selectedFlight.value.description || '',
+    isEditMode: true
   }
 
   dialogVisible.value = true
@@ -130,12 +133,12 @@ function handleEventClick(flight) {
 
 function handleTimeRangeSelected(selection) {
   selectedFlight.value = null
-  isEditMode.value = false
 
   const startValue = selection.start.value ? selection.start.value : selection.start.toString()
   const endValue = selection.end.value ? selection.end.value : selection.end.toString()
 
   const startDate = new Date(startValue)
+  // const endDate = new Date(endValue)
   new Date(endValue)
 
   flightForm.value = {
@@ -144,13 +147,19 @@ function handleTimeRangeSelected(selection) {
     startDate: startDate,
     startTime: new Date(1970, 0, 1, 8, 0),
     endDate: startDate,
-    endTime: new Date(1970, 0, 1, 10, 0)
+    endTime: new Date(1970, 0, 1, 10, 0),
+    isEditMode: false
   }
 
-  dialogVisible.value = true
+  wizardVisible.value = true
 }
 
-function openAddDialog() {
+function openWizardInEditMode() {
+  dialogVisible.value = false
+  wizardVisible.value = true
+}
+
+function openWizardInAddMode() {
   wizardVisible.value = true
 }
 
@@ -165,11 +174,11 @@ function saveFlight() {
     pilotId: flightForm.value.pilotId,
     start: formatDateTimeForStore(flightForm.value.startDate, flightForm.value.startTime),
     end: formatDateTimeForStore(flightForm.value.endDate, flightForm.value.endTime),
-    text: `${flightForm.value.departure} \u2192 ${flightForm.value.arrival}`,
+    text: `${flightForm.value.departureBaseId} \u2192 ${flightForm.value.arrivalBaseId}`,
     description: flightForm.value.description
   }
 
-  if (isEditMode.value && selectedFlight.value) {
+  if (selectedFlight.value) {
     flightsStore.updateFlight(selectedFlight.value.id, flightData)
     toast.add({ severity: 'success', summary: 'Sukces', detail: 'Lot został zaktualizowany', life: 3000 })
   } else {
@@ -180,11 +189,28 @@ function saveFlight() {
   dialogVisible.value = false
 }
 
-function deleteFlight() {
+async function deleteFlight() {
   if (selectedFlight.value) {
-    flightsStore.deleteFlight(selectedFlight.value.id)
-    toast.add({ severity: 'success', summary: 'Sukces', detail: 'Lot został usunięty', life: 3000 })
-    dialogVisible.value = false
+    const result = await flightsStore.deleteFlight(selectedFlight.value.id)
+
+    if (result.ok) {
+      toast.add({
+        severity: 'success',
+        summary: 'Sukces',
+        detail: result.message,
+        life: 3000
+      })
+
+      dialogVisible.value = false
+      return
+    }
+
+    toast.add({
+      severity: 'error',
+      summary: 'Błąd',
+      detail: result.message,
+      life: 5000
+    })
   }
 }
 
@@ -199,6 +225,38 @@ function navigatePrev() {
 function navigateNext() {
   schedulerRef.value?.navigateNext()
 }
+
+const getLabelFromOptions = (value, options) => {
+  if (!value) return '—'
+  if (!Array.isArray(options)) return '—'
+
+  const found = options.find(opt => opt.value === value)
+  return found?.label ?? '—'
+}
+
+const formatDate = (dateValue) => {
+  if (!dateValue) return null;
+  const d = new Date(dateValue);
+  if (isNaN(d.getTime())) return dateValue;
+  return d.toLocaleDateString('pl-PL', {
+    day: '2-digit',
+    month: '2-digit',
+    year: 'numeric'
+  });
+};
+
+const formatTime = (timeValue) => {
+  if (!timeValue) return null;
+  const t = new Date(timeValue);
+  if (isNaN(t.getTime())) {
+    return timeValue.substring(0, 5);
+  }
+  return t.toLocaleTimeString('pl-PL', {
+    hour: '2-digit',
+    minute: '2-digit',
+    hour12: false
+  });
+};
 </script>
 
 <template>
@@ -213,7 +271,7 @@ function navigateNext() {
           <Button label="Dzisiaj" severity="secondary" text @click="navigateToday" />
           <Button icon="pi pi-chevron-right" severity="secondary" text @click="navigateNext" />
         </div>
-        <Button label="Dodaj lot" icon="pi pi-plus" @click="openAddDialog" />
+        <Button label="Dodaj lot" icon="pi pi-plus" @click="openWizardInAddMode"/>
       </div>
     </div>
 
@@ -227,123 +285,91 @@ function navigateNext() {
 
     <Dialog
       v-model:visible="dialogVisible"
-      :header="isEditMode ? 'Edytuj lot' : 'Dodaj lot'"
+      header="Informacje o locie"
       :style="{ width: '600px' }"
       :breakpoints="{ '1199px': '75vw', '575px': '90vw' }"
       modal
     >
       <div class="form-grid">
         <div class="form-field">
-          <label for="aircraft">Samolot</label>
-          <Select
-            id="aircraft"
-            v-model="flightForm.aircraftId"
-            :options="aircraftOptions"
-            optionLabel="label"
-            optionValue="value"
-            placeholder="Wybierz samolot"
-            class="w-full"
-          />
+          <span class="field-label">Samolot</span>
+          <div class="field-value">
+            {{ getLabelFromOptions(flightForm.aircraftId, aircraftOptions) }}
+          </div>
         </div>
 
         <div class="form-field">
-          <label for="pilot">Pilot</label>
-          <Select
-            id="pilot"
-            v-model="flightForm.pilotId"
-            :options="pilotOptions"
-            optionLabel="label"
-            optionValue="value"
-            placeholder="Wybierz pilota"
-            class="w-full"
-          />
+          <span class="field-label">Pilot</span>
+          <div class="field-value">
+            {{ getLabelFromOptions(flightForm.pilotId, pilotOptions) }}
+          </div>
         </div>
 
         <div class="form-field">
-          <label for="startDate">Data rozpoczęcia</label>
-          <DatePicker
-            id="startDate"
-            v-model="flightForm.startDate"
-            dateFormat="dd.mm.yy"
-            class="w-full"
-          />
+          <span class="field-label">Data rozpoczęcia</span>
+          <div class="field-value">
+            {{ formatDate(flightForm.startDate) || '—' }}
+          </div>
         </div>
 
         <div class="form-field">
-          <label for="startTime">Godzina rozpoczęcia</label>
-          <DatePicker
-            id="startTime"
-            v-model="flightForm.startTime"
-            timeOnly
-            hourFormat="24"
-            class="w-full"
-          />
+          <span class="field-label">Godzina rozpoczęcia</span>
+          <div class="field-value">
+            {{ formatTime(flightForm.startTime) || '—' }}
+          </div>
         </div>
 
         <div class="form-field">
-          <label for="endDate">Data zakończenia</label>
-          <DatePicker
-            id="endDate"
-            v-model="flightForm.endDate"
-            dateFormat="dd.mm.yy"
-            class="w-full"
-          />
+          <span class="field-label">Data zakończenia</span>
+          <div class="field-value">
+            {{ formatDate(flightForm.endDate) || '—' }}
+          </div>
         </div>
 
         <div class="form-field">
-          <label for="endTime">Godzina zakończenia</label>
-          <DatePicker
-            id="endTime"
-            v-model="flightForm.endTime"
-            timeOnly
-            hourFormat="24"
-            class="w-full"
-          />
+          <span class="field-label">Godzina zakończenia</span>
+          <div class="field-value">
+            {{ formatTime(flightForm.endTime) || '—' }}
+          </div>
         </div>
 
         <div class="form-field">
-          <label for="departure">Lotnisko startowe</label>
-          <Select
-            id="departure"
-            v-model="flightForm.departure"
-            :options="baseOptions"
-            optionLabel="label"
-            optionValue="value"
-            placeholder="Wybierz startowe"
-            class="w-full"
-          />
+          <span class="field-label">Lotnisko startowe</span>
+          <div class="field-value">
+            {{ getLabelFromOptions(flightForm.departureBaseId, baseOptions) }}
+          </div>
         </div>
 
         <div class="form-field">
-          <label for="arrival">Lotnisko docelowe</label>
-          <Select
-            id="arrival"
-            v-model="flightForm.arrival"
-            :options="baseOptions"
-            optionLabel="label"
-            optionValue="value"
-            placeholder="Wybierz docelowe"
-            class="w-full"
-          />
+          <span class="field-label">Lotnisko docelowe</span>
+          <div class="field-value">
+            {{ getLabelFromOptions(flightForm.arrivalBaseId, baseOptions) }}
+          </div>
         </div>
 
         <div class="form-field full-width">
-          <label for="description">Opis</label>
-          <InputText id="description" v-model="flightForm.description" class="w-full" />
+          <span class="field-label">Opis</span>
+          <div class="field-value">
+            {{ flightForm.description || '—' }}
+          </div>
         </div>
       </div>
 
       <template #footer>
         <div class="dialog-footer">
-          <Button v-if="isEditMode" label="Usuń" severity="danger" text @click="deleteFlight" />
+          <Button label="Usuń" severity="danger" text @click="deleteFlight"/>
           <div class="spacer"></div>
           <Button label="Anuluj" severity="secondary" @click="dialogVisible = false" />
-          <Button label="Zapisz" @click="saveFlight" />
+          <Button label="Edytuj" @click="openWizardInEditMode"/>
         </div>
       </template>
     </Dialog>
 
-    <FlightWizardDialog v-model:visible="wizardVisible" @created="onFlightCreated" />
+    <FlightWizardDialog
+      v-model:visible="wizardVisible"
+      :initial-form="flightForm"
+      @created="onFlightCreated"
+    />
   </div>
 </template>
 
@@ -388,13 +414,13 @@ function navigateNext() {
 .form-grid {
   display: grid;
   grid-template-columns: 1fr 1fr;
-  gap: 1rem;
+  gap: 1.25rem;
 }
 
 .form-field {
   display: flex;
   flex-direction: column;
-  gap: 0.5rem;
+  gap: 0.25rem;
 }
 
 .form-field.full-width {
@@ -407,6 +433,22 @@ function navigateNext() {
   font-size: 0.95rem;
 }
 
+.field-label {
+  font-weight: 600;
+  color: #3b82f6;
+  font-size: 0.85rem;
+  text-transform: uppercase;
+  letter-spacing: 0.05em;
+}
+
+.field-value {
+  font-size: 1.05rem;
+  color: #f1f5f9;
+  padding: 0.25rem 0;
+  font-weight: 500;
+  border-bottom: 1px solid #94a3b8;
+}
+
 .w-full {
   width: 100%;
 }