team migrate and layout fix