Fixed multiplayer issue and right edge margin