Graphics menu changes
Merge branch 'master' into AlphaFixes_Adam