Menu interactions

Updates since last pull request
Remove whitespace.