Add AirportsView and other changes