Merge menu changes into simplifygame
Fix merge issue
Remove files