Menu interactions

Updates since last pull request
Is this still necessary? It's commented out.