Ingame menu cleanup

These are just the fixes from #6752.