Menu interactions

Updates since last pull request
Good generalization of the function. :)