mapping modal code position re-arrange
Merge pull request #1211 from reciprocity/feature/mapping-modal-UX-upgrade-step2

mapping modal code position re-arrange