Menu interactions

A few remaining changes since last pull request