Menu interactions

Updates since last pull request
I will split the comment.