Menu interactions

Updates since last pull request
Are we still drawing Xs over objects?