Menu Button event issues fixed