More complete menu changes

Including additional gametype fixing