Added cancel button to flight notification
Merged