[Refactoring + Add FlightForm]