Added handling for cancelled button
Updated menu