Team layout fix