Menu fixes
Merge branch 'master' of https://github.com/WerewolfPuppy/CC2