Menu interactions

Updates since last pull request
I'll add these comments in the next pull request.