Menu interactions

Updates since last pull request
See comment above.