More work done on AirportUI