Fix a network freeze, improved layout