Tidy up menu listeners a bit