Updated MapScreen

not working correctly