refactored menu building errors
changed builtin votes to new native votes
fixed some build issues
Merge branch 'master' into 3.4.6