Added placeholder for departures while loading, minor refactoring