More MapScreen changes