Menu interactions

Updates since last pull request
Is this TODO still relevant?