Menu interactions

Updates since last pull request
I'll definitely make this change.