Menu interactions

Updates since last pull request
It looks fine to me?