Airline Manager: Optimized performance and minor bug fixes

Optimized performance and minor bug fixes