Improved team layout errors