Move separate menu listeners into a global listener