Adding menu button click support