New layout with updated tee and basket locations