Improve AircraftsView and other changes