Added missing menu items and mapping modal header, CORE-361, CORE-362

I will close the other pull request 1906 (which is planned for develop branch) , after this is merged.