Menu interactions

Updates since last pull request
Could you please add a comment here?