Updating booked flights views and controller
Merges from Todd