Move map into sub-component and wrap.