mapper modal code implemented, 'Mapped' changed and fixed
Merge pull request #1200 from reciprocity/feature/mapping-modal-UX-upgrade

mapper modal code implemented, 'Mapped' changed and fixed