Menu interactions

Updates since last pull request